Merge branch 'persona_resquash'

[mediagoblin.git] / setup.py

diff --git a/setup.py b/setup.py
index 1aebeb0fa4548e938d78b51b2a0cb7f5e2139fb1..0155b8ce433ce0d326834df439de1b1664c14ad3 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -45,21 +45,26 @@ setup(
         'PasteScript',
         'wtforms',
         'py-bcrypt',
-        'nose',
+        'pytest>=2.3.1',
+        'pytest-xdist',
         'werkzeug>=0.7',
         'celery==2.5.3',
         'kombu==2.1.7',
         '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',
+        'pypump',
         ## This is optional!
         # 'translitcodec',
         ## For now we're expecting that users will install this from