diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2014-09-14 00:05:54 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2014-09-14 00:05:54 -0400 |
| commit | ad0ad740906ad52fab716a2fa224201dce12836e (patch) | |
| tree | 437ae2555d752f24a2f2aa00340b280eebbc70bc | |
| parent | 315dddc741cbf3d8f599d12ec161c2400cf451da (diff) | |
| download | cherrypy-ad0ad740906ad52fab716a2fa224201dce12836e.tar.gz | |
Bumped to 3.6.0 in preparation for next release.3.6.0
| -rw-r--r-- | cherrypy/__init__.py | 2 | ||||
| -rw-r--r-- | cherrypy/wsgiserver/wsgiserver2.py | 2 | ||||
| -rw-r--r-- | cherrypy/wsgiserver/wsgiserver3.py | 2 | ||||
| -rw-r--r-- | setup.py | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/cherrypy/__init__.py b/cherrypy/__init__.py index ce34861b..7870ef0d 100644 --- a/cherrypy/__init__.py +++ b/cherrypy/__init__.py @@ -56,7 +56,7 @@ with customized or extended components. The core API's are: These API's are described in the `CherryPy specification <https://bitbucket.org/cherrypy/cherrypy/wiki/CherryPySpec>`_. """ -__version__ = "3.5.1" +__version__ = "3.6.0" from cherrypy._cpcompat import urljoin as _urljoin, urlencode as _urlencode from cherrypy._cpcompat import basestring, unicodestr, set diff --git a/cherrypy/wsgiserver/wsgiserver2.py b/cherrypy/wsgiserver/wsgiserver2.py index b64bf8b4..c7f08350 100644 --- a/cherrypy/wsgiserver/wsgiserver2.py +++ b/cherrypy/wsgiserver/wsgiserver2.py @@ -1757,7 +1757,7 @@ class HTTPServer(object): timeout = 10 """The timeout in seconds for accepted connections (default 10).""" - version = "CherryPy/3.5.1" + version = "CherryPy/3.6.0" """A version string for the HTTPServer.""" software = None diff --git a/cherrypy/wsgiserver/wsgiserver3.py b/cherrypy/wsgiserver/wsgiserver3.py index 415b51a0..8bba6261 100644 --- a/cherrypy/wsgiserver/wsgiserver3.py +++ b/cherrypy/wsgiserver/wsgiserver3.py @@ -1468,7 +1468,7 @@ class HTTPServer(object): timeout = 10 """The timeout in seconds for accepted connections (default 10).""" - version = "CherryPy/3.5.1" + version = "CherryPy/3.6.0" """A version string for the HTTPServer.""" software = None @@ -36,7 +36,7 @@ class cherrypy_build_py(build_py): # arguments for the setup command ############################################################################### name = "CherryPy" -version = "3.5.1" +version = "3.6.0" desc = "Object-Oriented HTTP framework" long_desc = "CherryPy is a pythonic, object-oriented HTTP framework" classifiers = [ |