X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=setup.py;h=21c1179e9a1ec31be8ef6448a61f6b8605b5108c;hb=0df00eb68fae5e75858265ba6fce9cff40934482;hp=11c8fe6c27a243cf8374cf8aae8b6774d1fd1210;hpb=243c3843bd574129caa7663e25d1a843b2d2dd30;p=mediagoblin.git

diff --git a/setup.py b/setup.py
index 11c8fe6c..21c1179e 100644
--- 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,34 +38,36 @@ 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',
+        'webob<=1.2a2,>=1.1',
         'wtforms',
         'py-bcrypt',
         'nose',
         'werkzeug',
-        'celery',
+        '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',
         ## For now we're expecting that users will install this from
         ## their package managers.
         # 'lxml',
+        # 'PIL',
         ],
+    # requires=['gst'],
     test_suite='nose.collector',
     entry_points="""\
         [console_scripts]
@@ -96,6 +98,8 @@ setup(
         "License :: OSI Approved :: GNU Affero General Public License",
         "Operating System :: OS Independent",
         "Programming Language :: Python",
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
         "Topic :: Internet :: WWW/HTTP :: Dynamic Content"
         ],
     )