From 2d2e97bd49594e56b44bfbb2d455ca319668cbcb Mon Sep 17 00:00:00 2001 From: Lawrence Mitchell Date: Wed, 26 Jul 2017 10:58:38 +0100 Subject: [PATCH] Add ordereddict to install_requires for py26 --- setup.py | 3 ++- tox.ini | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 751868c048e..55607912bf4 100644 --- a/setup.py +++ b/setup.py @@ -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') diff --git a/tox.ini b/tox.ini index 2dee0fe7cdb..cbb61f5f738 100644 --- a/tox.ini +++ b/tox.ini @@ -34,7 +34,6 @@ deps = hypothesis<3.0 nose mock<1.1 - ordereddict [testenv:py27-subprocess] changedir = .