diff options
| author | Chris McDonough <chrism@plope.com> | 2012-01-10 14:45:12 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-01-10 14:45:12 -0500 |
| commit | 26484029f9d4d591e9541547f6d5e381ce3a0be2 (patch) | |
| tree | aba3132e660b320a6734adb0d93a3b6bbdcf5877 /docs/tutorials/wiki2/src/models | |
| parent | a21278872884809cfec7d5de8c64518c404f2b02 (diff) | |
| parent | cf3a11e990adda800e284effb006f1c28335da4d (diff) | |
| download | pyramid-26484029f9d4d591e9541547f6d5e381ce3a0be2.tar.gz pyramid-26484029f9d4d591e9541547f6d5e381ce3a0be2.tar.bz2 pyramid-26484029f9d4d591e9541547f6d5e381ce3a0be2.zip | |
Merge branch '1.3-branch'
Diffstat (limited to 'docs/tutorials/wiki2/src/models')
| -rw-r--r-- | docs/tutorials/wiki2/src/models/development.ini | 2 | ||||
| -rw-r--r-- | docs/tutorials/wiki2/src/models/production.ini | 2 | ||||
| -rw-r--r-- | docs/tutorials/wiki2/src/models/setup.py | 5 |
3 files changed, 3 insertions, 6 deletions
diff --git a/docs/tutorials/wiki2/src/models/development.ini b/docs/tutorials/wiki2/src/models/development.ini index 4f7493cba..2bb74454c 100644 --- a/docs/tutorials/wiki2/src/models/development.ini +++ b/docs/tutorials/wiki2/src/models/development.ini @@ -13,7 +13,7 @@ pyramid.includes = pyramid_debugtoolbar sqlalchemy.url = sqlite:///%(here)s/tutorial.db [server:main] -use = egg:pyramid#wsgiref +use = egg:waitress#main host = 0.0.0.0 port = 6543 diff --git a/docs/tutorials/wiki2/src/models/production.ini b/docs/tutorials/wiki2/src/models/production.ini index 53eaf20a1..ec6dea135 100644 --- a/docs/tutorials/wiki2/src/models/production.ini +++ b/docs/tutorials/wiki2/src/models/production.ini @@ -12,7 +12,7 @@ pyramid.includes = pyramid_tm sqlalchemy.url = sqlite:///%(here)s/tutorial.db [server:main] -use = egg:pyramid#wsgiref +use = egg:waitress#main host = 0.0.0.0 port = 6543 diff --git a/docs/tutorials/wiki2/src/models/setup.py b/docs/tutorials/wiki2/src/models/setup.py index 0ca918cab..fae1c25a8 100644 --- a/docs/tutorials/wiki2/src/models/setup.py +++ b/docs/tutorials/wiki2/src/models/setup.py @@ -1,5 +1,4 @@ import os -import sys from setuptools import setup, find_packages @@ -14,11 +13,9 @@ requires = [ 'pyramid_tm', 'pyramid_debugtoolbar', 'zope.sqlalchemy', + 'waitress', ] -if sys.version_info[:3] < (2,5,0): - requires.append('pysqlite') - setup(name='tutorial', version='0.0', description='tutorial', |