summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@gmail.com>2015-04-23 23:11:49 +0200
committerVictor Stinner <victor.stinner@gmail.com>2015-04-23 23:11:49 +0200
commit6ab4d311bb76386651eb1cfe5f1e93783d30330d (patch)
tree31e15b0a18b49e5e7e435f803dde24475498b694
parent9c6706e4eb962e88e8882a6716737f4cd0465209 (diff)
downloadpaste-git-6ab4d311bb76386651eb1cfe5f1e93783d30330d.tar.gz
Fix setup.py for six dependency
Move the six dependency from extras_require to install_requires.
-rw-r--r--setup.py2
-rw-r--r--tox.ini1
2 files changed, 1 insertions, 2 deletions
diff --git a/setup.py b/setup.py
index 6997b64..333be7f 100644
--- a/setup.py
+++ b/setup.py
@@ -62,6 +62,7 @@ setup(name="Paste",
namespace_packages=['paste'],
zip_safe=False,
test_suite='nose.collector',
+ install_requires=['six'],
tests_require=['nose>=0.11'],
extras_require={
'subprocess': [],
@@ -69,7 +70,6 @@ setup(name="Paste",
'Flup': ['flup'],
'Paste': [],
'openid': ['python-openid'],
- 'six': [],
},
entry_points="""
[paste.app_factory]
diff --git a/tox.ini b/tox.ini
index 27fbcb8..b5a9c6f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,7 +4,6 @@ envlist = py26,py27,py34
[testenv]
deps=
nose
- six
commands=
nosetests