Updated to pyramid 1.3.

supelec-rezo · Apr 5, 2012 · 234664b · 234664b
1 parent 430eb21
commit 234664b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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',