From 234664b0d56c6ab7168d9196f4be963791ecb85b Mon Sep 17 00:00:00 2001 From: Georges Dubus Date: Thu, 5 Apr 2012 19:23:01 +0200 Subject: [PATCH] Updated to pyramid 1.3. --- development.ini.example | 2 +- production.ini | 2 +- rezoirclogs/tests/test_resources.py | 2 +- setup.py | 5 +++-- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/development.ini.example b/development.ini.example index 248c40b..62c8a56 100644 --- a/development.ini.example +++ b/development.ini.example @@ -23,7 +23,7 @@ cache.default_term.expire = 300 cache.long_term.expire = 3600 [server:main] -use = egg:Paste#http +use = egg:waitress#main host = 0.0.0.0 port = 6543 diff --git a/production.ini b/production.ini index a9435b0..3f00d5d 100644 --- a/production.ini +++ b/production.ini @@ -20,7 +20,7 @@ cache.default_term.expire = 300 cache.long_term.expire = 3600 [server:main] -use = egg:Paste#http +use = egg:waitress#main host = 0.0.0.0 port = 6543 diff --git a/rezoirclogs/tests/test_resources.py b/rezoirclogs/tests/test_resources.py index 21398b4..a9856db 100644 --- a/rezoirclogs/tests/test_resources.py +++ b/rezoirclogs/tests/test_resources.py @@ -18,7 +18,7 @@ def _make_one(self, *arg, **kw): def _config_cache(self): from beaker import cache - cache.cache_regions['short_term'] = {} + cache.cache_regions['short_term'] = {'key_length': 0} def test_list_jail(self): from os.path import abspath, join, dirname diff --git a/setup.py b/setup.py index 2a66900..6842e78 100644 --- a/setup.py +++ b/setup.py @@ -6,8 +6,9 @@ README = open(os.path.join(here, 'README.txt')).read() CHANGES = open(os.path.join(here, 'CHANGES.txt')).read() -requires = ['pyramid>=1.2dev', 'pyramid_debugtoolbar', 'pyramid_jinja2', - 'deform', 'pyramid_beaker', 'unittest2', 'deform_bootstrap'] +requires = ['pyramid>=1.3', 'pyramid_debugtoolbar', 'pyramid_jinja2', + 'deform', 'pyramid_beaker', 'unittest2', 'deform_bootstrap', + 'waitress'] setup(name='rezoirclogs', version='1.9',