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/narr/MyProject | |
| 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/narr/MyProject')
| -rw-r--r-- | docs/narr/MyProject/development.ini | 2 | ||||
| -rw-r--r-- | docs/narr/MyProject/production.ini | 2 | ||||
| -rw-r--r-- | docs/narr/MyProject/setup.py | 6 |
3 files changed, 7 insertions, 3 deletions
diff --git a/docs/narr/MyProject/development.ini b/docs/narr/MyProject/development.ini index d61da580f..2ccedb27b 100644 --- a/docs/narr/MyProject/development.ini +++ b/docs/narr/MyProject/development.ini @@ -10,7 +10,7 @@ pyramid.default_locale_name = en pyramid.includes = pyramid_debugtoolbar [server:main] -use = egg:pyramid#wsgiref +use = egg:waitress#main host = 0.0.0.0 port = 6543 diff --git a/docs/narr/MyProject/production.ini b/docs/narr/MyProject/production.ini index 97050e8fe..43ea1d140 100644 --- a/docs/narr/MyProject/production.ini +++ b/docs/narr/MyProject/production.ini @@ -9,7 +9,7 @@ pyramid.debug_templates = false pyramid.default_locale_name = en [server:main] -use = egg:pyramid#wsgiref +use = egg:waitress#main host = 0.0.0.0 port = 6543 diff --git a/docs/narr/MyProject/setup.py b/docs/narr/MyProject/setup.py index 74879f65d..b119a954b 100644 --- a/docs/narr/MyProject/setup.py +++ b/docs/narr/MyProject/setup.py @@ -6,7 +6,11 @@ here = os.path.abspath(os.path.dirname(__file__)) README = open(os.path.join(here, 'README.txt')).read() CHANGES = open(os.path.join(here, 'CHANGES.txt')).read() -requires = ['pyramid', 'pyramid_debugtoolbar'] +requires = [ + 'pyramid', + 'pyramid_debugtoolbar', + 'waitress', + ] setup(name='MyProject', version='0.0', |