Skip to content

Commit ae1b8fd

Browse files
committed
Drop support for EOL Python 2.6 and 3.3
1 parent 6e61179 commit ae1b8fd

File tree

6 files changed

+11
-10
lines changed

6 files changed

+11
-10
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,6 @@ docs/_build/
5656
.env*
5757

5858
_pytest_mock_version.py
59+
60+
# IDE
61+
.idea

.travis.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
language: python
22
python:
3-
- "2.6"
43
- "2.7"
5-
- "3.3"
64
- "3.4"
75
- "3.5"
86
- "3.6"

README.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,14 +198,14 @@ than the one that comes with the Python distribution.
198198
mock_use_standalone_module = true
199199
200200
This will force the plugin to import ``mock`` instead of the ``unittest.mock`` module bundled with
201-
Python 3.3+. Note that this option is only used in Python 3+, as Python 2 users only have the option
201+
Python 3.4+. Note that this option is only used in Python 3+, as Python 2 users only have the option
202202
to use the ``mock`` package from PyPI anyway.
203203

204204

205205
Requirements
206206
============
207207

208-
* Python 2.6+, Python 3.3+
208+
* Python 2.7, Python 3.4+
209209
* pytest
210210
* mock (for Python 2)
211211

setup.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@
88
},
99
py_modules=['pytest_mock', '_pytest_mock_version'],
1010
platforms='any',
11+
python_requires='>=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.*',
1112
install_requires=[
1213
'pytest>=2.7',
1314
],
1415
extras_require={
15-
':python_version=="2.6" or python_version=="2.7"': ['mock'],
16+
':python_version=="2.7"': ['mock'],
1617
},
1718
use_scm_version={'write_to': '_pytest_mock_version.py'},
1819
setup_requires=['setuptools_scm'],
@@ -29,10 +30,9 @@
2930
'Intended Audience :: Developers',
3031
'License :: OSI Approved :: MIT License',
3132
'Operating System :: OS Independent',
32-
'Programming Language :: Python :: 2.6',
33+
'Programming Language :: Python :: 2',
3334
'Programming Language :: Python :: 2.7',
3435
'Programming Language :: Python :: 3',
35-
'Programming Language :: Python :: 3.3',
3636
'Programming Language :: Python :: 3.4',
3737
'Programming Language :: Python :: 3.5',
3838
'Programming Language :: Python :: 3.6',

test_pytest_mock.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -348,8 +348,8 @@ def assert_argument_introspection(left, right):
348348
raise AssertionError("DID NOT RAISE")
349349

350350

351-
@pytest.mark.skipif(sys.version_info[:2] in [(3, 3), (3, 4)],
352-
reason="assert_not_called not available in python 3.3 and 3.4")
351+
@pytest.mark.skipif(sys.version_info[:2] == (3, 4),
352+
reason="assert_not_called not available in Python 3.4")
353353
def test_assert_not_called_wrapper(mocker):
354354
stub = mocker.stub()
355355
stub.assert_not_called()

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[tox]
2-
envlist = py{26,27,33,34,35,36}-pytest{29,30,31,32},linting
2+
envlist = py{27,34,35,36}-pytest{29,30,31,32},linting
33

44
[testenv]
55
passenv = USER USERNAME

0 commit comments

Comments
 (0)