Merge remote-tracking branch 'remotes/jwandborg/master'

[mediagoblin.git] / setup.py

diff --git a/setup.py b/setup.py
index 7417fb97f47110b7cbc323b19b0236dd4f09b114..c3c2f86f5fd1c6503a147f29d8e14a90292a8144 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -29,23 +29,24 @@ 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,
     # scripts and dependencies
-    install_requires = [
+    install_requires=[
         'setuptools',
         'PasteScript',
         'beaker',
         'routes',
         'pymongo',
         'mongokit',
-        'webob',
+        'webob<=1.2a2',
         'wtforms',
         'py-bcrypt',
         'nose',
@@ -61,13 +62,13 @@ setup(
         'ConfigObj',
         'Markdown',
         'python-cloudfiles',
-        'arista',
         ## 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
@@ -84,7 +85,6 @@ setup(
         [babel.extractors]
         jinja2 = jinja2.ext:babel_extract
         """,
- 
     license='AGPLv3',
     author='Free Software Foundation and contributors',
     author_email='cwebber@gnu.org',