Modify setup.py version syntax to address #5464

[mediagoblin.git] / setup.py

diff --git a/setup.py b/setup.py
index bae0a52c92a2752bbf82abec03e71c186a0ad470..6d309f7eb57ffaf82a5d637de8baec61b92732b1 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -42,32 +42,28 @@ def get_version():
 
 pyversion_install_requires = []
 if PY2:
-    pyversion_install_requires.append('argparse')  # only for < 2.7
-    pyversion_install_requires.append('PasteScript')
     pyversion_install_requires.append('sqlalchemy-migrate>=0.9.6')
     pyversion_install_requires.append('mock==1.0.1')  # mock is in the stdlib for 3.3+
     # PyPI version (1.4.2) does not have proper Python 3 support
     pyversion_install_requires.append('ExifRead')
-    pyversion_install_requires.append('Paste')
-else:
-    pyversion_install_requires.append('gunicorn')
 
 install_requires = [
-    'alembic==0.6.6',
+    'waitress',
+    'alembic>=0.7.5',
     'python-dateutil',
     'wtforms',
     'py-bcrypt',
     'pytest>=2.3.1',
     'pytest-xdist',
     'werkzeug>=0.7',
-    'celery>=3.0',
-    'kombu',
+    'celery>=3.0,<4.0a0',
+    'kombu<4.0a0',
     'jinja2',
     'Babel>=1.3',
     'WebTest>=2.0.18',
     'ConfigObj',
     'Markdown',
-    'sqlalchemy<1.1.0, >0.9.9',
+    'sqlalchemy',
     'itsdangerous',
     'pytz',
     'sphinx',
@@ -76,6 +72,7 @@ install_requires = [
     'unidecode',
     'jsonschema',
     'PasteDeploy',
+    'PasteScript',
     'requests>=2.6.0',
     'pyld',
     # This is optional:
@@ -138,7 +135,6 @@ try:
         "Operating System :: OS Independent",
         "Programming Language :: Python",
         'Programming Language :: Python :: 2',
-        'Programming Language :: Python :: 2.6',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.3',