Revert accidental checkin

[mediagoblin.git] / setup.py

diff --git a/setup.py b/setup.py
index 3e382e565a0fb360c98bdd5744bb11a02c827fb7..dc4bd5e636af4d6e5959c707ce81d199af384457 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -44,30 +44,26 @@ setup(
         'setuptools',
         'PasteScript',
         'beaker',
-        'routes',
-        'pymongo',
-        'mongokit',
-        'webob<=1.2a2',
         'wtforms',
         'py-bcrypt',
         'nose',
-        'werkzeug',
-        'celery',
+        'werkzeug>=0.7',
+        'celery==2.5.3',
+        'kombu==2.1.7',
         'jinja2',
         'sphinx',
-        'PIL',
         'Babel',
         'translitcodec',
         'argparse',
         'webtest',
         'ConfigObj',
         'Markdown',
-        'sqlalchemy',
+        'sqlalchemy>=0.7.0',
         'sqlalchemy-migrate',
-        'kombu-sqlalchemy',
         ## For now we're expecting that users will install this from
         ## their package managers.
         # 'lxml',
+        # 'PIL',
         ],
     # requires=['gst'],
     test_suite='nose.collector',
@@ -97,9 +93,11 @@ setup(
     classifiers=[
         "Development Status :: 3 - Alpha",
         "Environment :: Web Environment",
-        "License :: OSI Approved :: GNU Affero General Public License",
+        "License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)",
         "Operating System :: OS Independent",
         "Programming Language :: Python",
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
         "Topic :: Internet :: WWW/HTTP :: Dynamic Content"
         ],
     )