This update I mostly did work on the templates for the admin pages. I did a co-

[mediagoblin.git] / setup.py

diff --git a/setup.py b/setup.py
index 3e382e565a0fb360c98bdd5744bb11a02c827fb7..f320e92cb774262dec31910b429df58b4d59e528 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -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
 
@@ -36,38 +36,39 @@ def get_version():
 setup(
     name="mediagoblin",
     version=get_version(),
-    packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
+    packages=['mediagoblin'],
     zip_safe=False,
     include_package_data = True,
     # scripts and dependencies
     install_requires=[
         'setuptools',
         'PasteScript',
-        'beaker',
-        'routes',
-        'pymongo',
-        'mongokit',
-        'webob<=1.2a2',
         'wtforms',
         'py-bcrypt',
-        'nose',
-        'werkzeug',
-        'celery',
+        'pytest>=2.3',
+        'pytest-xdist',
+        'werkzeug>=0.7',
+        'celery==2.5.3',
+        'kombu==2.1.7',
         'jinja2',
         'sphinx',
-        'PIL',
         'Babel',
-        'translitcodec',
         'argparse',
-        'webtest',
+        'webtest<2',
         'ConfigObj',
         'Markdown',
-        'sqlalchemy',
+        'sqlalchemy>=0.7.0',
         'sqlalchemy-migrate',
-        'kombu-sqlalchemy',
+        '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',
@@ -97,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"
         ],
     )