X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=setup.py;h=21c1179e9a1ec31be8ef6448a61f6b8605b5108c;hb=315ac0a2d3fe570cb23a01ce7f094389e1e207d2;hp=ccd1f653f80e393cce954488d3977ae2727262cc;hpb=363d774eea0018cc687a5f4b43c232ff3b08078a;p=mediagoblin.git

diff --git a/setup.py b/setup.py
index ccd1f653..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
@@ -29,45 +29,47 @@ def get_version():
     if mo:
         return mo.group(1)
     else:
-        raise RuntimeError("Unable to find version string in %s." % VERSIONFILE)
+        raise RuntimeError("Unable to find version string in %s." %
+                           VERSIONFILE)
 
 
 setup(
-    name = "mediagoblin",
-    version = get_version(),
+    name="mediagoblin",
+    version=get_version(),
     packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
     zip_safe=False,
+    include_package_data = True,
     # scripts and dependencies
-    install_requires = [
+    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'],
+    # requires=['gst'],
     test_suite='nose.collector',
-    entry_points = """\
+    entry_points="""\
         [console_scripts]
         gmg = mediagoblin.gmg_commands:main_cli
         pybabel = mediagoblin.babel.messages.frontend:main
@@ -84,7 +86,6 @@ setup(
         [babel.extractors]
         jinja2 = jinja2.ext:babel_extract
         """,
- 
     license='AGPLv3',
     author='Free Software Foundation and contributors',
     author_email='cwebber@gnu.org',
@@ -97,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"
         ],
     )