X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=setup.py;h=4ceac45b37fd9db9c07744bd8219b70f96021fc0;hb=8087f56b07b11a8abc1f6d5108a70765712cc63d;hp=7417fb97f47110b7cbc323b19b0236dd4f09b114;hpb=81291bbb896d04fee66b9482f479b3fc6e6e07f5;p=mediagoblin.git

diff --git a/setup.py b/setup.py
index 7417fb97..4ceac45b 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
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-from setuptools import setup, find_packages
+from setuptools import setup
 import os
 import re
 
@@ -29,45 +29,50 @@ 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(),
-    packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
+    name="mediagoblin",
+    version=get_version(),
+    packages=['mediagoblin'],
     zip_safe=False,
+    include_package_data = True,
     # scripts and dependencies
-    install_requires = [
+    install_requires=[
         'setuptools',
         'PasteScript',
-        'beaker',
-        'routes',
-        'pymongo',
-        'mongokit',
-        'webob',
         'wtforms',
         'py-bcrypt',
-        'nose',
-        'werkzeug',
-        'celery',
+        'pytest',
+        'pytest-xdist',
+        'werkzeug>=0.7',
+        'celery==2.5.3',
+        'kombu==2.1.7',
         'jinja2',
         'sphinx',
-        'PIL',
         'Babel',
-        'translitcodec',
         'argparse',
-        'webtest',
+        'webtest<2',
         'ConfigObj',
         'Markdown',
-        'python-cloudfiles',
-        'arista',
+        'sqlalchemy>=0.7.0',
+        'sqlalchemy-migrate',
+        'mock',
+        'itsdangerous',
+        'pytz',
+        'six',
+        ## This is optional!
+        # 'translitcodec',
         ## For now we're expecting that users will install this from
         ## their package managers.
         # 'lxml',
+        # 'PIL',
         ],
+    # 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 +89,6 @@ setup(
         [babel.extractors]
         jinja2 = jinja2.ext:babel_extract
         """,
- 
     license='AGPLv3',
     author='Free Software Foundation and contributors',
     author_email='cwebber@gnu.org',
@@ -94,9 +98,11 @@ setup(
     classifiers=[
         "Development Status :: 3 - Alpha",
         "Environment :: Web Environment",
-        "License :: OSI Approved :: GNU Affero General Public License",
+        "License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)",
         "Operating System :: OS Independent",
         "Programming Language :: Python",
+        'Programming Language :: Python :: 2.6',
+        'Programming Language :: Python :: 2.7',
         "Topic :: Internet :: WWW/HTTP :: Dynamic Content"
         ],
     )