Remove paste.server dependency from tests.

diff --git a/mediagoblin/tests/test_paste.ini b/mediagoblin/tests/test_paste.ini
index a95954325d7009cf11526fb8655613304f84bd58..8d75c3cb3076c23865a7527ddd19b8f4c2851073 100644 (file)
--- a/mediagoblin/tests/test_paste.ini
+++ b/mediagoblin/tests/test_paste.ini
@@ -1,40 +1,18 @@
 [DEFAULT]
 debug = true
 
-[composite:main]
-use = egg:Paste#urlmap
-/ = mediagoblin
-/mgoblin_media/ = publicstore_serve
-/test_static/ = mediagoblin_static
-/theme_static/ = theme_static
-/plugin_static/ = plugin_static
-
-[app:mediagoblin]
+[app:main]
 use = egg:mediagoblin#app
 config = %(here)s/mediagoblin.ini
-
-[app:publicstore_serve]
-use = egg:Paste#static
-document_root = %(here)s/user_dev/media/public
-
-[app:mediagoblin_static]
-use = egg:Paste#static
-document_root = %(here)s/mediagoblin/static/
-
-[app:theme_static]
-use = egg:Paste#static
-document_root = %(here)s/user_dev/theme_static/
-cache_max_age = 86400
-
-[app:plugin_static]
-use = egg:Paste#static
-document_root = %(here)s/user_dev/plugin_static/
-cache_max_age = 86400
+/mgoblin_media = %(here)s/user_dev/media/public
+/test_static = %(here)s/mediagoblin/static
+/theme_static = %(here)s/user_dev/theme_static
+/plugin_static = %(here)s/user_dev/plugin_static
 
 [celery]
 CELERY_ALWAYS_EAGER = true
 
 [server:main]
-use = egg:Paste#http
+use = egg:gunicorn
 host = 127.0.0.1
 port = 6543

diff --git a/setup.py b/setup.py
index 658cf8c32d700afc3ffdc82c54777b46b9e41f3e..4e4244aec4bc70b12ca399b0859a3466eadbbdd3 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -50,6 +50,7 @@ if PY2:
     py2_only_install_requires.append('mock')  # mock is in the stdlib for 3.3+
 
 install_requires = [
+    'gunicorn==19',
     'setuptools',  # TODO: is this necessary
     'python-dateutil',
     'wtforms',

diff --git a/tox.ini b/tox.ini
index 35a99ad3308ba7dec79da1ee8b7da55b4928c098..4f123c1bc2e7d4e74edbb9003e8c617d97a0f240 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -7,9 +7,9 @@ usedevelop = True
 whitelist_externals = sh
 commands =
  python setup.py develop
+ gmg dbupdate
  sh runtests.sh
 deps =
  git+https://github.com/ianare/exif-py.git@develop
- hg+https://bitbucket.org/berkerpeksag/paste
  lxml
  Pillow