jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add ordereddict to install_requires for py26

This commit is contained in:
Lawrence Mitchell 2017-07-26 10:58:38 +01:00
parent a546a612bd
commit f8bd693f83
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
setup.py
View File

@ -46,11 +46,12 @@ def main():
install_requires = ['py>=1.4.33', 'setuptools'] # pluggy is vendored in _pytest.vendored_packages install_requires = ['py>=1.4.33', 'setuptools'] # 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"'] = ['argparse'] extras_require[':python_version=="2.6"'] = ['argparse', 'ordereddict']
extras_require[':sys_platform=="win32"'] = ['colorama'] extras_require[':sys_platform=="win32"'] = ['colorama']
else: else:
if sys.version_info < (2, 7): if sys.version_info < (2, 7):
install_requires.append('argparse') install_requires.append('argparse')
install_requires.append('ordereddict')
if sys.platform == 'win32': if sys.platform == 'win32':
install_requires.append('colorama') install_requires.append('colorama')

1
tox.ini
View File

@ -34,7 +34,6 @@ deps =
hypothesis<3.0 hypothesis<3.0
nose nose
mock<1.1 mock<1.1
ordereddict
[testenv:py27-subprocess] [testenv:py27-subprocess]
changedir = . changedir = .