Skip to content

Commit 0e20c14

Browse files
drop python 3.0-3.2 support code from setup.py
addresses pytest-dev#1627
1 parent ccd395f commit 0e20c14

File tree

2 files changed

+5
-3
lines changed

2 files changed

+5
-3
lines changed

CHANGELOG.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,12 @@
2727

2828
Thanks to `@RedBeardCode`_ for the PR(`#1664`_)
2929

30+
* removed support code for python 3 < 3.3 addresssing (`#1627`_)
3031

3132
.. _#607: https://github.com/pytest-dev/pytest/issues/607
3233
.. _#1519: https://github.com/pytest-dev/pytest/pull/1519
3334
.. _#1664: https://github.com/pytest-dev/pytest/pull/1664
35+
.. _#1627: https://github.com/pytest-dev/pytest/pull/1627
3436

3537

3638
2.10.0.dev1

setup.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
'Topic :: Software Development :: Libraries',
1414
'Topic :: Utilities'] + [
1515
('Programming Language :: Python :: %s' % x) for x in
16-
'2 2.6 2.7 3 3.2 3.3 3.4 3.5'.split()]
16+
'2 2.6 2.7 3 3.3 3.4 3.5'.split()]
1717

1818
with open('README.rst') as fd:
1919
long_description = fd.read()
@@ -51,10 +51,10 @@ def main():
5151
install_requires = ['py>=1.4.29'] # pluggy is vendored in _pytest.vendored_packages
5252
extras_require = {}
5353
if has_environment_marker_support():
54-
extras_require[':python_version=="2.6" or python_version=="3.0" or python_version=="3.1"'] = ['argparse']
54+
extras_require[':python_version=="2.6"'] = ['argparse']
5555
extras_require[':sys_platform=="win32"'] = ['colorama']
5656
else:
57-
if sys.version_info < (2, 7) or (3,) <= sys.version_info < (3, 2):
57+
if sys.version_info < (2, 7):
5858
install_requires.append('argparse')
5959
if sys.platform == 'win32':
6060
install_requires.append('colorama')

0 commit comments

Comments
 (0)