Include waitress as a default WSGI app server.

CHANGES.rst

@@ -54,6 +54,8 @@ Bugs Fixed
 Features Added
 ++++++++++++++
 
+- Include waitress as a default WSGI app server.
+
 - Add `egg:Zope2#httpexceptions` WSGI middleware.
 
 - Update available HTTP response code, 302 is now called Found.

requirements.txt

@@ -7,7 +7,6 @@ DocumentTemplate==2.13.2
 ExtensionClass==4.1.2
 Missing==3.1
 MultiMapping==3.0
-Paste==2.0.3
 PasteDeploy==1.5.2
 Persistence==3.0a1
 Products.BTreeFolder2==3.0
@@ -40,6 +39,7 @@ six==1.10.0
 tempstorage==3.0
 transaction==1.6.1
 unittest2==1.1.0
+waitress==0.9.0
 zExceptions==3.2
 zLOG==3.0
 zc.lockfile==1.2.1

setup.py

@@ -57,7 +57,6 @@ setup(
         'ExtensionClass',
         'Missing',
         'MultiMapping',
-        'Paste',
         'PasteDeploy',
         'Persistence',
         'Products.OFSP >= 2.13.2',
@@ -77,6 +76,7 @@ setup(
         'setuptools',
         'tempstorage',
         'transaction',
+        'waitress',
         'zdaemon',
         'zExceptions >= 3.2',
         'zLOG',

src/Zope2/utilities/skel/etc/zope.ini.in

@@ -10,7 +10,7 @@ pipeline =
     zope
 
 [server:main]
-use = egg:paste#http
+use = egg:waitress#main
 host = 127.0.0.1
 port = 8080
 

versions-prod.cfg

@@ -14,7 +14,6 @@ initgroups = 3.0
 mechanize = 0.2.5
 Missing = 3.1
 MultiMapping = 3.0
-Paste = 2.0.3
 PasteDeploy = 1.5.2
 Persistence = 3.0a1
 persistent = 4.2.1
@@ -37,6 +36,7 @@ six = 1.10.0
 tempstorage = 3.0
 transaction = 1.6.1
 unittest2 = 1.1.0
+waitress = 0.9.0
 WebOb = 1.6.1
 WebTest = 2.0.23
 zc.lockfile = 1.2.1

versions.cfg

@@ -25,7 +25,6 @@ setuptools = 24.3.0
 snowballstemmer = 1.2.1
 Sphinx = 1.4.5
 testtools = 2.2.0
-waitress = 0.9.0
 z3c.checkversions = 0.5
 zc.buildout = 2.5.2
 zc.recipe.egg = 2.0.3