Shorten Workbench(Manager) method names

[mediagoblin.git] / setup.py

diff --git a/setup.py b/setup.py
index ec672dd2a8e4468e5f2e2911b8b0385771fef19c..12284f26a302de60a1ea500a1c0331d1e640ddda 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,5 @@
 # GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 MediaGoblin contributors.  See AUTHORS.
+# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -38,33 +38,33 @@ setup(
     version=get_version(),
     packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
     zip_safe=False,
+    include_package_data = True,
     # scripts and dependencies
     install_requires=[
         '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',
-        'python-cloudfiles',
+        'sqlalchemy>=0.7.0',
+        'sqlalchemy-migrate',
+        ## This is optional!
+        # 'translitcodec',
         ## For now we're expecting that users will install this from
         ## their package managers.
         # 'lxml',
+        # 'PIL',
         ],
     # requires=['gst'],
     test_suite='nose.collector',
@@ -94,9 +94,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"
         ],
     )