Skip to content

Commit

Permalink
Drop explicit support for py32 and py33
Browse files Browse the repository at this point in the history
  • Loading branch information
nicoddemus committed Sep 29, 2015
1 parent 22a4efb commit 9da3453
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 7 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,8 @@ language: python
python:
- 2.6
- 2.7
- 3.2
- 3.3
- 3.4
- 3.5
- pypy

install:
Expand Down
6 changes: 2 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
'pytest>=2.4',
],
extras_require={
':python_version=="2.6" or python_version=="2.7" or '
'python_version=="3.2"': ['mock'],
':python_version=="2.6" or python_version=="2.7"': ['mock'],
},
url='https://github.com/pytest-dev/pytest-mock/',
license='LGPL',
Expand All @@ -31,9 +30,8 @@
'Programming Language :: Python :: 2.6',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.2',
'Programming Language :: Python :: 3.3',
'Programming Language :: Python :: 3.4',
'Programming Language :: Python :: 3.5',
'Topic :: Software Development :: Testing',
]
)
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[tox]
# note that tox expects interpreters to be found at C:\PythonXY,
# with XY being python version ("27" or "34") for instance
envlist = py26, py27, py32, py33, py34
envlist = py26, py27, py34, py35

[testenv]
commands = py.test test_pytest_mock.py

0 comments on commit 9da3453

Please sign in to comment.