diff options
author | Jason R. Coombs <jaraco@jaraco.com> | 2014-04-16 17:53:44 -0400 |
---|---|---|
committer | Jason R. Coombs <jaraco@jaraco.com> | 2014-04-16 17:53:44 -0400 |
commit | 3b315b272f808acda64f1d4639b254754bed90b9 (patch) | |
tree | c8f3e92b3eebe8b9a919c84f74c9303fd2772109 | |
parent | 100f8c38910cf72f90a6078559bed35ee38413df (diff) | |
download | cherrypy-3b315b272f808acda64f1d4639b254754bed90b9.tar.gz |
Bumped to 3.3.0 in preparation for next release.3.3.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-- | release.py | 2 | ||||
-rw-r--r-- | setup.py | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/cherrypy/__init__.py b/cherrypy/__init__.py index 0ad77e38..469b8cba 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.2.6" +__version__ = "3.3.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 98bc9737..a304922a 100644 --- a/cherrypy/wsgiserver/wsgiserver2.py +++ b/cherrypy/wsgiserver/wsgiserver2.py @@ -1755,7 +1755,7 @@ class HTTPServer(object): timeout = 10 """The timeout in seconds for accepted connections (default 10).""" - version = "CherryPy/3.2.6" + version = "CherryPy/3.3.0" """A version string for the HTTPServer.""" software = None diff --git a/cherrypy/wsgiserver/wsgiserver3.py b/cherrypy/wsgiserver/wsgiserver3.py index 481963f6..88acff9a 100644 --- a/cherrypy/wsgiserver/wsgiserver3.py +++ b/cherrypy/wsgiserver/wsgiserver3.py @@ -1466,7 +1466,7 @@ class HTTPServer(object): timeout = 10 """The timeout in seconds for accepted connections (default 10).""" - version = "CherryPy/3.2.6" + version = "CherryPy/3.3.0" """A version string for the HTTPServer.""" software = None @@ -17,7 +17,7 @@ import importlib from six.moves import input -VERSION='3.2.6' +VERSION='3.3.0' def get_next_version(): @@ -36,7 +36,7 @@ class cherrypy_build_py(build_py): # arguments for the setup command ############################################################################### name = "CherryPy" -version = "3.2.6" +version = "3.3.0" desc = "Object-Oriented HTTP framework" long_desc = "CherryPy is a pythonic, object-oriented HTTP framework" classifiers = [ |