floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drop python 3.0-3.2 support code from setup.py 

addresses #1627
This commit is contained in:
Ronny Pfannschmidt 2016-06-27 14:26:12 +02:00
parent ccd395ffe0
commit e877e25587
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.rst
View File

@ -27,10 +27,12 @@
Thanks to `@RedBeardCode`_ for the PR(`#1664`_) Thanks to `@RedBeardCode`_ for the PR(`#1664`_)
* removed support code for python 3 < 3.3 addresssing (`#1627`_)
.. _#607: https://github.com/pytest-dev/pytest/issues/607 .. _#607: https://github.com/pytest-dev/pytest/issues/607
.. _#1519: https://github.com/pytest-dev/pytest/pull/1519 .. _#1519: https://github.com/pytest-dev/pytest/pull/1519
.. _#1664: https://github.com/pytest-dev/pytest/pull/1664 .. _#1664: https://github.com/pytest-dev/pytest/pull/1664
.. _#1627: https://github.com/pytest-dev/pytest/pull/1627
2.10.0.dev1 2.10.0.dev1

6
setup.py
View File

@ -13,7 +13,7 @@ classifiers = ['Development Status :: 6 - Mature',
'Topic :: Software Development :: Libraries', 'Topic :: Software Development :: Libraries',
'Topic :: Utilities'] + [ 'Topic :: Utilities'] + [
('Programming Language :: Python :: %s' % x) for x in ('Programming Language :: Python :: %s' % x) for x in
'2 2.6 2.7 3 3.2 3.3 3.4 3.5'.split()] '2 2.6 2.7 3 3.3 3.4 3.5'.split()]
with open('README.rst') as fd: with open('README.rst') as fd:
long_description = fd.read() long_description = fd.read()
@ -51,10 +51,10 @@ def main():
install_requires = ['py>=1.4.29'] # pluggy is vendored in _pytest.vendored_packages install_requires = ['py>=1.4.29'] # pluggy is vendored in _pytest.vendored_packages
extras_require = {} extras_require = {}
if has_environment_marker_support(): if has_environment_marker_support():
extras_require[':python_version=="2.6" or python_version=="3.0" or python_version=="3.1"'] = ['argparse'] extras_require[':python_version=="2.6"'] = ['argparse']
extras_require[':sys_platform=="win32"'] = ['colorama'] extras_require[':sys_platform=="win32"'] = ['colorama']
else: else:
if sys.version_info < (2, 7) or (3,) <= sys.version_info < (3, 2): if sys.version_info < (2, 7):
install_requires.append('argparse') install_requires.append('argparse')
if sys.platform == 'win32': if sys.platform == 'win32':
install_requires.append('colorama') install_requires.append('colorama')