Issue #5394: Wrong url for forgot_password in basic_auth plugin

[mediagoblin.git] / setup.py

diff --git a/setup.py b/setup.py
index 562252e3797a300c02061de535f107176baca7f2..e8c4b0349dd1648813cd5441235b52c87f385872 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -52,10 +52,12 @@ if PY2:
     # # use pbr, and currently it breaks things, presumably till
     # # their next release.
     # pyversion_install_requires.append('pbr==0.5.22')
-    pyversion_install_requires.append('mock')  # mock is in the stdlib for 3.3+
+    pyversion_install_requires.append('mock==1.0.1')  # mock is in the stdlib for 3.3+
     # PyPI version (1.4.2) does not have proper Python 3 support
     pyversion_install_requires.append('ExifRead')
     pyversion_install_requires.append('PasteScript')
+    # Paste 2.0 is breaking wsgi, see:
+    #  https://bitbucket.org/ianb/paste/issue/4/wsgi-environ-totally-borked
     pyversion_install_requires.append('Paste')
 else:
     pyversion_install_requires.append('gunicorn')
@@ -72,20 +74,19 @@ install_requires = [
     'kombu',
     'jinja2',
     'Babel>=1.3',
-    'webtest<2',
+    'WebTest>=2.0.18',
     'ConfigObj',
     'Markdown',
     'sqlalchemy<0.9.0, >0.8.0',
     'itsdangerous',
     'pytz',
-    # PLEASE change this when we can; a dependency is forcing us to set this
-    # specific number and it is breaking setup.py develop
-    'six==1.5.2',
+    'sphinx',
+    'six',
     'oauthlib',
     'unidecode',
     'jsonschema',
     'PasteDeploy',
-    'requests',
+    'requests>=2.6.0',
     'pyld',
     # This is optional:
     # 'translitcodec',
@@ -118,11 +119,13 @@ try:
     entry_points="""\
         [console_scripts]
         gmg = mediagoblin.gmg_commands:main_cli
-        pybabel = mediagoblin.babel.messages.frontend:main
 
         [paste.app_factory]
         app = mediagoblin.app:paste_app_factory
 
+        [paste.server_runner]
+        paste_server_selector = mediagoblin.app:paste_server_selector
+
         [paste.filter_app_factory]
         errors = mediagoblin.errormiddleware:mgoblin_error_middleware