diff options
| author | Berker Peksag <berker.peksag@gmail.com> | 2014-07-18 12:39:13 +0300 |
|---|---|---|
| committer | Berker Peksag <berker.peksag@gmail.com> | 2014-07-18 12:39:13 +0300 |
| commit | 88a5739d36f5623229f359d0453988d1806e3a77 (patch) | |
| tree | fc015b032962cae021c23193d8ad8c2289027bf6 | |
| parent | c9cbc7e8a7bca8cedb02bbcfaf17c4c17176821b (diff) | |
| download | mediagoblin-88a5739d36f5623229f359d0453988d1806e3a77.tar.lz mediagoblin-88a5739d36f5623229f359d0453988d1806e3a77.tar.xz mediagoblin-88a5739d36f5623229f359d0453988d1806e3a77.zip | |
Remove paste.server dependency from tests.
| -rw-r--r-- | mediagoblin/tests/test_paste.ini | 34 | ||||
| -rw-r--r-- | setup.py | 1 | ||||
| -rw-r--r-- | tox.ini | 2 |
3 files changed, 8 insertions, 29 deletions
diff --git a/mediagoblin/tests/test_paste.ini b/mediagoblin/tests/test_paste.ini index a9595432..8d75c3cb 100644 --- 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 @@ -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', @@ -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 |