summaryrefslogtreecommitdiff
path: root/setup.py
diff options
context:
space:
mode:
authorGael Pasgrimaud <gael@gawel.org>2013-02-21 20:26:24 +0100
committerGael Pasgrimaud <gael@gawel.org>2013-02-21 20:26:24 +0100
commit1af770d38325a591eef96a3a46851ea9c4937d99 (patch)
treef24dda32854c4983ac59fcee9b31b439ac8365ba /setup.py
parentf5b2ec321ebe69629d21c55ae531f09fb7201da3 (diff)
parenta9a14ffc8d80bc7935e20d08de4e9a98243c9726 (diff)
downloadwebtest-1af770d38325a591eef96a3a46851ea9c4937d99.tar.gz
merge conflicts
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/setup.py b/setup.py
index 84a32f6..44dd99c 100644
--- a/setup.py
+++ b/setup.py
@@ -8,12 +8,16 @@ from setuptools import find_packages
version = '1.4.4.dev0'
tests_require = ['nose', 'coverage', 'mock']
+opt_install_requires = []
if sys.version_info[0] == 2:
tests_require.append('unittest2')
else:
tests_require.append('unittest2py3k')
+if sys.version_info[0:2] < (2, 7):
+ opt_install_requires.append('ordereddict')
+
setup(name='WebTest',
version=version,
@@ -53,7 +57,7 @@ setup(name='WebTest',
'WebOb',
'waitress',
'beautifulsoup4',
- ],
+ ] + opt_install_requires,
test_suite='nose.collector',
tests_require=tests_require,
extras_require={