From 8f747347188a6c72960f6791145ee2be6b988ad3 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sat, 6 Feb 2016 16:35:29 +0100
Subject: [PATCH] tox: Update cherrypy to 5.0.1.

* Removed deprecated support for ``ssl_certificate`` and
  ``ssl_private_key`` attributes and implicit construction
  of SSL adapter on Python 2 WSGI servers.
* Default SSL Adapter on Python 2 is the builtin SSL adapter,
  matching Python 3 behavior.
* In proxy tool, defer to Host header for resolving the base if no base is
  supplied.
---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 5e0723316..6e0aa2bb0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -43,7 +43,7 @@ deps =
     Werkzeug==0.11.3
     wheel==0.28.0
     xvfbwrapper==0.2.8
-    cherrypy==4.0.0
+    cherrypy==5.0.1
 commands =
     {envpython} scripts/link_pyqt.py --tox {envdir}
     {envpython} -m py.test {posargs:tests}