Merge pull request #3180 from shentonfreude/feature/GH#2926_quick_tutorial_wsgiref_to_waitress

Feature/gh#2926 quick tutorial wsgiref to waitress

46 files changed, 78 insertions, 57 deletions

diff --git a/docs/quick_tutorial/authentication.rst b/docs/quick_tutorial/authentication.rst
index 892beb3ec..684cce6a6 100644
--- a/docs/quick_tutorial/authentication.rst
+++ b/docs/quick_tutorial/authentication.rst
@@ -39,7 +39,7 @@ Steps
 
    .. literalinclude:: authentication/setup.py
     :language: python
-    :emphasize-lines: 5-6
+    :emphasize-lines: 7
     :linenos:
 
 #. We can now install our project in development mode:
diff --git a/docs/quick_tutorial/authentication/development.ini b/docs/quick_tutorial/authentication/development.ini
index a4586d45f..cae509542 100644
--- a/docs/quick_tutorial/authentication/development.ini
+++ b/docs/quick_tutorial/authentication/development.ini
@@ -6,5 +6,5 @@ pyramid.includes =
 tutorial.secret = 98zd
 
 [server:main]
-use = egg:pyramid#wsgiref
-port = 6543
+use = egg:waitress#main
+listen = localhost:6543
diff --git a/docs/quick_tutorial/authentication/setup.py b/docs/quick_tutorial/authentication/setup.py
index 7a6ff4226..808a6f9a9 100644
--- a/docs/quick_tutorial/authentication/setup.py
+++ b/docs/quick_tutorial/authentication/setup.py
@@ -2,6 +2,7 @@ from setuptools import setup
 
 requires = [
     'pyramid',
+    'waitress',
     'pyramid_chameleon',
     'bcrypt'
 ]
diff --git a/docs/quick_tutorial/authorization/development.ini b/docs/quick_tutorial/authorization/development.ini
index a4586d45f..cae509542 100644
--- a/docs/quick_tutorial/authorization/development.ini
+++ b/docs/quick_tutorial/authorization/development.ini
@@ -6,5 +6,5 @@ pyramid.includes =
 tutorial.secret = 98zd
 
 [server:main]
-use = egg:pyramid#wsgiref
-port = 6543
+use = egg:waitress#main
+listen = localhost:6543
diff --git a/docs/quick_tutorial/authorization/setup.py b/docs/quick_tutorial/authorization/setup.py
index 7a6ff4226..808a6f9a9 100644
--- a/docs/quick_tutorial/authorization/setup.py
+++ b/docs/quick_tutorial/authorization/setup.py
@@ -2,6 +2,7 @@ from setuptools import setup
 
 requires = [
     'pyramid',
+    'waitress',
     'pyramid_chameleon',
     'bcrypt'
 ]
diff --git a/docs/quick_tutorial/databases/development.ini b/docs/quick_tutorial/databases/development.ini
index 270643071..270cf7b63 100644
--- a/docs/quick_tutorial/databases/development.ini
+++ b/docs/quick_tutorial/databases/development.ini
@@ -8,8 +8,8 @@ pyramid.includes =
 sqlalchemy.url = sqlite:///%(here)s/sqltutorial.sqlite
 
 [server:main]
-use = egg:pyramid#wsgiref
-port = 6543
+use = egg:waitress#main
+listen = localhost:6543
 
 # Begin logging configuration
 
diff --git a/docs/quick_tutorial/databases/setup.py b/docs/quick_tutorial/databases/setup.py
index 238358fe4..66045fd7e 100644
--- a/docs/quick_tutorial/databases/setup.py
+++ b/docs/quick_tutorial/databases/setup.py
@@ -2,6 +2,7 @@ from setuptools import setup
 
 requires = [
     'pyramid',
+    'waitress',
     'pyramid_chameleon',
     'deform',
     'sqlalchemy',
diff --git a/docs/quick_tutorial/debugtoolbar/development.ini b/docs/quick_tutorial/debugtoolbar/development.ini
index 17b479011..58d23cff7 100644
--- a/docs/quick_tutorial/debugtoolbar/development.ini
+++ b/docs/quick_tutorial/debugtoolbar/development.ini
@@ -4,5 +4,5 @@ pyramid.includes =
     pyramid_debugtoolbar
 
 [server:main]
-use = egg:pyramid#wsgiref
-port = 6543
+use = egg:waitress#main
+listen = localhost:6543
diff --git a/docs/quick_tutorial/debugtoolbar/setup.py b/docs/quick_tutorial/debugtoolbar/setup.py
index 9997984d3..a93cf6a73 100644
--- a/docs/quick_tutorial/debugtoolbar/setup.py
+++ b/docs/quick_tutorial/debugtoolbar/setup.py
@@ -2,6 +2,7 @@ from setuptools import setup
 
 requires = [
     'pyramid',
+    'waitress',
 ]
 
 setup(name='tutorial',
diff --git a/docs/quick_tutorial/forms.rst b/docs/quick_tutorial/forms.rst
index 84ceb13d6..3c865ad09 100644
--- a/docs/quick_tutorial/forms.rst
+++ b/docs/quick_tutorial/forms.rst
@@ -41,7 +41,7 @@ Steps
    pulls in Colander as a dependency:
 
    .. literalinclude:: forms/setup.py
-    :emphasize-lines: 5-6
+    :emphasize-lines: 7
     :linenos:
 
 #. We can now install our project in development mode:
diff --git a/docs/quick_tutorial/forms/development.ini b/docs/quick_tutorial/forms/development.ini
index 7066668bf..78d7479e7 100644
--- a/docs/quick_tutorial/forms/development.ini
+++ b/docs/quick_tutorial/forms/development.ini
@@ -5,5 +5,5 @@ pyramid.includes =
     pyramid_debugtoolbar
 
 [server:main]
-use = egg:pyramid#wsgiref
-port = 6543
+use = egg:waitress#main
+listen = localhost:6543
diff --git a/docs/quick_tutorial/forms/setup.py b/docs/quick_tutorial/forms/setup.py
index 361ade013..5293ef7f0 100644
--- a/docs/quick_tutorial/forms/setup.py
+++ b/docs/quick_tutorial/forms/setup.py
@@ -2,6 +2,7 @@ from setuptools import setup
 
 requires = [
     'pyramid',
+    'waitress',
     'pyramid_chameleon',
     'deform'
 ]
diff --git a/docs/quick_tutorial/functional_testing/development.ini b/docs/quick_tutorial/functional_testing/development.ini
index 17b479011..58d23cff7 100644
--- a/docs/quick_tutorial/functional_testing/development.ini
+++ b/docs/quick_tutorial/functional_testing/development.ini
@@ -4,5 +4,5 @@ pyramid.includes =
     pyramid_debugtoolbar
 
 [server:main]
-use = egg:pyramid#wsgiref
-port = 6543
+use = egg:waitress#main
+listen = localhost:6543
diff --git a/docs/quick_tutorial/functional_testing/setup.py b/docs/quick_tutorial/functional_testing/setup.py
index 9997984d3..a93cf6a73 100644
--- a/docs/quick_tutorial/functional_testing/setup.py
+++ b/docs/quick_tutorial/functional_testing/setup.py
@@ -2,6 +2,7 @@ from setuptools import setup
 
 requires = [
     'pyramid',
+    'waitress',
 ]
 
 setup(name='tutorial',
diff --git a/docs/quick_tutorial/hello_world/app.py b/docs/quick_tutorial/hello_world/app.py
index d0351e251..ff0b950d3 100644
--- a/docs/quick_tutorial/hello_world/app.py
+++ b/docs/quick_tutorial/hello_world/app.py
@@ -1,4 +1,4 @@
-from wsgiref.simple_server import make_server
+from waitress import serve
 from pyramid.config import Configurator
 from pyramid.response import Response
 
@@ -13,5 +13,4 @@ if __name__ == '__main__':
         config.add_route('hello', '/')
         config.add_view(hello_world, route_name='hello')
         app = config.make_wsgi_app()
-    server = make_server('0.0.0.0', 6543, app)
-    server.serve_forever()
+    serve(app, host='0.0.0.0', port=6543)
diff --git a/docs/quick_tutorial/ini.rst b/docs/quick_tutorial/ini.rst
index 96dfc5b5f..f6d64eeda 100644
--- a/docs/quick_tutorial/ini.rst
+++ b/docs/quick_tutorial/ini.rst
@@ -89,7 +89,7 @@ application. Processing then proceeds as described in the Pyramid chapter on
 
 - ``pserve`` looks for ``[app:main]`` and finds ``use = egg:tutorial``.
 
-- The projects's ``setup.py`` has defined an "entry point" (lines 9-12) for the
+- The projects's ``setup.py`` has defined an "entry point" (lines 10-13) for the
   project's "main" entry point of ``tutorial:main``.
 
 - The ``tutorial`` package's ``__init__`` has a ``main`` function.
@@ -99,10 +99,12 @@ application. Processing then proceeds as described in the Pyramid chapter on
 
 The ``.ini`` file is also used for two other functions:
 
-- *Configuring the WSGI server*. ``[server:main]`` wires up the choice of which
-  WSGI *server* for your WSGI *application*. In this case, we are using
-  ``wsgiref`` bundled in the Python library. It also wires up the *port
-  number*: ``port = 6543`` tells ``wsgiref`` to listen on port 6543.
+- *Configuring the WSGI server*. ``[server:main]`` wires up the choice
+  of which WSGI *server* for your WSGI *application*. In this case, we
+  are using ``waitress`` which was specified in
+  ``tutorial/setup.py``. It also wires up the *port number*:
+  ``listen = localhost:6543`` tells ``waitress`` to listen on host
+  ``localhost`` at port ``6543``.
 
 - *Configuring Python logging*. Pyramid uses Python standard logging, which
   needs a number of configuration values. The ``.ini`` serves this function.
diff --git a/docs/quick_tutorial/ini/development.ini b/docs/quick_tutorial/ini/development.ini
index cffbd66c9..5361188a3 100644
--- a/docs/quick_tutorial/ini/development.ini
+++ b/docs/quick_tutorial/ini/development.ini
@@ -2,5 +2,5 @@
 use = egg:tutorial
 
 [server:main]
-use = egg:pyramid#wsgiref
-port = 6543
+use = egg:waitress#main
+listen = localhost:6543
diff --git a/docs/quick_tutorial/ini/setup.py b/docs/quick_tutorial/ini/setup.py
index 9997984d3..a93cf6a73 100644
--- a/docs/quick_tutorial/ini/setup.py
+++ b/docs/quick_tutorial/ini/setup.py
@@ -2,6 +2,7 @@ from setuptools import setup
 
 requires = [
     'pyramid',
+    'waitress',
 ]
 
 setup(name='tutorial',
diff --git a/docs/quick_tutorial/jinja2/development.ini b/docs/quick_tutorial/jinja2/development.ini
index 7066668bf..78d7479e7 100644
--- a/docs/quick_tutorial/jinja2/development.ini
+++ b/docs/quick_tutorial/jinja2/development.ini
@@ -5,5 +5,5 @@ pyramid.includes =
     pyramid_debugtoolbar
 
 [server:main]
-use = egg:pyramid#wsgiref
-port = 6543
+use = egg:waitress#main
+listen = localhost:6543
diff --git a/docs/quick_tutorial/jinja2/setup.py b/docs/quick_tutorial/jinja2/setup.py
index 9997984d3..a93cf6a73 100644
--- a/docs/quick_tutorial/jinja2/setup.py
+++ b/docs/quick_tutorial/jinja2/setup.py
@@ -2,6 +2,7 @@ from setuptools import setup
 
 requires = [
     'pyramid',
+    'waitress',
 ]
 
 setup(name='tutorial',
diff --git a/docs/quick_tutorial/json/development.ini b/docs/quick_tutorial/json/development.ini
index 7066668bf..78d7479e7 100644
--- a/docs/quick_tutorial/json/development.ini
+++ b/docs/quick_tutorial/json/development.ini
@@ -5,5 +5,5 @@ pyramid.includes =
     pyramid_debugtoolbar
 
 [server:main]
-use = egg:pyramid#wsgiref
-port = 6543
+use = egg:waitress#main
+listen = localhost:6543
diff --git a/docs/quick_tutorial/json/setup.py b/docs/quick_tutorial/json/setup.py
index 2221b72e9..aefa352d4 100644
--- a/docs/quick_tutorial/json/setup.py
+++ b/docs/quick_tutorial/json/setup.py
@@ -2,6 +2,7 @@ from setuptools import setup
 
 requires = [
     'pyramid',
+    'waitress',
     'pyramid_chameleon'
 ]
 
diff --git a/docs/quick_tutorial/logging/development.ini b/docs/quick_tutorial/logging/development.ini
index b869ca5b6..ff470acdb 100644
--- a/docs/quick_tutorial/logging/development.ini
+++ b/docs/quick_tutorial/logging/development.ini
@@ -5,8 +5,8 @@ pyramid.includes =
     pyramid_debugtoolbar
 
 [server:main]
-use = egg:pyramid#wsgiref
-port = 6543
+use = egg:waitress#main
+listen = localhost:6543
 
 # Begin logging configuration
 
diff --git a/docs/quick_tutorial/logging/setup.py b/docs/quick_tutorial/logging/setup.py
index 2221b72e9..aefa352d4 100644
--- a/docs/quick_tutorial/logging/setup.py
+++ b/docs/quick_tutorial/logging/setup.py
@@ -2,6 +2,7 @@ from setuptools import setup
 
 requires = [
     'pyramid',
+    'waitress',
     'pyramid_chameleon'
 ]
 
diff --git a/docs/quick_tutorial/more_view_classes/development.ini b/docs/quick_tutorial/more_view_classes/development.ini
index 7066668bf..78d7479e7 100644
--- a/docs/quick_tutorial/more_view_classes/development.ini
+++ b/docs/quick_tutorial/more_view_classes/development.ini
@@ -5,5 +5,5 @@ pyramid.includes =
     pyramid_debugtoolbar
 
 [server:main]
-use = egg:pyramid#wsgiref
-port = 6543
+use = egg:waitress#main
+listen = localhost:6543
diff --git a/docs/quick_tutorial/more_view_classes/setup.py b/docs/quick_tutorial/more_view_classes/setup.py
index 2221b72e9..aefa352d4 100644
--- a/docs/quick_tutorial/more_view_classes/setup.py
+++ b/docs/quick_tutorial/more_view_classes/setup.py
@@ -2,6 +2,7 @@ from setuptools import setup
 
 requires = [
     'pyramid',
+    'waitress',
     'pyramid_chameleon'
 ]
 
diff --git a/docs/quick_tutorial/package/tutorial/app.py b/docs/quick_tutorial/package/tutorial/app.py
index d0351e251..ff0b950d3 100644
--- a/docs/quick_tutorial/package/tutorial/app.py
+++ b/docs/quick_tutorial/package/tutorial/app.py
@@ -1,4 +1,4 @@
-from wsgiref.simple_server import make_server
+from waitress import serve
 from pyramid.config import Configurator
 from pyramid.response import Response
 
@@ -13,5 +13,4 @@ if __name__ == '__main__':
         config.add_route('hello', '/')
         config.add_view(hello_world, route_name='hello')
         app = config.make_wsgi_app()
-    server = make_server('0.0.0.0', 6543, app)
-    server.serve_forever()
+    serve(app, host='0.0.0.0', port=6543)
diff --git a/docs/quick_tutorial/request_response/development.ini b/docs/quick_tutorial/request_response/development.ini
index 7066668bf..78d7479e7 100644
--- a/docs/quick_tutorial/request_response/development.ini
+++ b/docs/quick_tutorial/request_response/development.ini
@@ -5,5 +5,5 @@ pyramid.includes =
     pyramid_debugtoolbar
 
 [server:main]
-use = egg:pyramid#wsgiref
-port = 6543
+use = egg:waitress#main
+listen = localhost:6543
diff --git a/docs/quick_tutorial/request_response/setup.py b/docs/quick_tutorial/request_response/setup.py
index 9997984d3..a93cf6a73 100644
--- a/docs/quick_tutorial/request_response/setup.py
+++ b/docs/quick_tutorial/request_response/setup.py
@@ -2,6 +2,7 @@ from setuptools import setup
 
 requires = [
     'pyramid',
+    'waitress',
 ]
 
 setup(name='tutorial',
diff --git a/docs/quick_tutorial/requirements.rst b/docs/quick_tutorial/requirements.rst
index 70e68514b..a65cfe6d2 100644
--- a/docs/quick_tutorial/requirements.rst
+++ b/docs/quick_tutorial/requirements.rst
@@ -189,17 +189,18 @@ Install Pyramid
 ---------------
 
 We have our Python standard prerequisites out of the way. The Pyramid
-part is pretty easy.
+part is pretty easy. We'll also install a WSGI server, Waitress.
 
 .. parsed-literal::
 
     # Mac and Linux
-    $ $VENV/bin/pip install "pyramid==\ |release|\ "
+    $ $VENV/bin/pip install "pyramid==\ |release|\ " waitress
 
     # Windows
-    c:\\> %VENV%\\Scripts\\pip install "pyramid==\ |release|\ "
+    c:\\> %VENV%\\Scripts\\pip install "pyramid==\ |release|\ " waitress
 
-Our Python virtual environment now has the Pyramid software available.
+Our Python virtual environment now has the Pyramid software available
+as well as the ``waitress`` package.
 
 You can optionally install some of the extra Python packages used in this
 tutorial.
diff --git a/docs/quick_tutorial/retail_forms/development.ini b/docs/quick_tutorial/retail_forms/development.ini
index 7066668bf..78d7479e7 100644
--- a/docs/quick_tutorial/retail_forms/development.ini
+++ b/docs/quick_tutorial/retail_forms/development.ini
@@ -5,5 +5,5 @@ pyramid.includes =
     pyramid_debugtoolbar
 
 [server:main]
-use = egg:pyramid#wsgiref
-port = 6543
+use = egg:waitress#main
+listen = localhost:6543
diff --git a/docs/quick_tutorial/retail_forms/setup.py b/docs/quick_tutorial/retail_forms/setup.py
index 361ade013..5293ef7f0 100644
--- a/docs/quick_tutorial/retail_forms/setup.py
+++ b/docs/quick_tutorial/retail_forms/setup.py
@@ -2,6 +2,7 @@ from setuptools import setup
 
 requires = [
     'pyramid',
+    'waitress',
     'pyramid_chameleon',
     'deform'
 ]
diff --git a/docs/quick_tutorial/routing/development.ini b/docs/quick_tutorial/routing/development.ini
index 7066668bf..78d7479e7 100644
--- a/docs/quick_tutorial/routing/development.ini
+++ b/docs/quick_tutorial/routing/development.ini
@@ -5,5 +5,5 @@ pyramid.includes =
     pyramid_debugtoolbar
 
 [server:main]
-use = egg:pyramid#wsgiref
-port = 6543
+use = egg:waitress#main
+listen = localhost:6543
diff --git a/docs/quick_tutorial/routing/setup.py b/docs/quick_tutorial/routing/setup.py
index 2221b72e9..aefa352d4 100644
--- a/docs/quick_tutorial/routing/setup.py
+++ b/docs/quick_tutorial/routing/setup.py
@@ -2,6 +2,7 @@ from setuptools import setup
 
 requires = [
     'pyramid',
+    'waitress',
     'pyramid_chameleon'
 ]
 
diff --git a/docs/quick_tutorial/sessions/development.ini b/docs/quick_tutorial/sessions/development.ini
index 7066668bf..78d7479e7 100644
--- a/docs/quick_tutorial/sessions/development.ini
+++ b/docs/quick_tutorial/sessions/development.ini
@@ -5,5 +5,5 @@ pyramid.includes =
     pyramid_debugtoolbar
 
 [server:main]
-use = egg:pyramid#wsgiref
-port = 6543
+use = egg:waitress#main
+listen = localhost:6543
diff --git a/docs/quick_tutorial/sessions/setup.py b/docs/quick_tutorial/sessions/setup.py
index 2221b72e9..aefa352d4 100644
--- a/docs/quick_tutorial/sessions/setup.py
+++ b/docs/quick_tutorial/sessions/setup.py
@@ -2,6 +2,7 @@ from setuptools import setup
 
 requires = [
     'pyramid',
+    'waitress',
     'pyramid_chameleon'
 ]
 
diff --git a/docs/quick_tutorial/static_assets/development.ini b/docs/quick_tutorial/static_assets/development.ini
index 7066668bf..78d7479e7 100644
--- a/docs/quick_tutorial/static_assets/development.ini
+++ b/docs/quick_tutorial/static_assets/development.ini
@@ -5,5 +5,5 @@ pyramid.includes =
     pyramid_debugtoolbar
 
 [server:main]
-use = egg:pyramid#wsgiref
-port = 6543
+use = egg:waitress#main
+listen = localhost:6543
diff --git a/docs/quick_tutorial/static_assets/setup.py b/docs/quick_tutorial/static_assets/setup.py
index 2221b72e9..aefa352d4 100644
--- a/docs/quick_tutorial/static_assets/setup.py
+++ b/docs/quick_tutorial/static_assets/setup.py
@@ -2,6 +2,7 @@ from setuptools import setup
 
 requires = [
     'pyramid',
+    'waitress',
     'pyramid_chameleon'
 ]
 
diff --git a/docs/quick_tutorial/templating/development.ini b/docs/quick_tutorial/templating/development.ini
index 7066668bf..78d7479e7 100644
--- a/docs/quick_tutorial/templating/development.ini
+++ b/docs/quick_tutorial/templating/development.ini
@@ -5,5 +5,5 @@ pyramid.includes =
     pyramid_debugtoolbar
 
 [server:main]
-use = egg:pyramid#wsgiref
-port = 6543
+use = egg:waitress#main
+listen = localhost:6543
diff --git a/docs/quick_tutorial/templating/setup.py b/docs/quick_tutorial/templating/setup.py
index 0b71b73e6..d1910178e 100644
--- a/docs/quick_tutorial/templating/setup.py
+++ b/docs/quick_tutorial/templating/setup.py
@@ -2,6 +2,7 @@ from setuptools import setup
 
 requires = [
     'pyramid',
+    'waitress',
     'pyramid_chameleon',
 ]
 
diff --git a/docs/quick_tutorial/unit_testing/development.ini b/docs/quick_tutorial/unit_testing/development.ini
index 17b479011..58d23cff7 100644
--- a/docs/quick_tutorial/unit_testing/development.ini
+++ b/docs/quick_tutorial/unit_testing/development.ini
@@ -4,5 +4,5 @@ pyramid.includes =
     pyramid_debugtoolbar
 
 [server:main]
-use = egg:pyramid#wsgiref
-port = 6543
+use = egg:waitress#main
+listen = localhost:6543
diff --git a/docs/quick_tutorial/unit_testing/setup.py b/docs/quick_tutorial/unit_testing/setup.py
index 9997984d3..a93cf6a73 100644
--- a/docs/quick_tutorial/unit_testing/setup.py
+++ b/docs/quick_tutorial/unit_testing/setup.py
@@ -2,6 +2,7 @@ from setuptools import setup
 
 requires = [
     'pyramid',
+    'waitress',
 ]
 
 setup(name='tutorial',
diff --git a/docs/quick_tutorial/view_classes/development.ini b/docs/quick_tutorial/view_classes/development.ini
index 7066668bf..78d7479e7 100644
--- a/docs/quick_tutorial/view_classes/development.ini
+++ b/docs/quick_tutorial/view_classes/development.ini
@@ -5,5 +5,5 @@ pyramid.includes =
     pyramid_debugtoolbar
 
 [server:main]
-use = egg:pyramid#wsgiref
-port = 6543
+use = egg:waitress#main
+listen = localhost:6543
diff --git a/docs/quick_tutorial/view_classes/setup.py b/docs/quick_tutorial/view_classes/setup.py
index 2221b72e9..aefa352d4 100644
--- a/docs/quick_tutorial/view_classes/setup.py
+++ b/docs/quick_tutorial/view_classes/setup.py
@@ -2,6 +2,7 @@ from setuptools import setup
 
 requires = [
     'pyramid',
+    'waitress',
     'pyramid_chameleon'
 ]
 
diff --git a/docs/quick_tutorial/views/development.ini b/docs/quick_tutorial/views/development.ini
index 17b479011..58d23cff7 100644
--- a/docs/quick_tutorial/views/development.ini
+++ b/docs/quick_tutorial/views/development.ini
@@ -4,5 +4,5 @@ pyramid.includes =
     pyramid_debugtoolbar
 
 [server:main]
-use = egg:pyramid#wsgiref
-port = 6543
+use = egg:waitress#main
+listen = localhost:6543
diff --git a/docs/quick_tutorial/views/setup.py b/docs/quick_tutorial/views/setup.py
index 9997984d3..a93cf6a73 100644
--- a/docs/quick_tutorial/views/setup.py
+++ b/docs/quick_tutorial/views/setup.py
@@ -2,6 +2,7 @@ from setuptools import setup
 
 requires = [
     'pyramid',
+    'waitress',
 ]
 
 setup(name='tutorial',