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

diff --git a/setup.py b/setup.py
index ccd1f653..ca7d4ae2 100644
--- a/setup.py
+++ b/setup.py
@@ -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,14 +62,13 @@ setup(
         'webtest',
         'ConfigObj',
         'Markdown',
-        'python-cloudfiles',
         ## For now we're expecting that users will install this from
         ## their package managers.
         # 'lxml',
         ],
-    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 +85,6 @@ setup(
         [babel.extractors]
         jinja2 = jinja2.ext:babel_extract
         """,
- 
     license='AGPLv3',
     author='Free Software Foundation and contributors',
     author_email='cwebber@gnu.org',