Fix merge conflict in prev_next.html

[mediagoblin.git] / setup.py

diff --git a/setup.py b/setup.py
index c09e535b5a62bbb36f5fd431b7e042e6c805f1e6..3e382e565a0fb360c98bdd5744bb11a02c827fb7 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,5 +1,5 @@
 # GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 Free Software Foundation, Inc
+# 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,23 +29,25 @@ 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',
         'wtforms',
         'py-bcrypt',
         'nose',
@@ -60,13 +62,16 @@ setup(
         'webtest',
         'ConfigObj',
         'Markdown',
-        'python-cloudfiles',
+        'sqlalchemy',
+        'sqlalchemy-migrate',
+        'kombu-sqlalchemy',
         ## For now we're expecting that users will install this from
         ## their package managers.
         # 'lxml',
         ],
+    # requires=['gst'],
     test_suite='nose.collector',
-    entry_points = """\
+    entry_points="""\
         [console_scripts]
         gmg = mediagoblin.gmg_commands:main_cli
         pybabel = mediagoblin.babel.messages.frontend:main
@@ -83,7 +88,6 @@ setup(
         [babel.extractors]
         jinja2 = jinja2.ext:babel_extract
         """,
- 
     license='AGPLv3',
     author='Free Software Foundation and contributors',
     author_email='cwebber@gnu.org',