Remove paste.server dependency from tests.

This commit is contained in:
Berker Peksag 2014-07-18 12:39:13 +03:00
parent c9cbc7e8a7
commit 88a5739d36
3 changed files with 8 additions and 29 deletions

View File

@ -1,40 +1,18 @@
[DEFAULT] [DEFAULT]
debug = true debug = true
[composite:main] [app:main]
use = egg:Paste#urlmap
/ = mediagoblin
/mgoblin_media/ = publicstore_serve
/test_static/ = mediagoblin_static
/theme_static/ = theme_static
/plugin_static/ = plugin_static
[app:mediagoblin]
use = egg:mediagoblin#app use = egg:mediagoblin#app
config = %(here)s/mediagoblin.ini config = %(here)s/mediagoblin.ini
/mgoblin_media = %(here)s/user_dev/media/public
[app:publicstore_serve] /test_static = %(here)s/mediagoblin/static
use = egg:Paste#static /theme_static = %(here)s/user_dev/theme_static
document_root = %(here)s/user_dev/media/public /plugin_static = %(here)s/user_dev/plugin_static
[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
[celery] [celery]
CELERY_ALWAYS_EAGER = true CELERY_ALWAYS_EAGER = true
[server:main] [server:main]
use = egg:Paste#http use = egg:gunicorn
host = 127.0.0.1 host = 127.0.0.1
port = 6543 port = 6543

View File

@ -50,6 +50,7 @@ if PY2:
py2_only_install_requires.append('mock') # mock is in the stdlib for 3.3+ py2_only_install_requires.append('mock') # mock is in the stdlib for 3.3+
install_requires = [ install_requires = [
'gunicorn==19',
'setuptools', # TODO: is this necessary 'setuptools', # TODO: is this necessary
'python-dateutil', 'python-dateutil',
'wtforms', 'wtforms',

View File

@ -7,9 +7,9 @@ usedevelop = True
whitelist_externals = sh whitelist_externals = sh
commands = commands =
python setup.py develop python setup.py develop
gmg dbupdate
sh runtests.sh sh runtests.sh
deps = deps =
git+https://github.com/ianare/exif-py.git@develop git+https://github.com/ianare/exif-py.git@develop
hg+https://bitbucket.org/berkerpeksag/paste
lxml lxml
Pillow Pillow