This was a big commit! I included lots of documentation below, but generally I

[mediagoblin.git] / setup.py

diff --git a/setup.py b/setup.py
index 9c295dc4972ab31818de6554560af735213bed40..66f21b0cbd38bc607123d9054d75415735d06608 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -43,23 +43,27 @@ setup(
     install_requires=[
         'setuptools',
         'PasteScript',
-        'beaker',
         'wtforms',
         'py-bcrypt',
-        'nose',
+        'pytest>=2.3.1',
+        'pytest-xdist',
         'werkzeug>=0.7',
-        'celery==2.5.3',
-        'kombu==2.1.7',
+        'celery',
+        'kombu',
         'jinja2',
         'sphinx',
-        'Babel',
+        'Babel<1.0',
         'argparse',
-        'webtest',
+        'webtest<2',
         'ConfigObj',
         'Markdown',
-        'sqlalchemy>=0.7.0',
+        'sqlalchemy>=0.8.0',
         'sqlalchemy-migrate',
         'mock',
+        'itsdangerous',
+        'pytz',
+        'six',
+        'oauthlib',
         ## This is optional!
         # 'translitcodec',
         ## For now we're expecting that users will install this from