Skip to content

Commit

Permalink
Add ordereddict to install_requires for py26
Browse files Browse the repository at this point in the history
  • Loading branch information
wence- committed Jul 26, 2017
1 parent a546a61 commit f8bd693
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,12 @@ def main():
install_requires = ['py>=1.4.33', 'setuptools'] # pluggy is vendored in _pytest.vendored_packages
extras_require = {}
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']
else:
if sys.version_info < (2, 7):
install_requires.append('argparse')
install_requires.append('ordereddict')
if sys.platform == 'win32':
install_requires.append('colorama')

Expand Down
1 change: 0 additions & 1 deletion tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ deps =
hypothesis<3.0
nose
mock<1.1
ordereddict

[testenv:py27-subprocess]
changedir = .
Expand Down

0 comments on commit f8bd693

Please sign in to comment.