summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Brewer <fumanchu@aminus.org>2006-09-04 20:21:51 +0000
committerRobert Brewer <fumanchu@aminus.org>2006-09-04 20:21:51 +0000
commit1862f7b2e340b6397f7d2100ee9f2e7484cbf7a5 (patch)
tree1f080a36c3afa97c6a127de63c507f81d8526a3d
parent29cdd51c263d72b5d4eb91e5f8a08fd713ddba22 (diff)
downloadcherrypy-1862f7b2e340b6397f7d2100ee9f2e7484cbf7a5.tar.gz
Changing version to 3.0.0beta.cherrypy-3.0.0beta
-rw-r--r--cherrypy/__init__.py2
-rw-r--r--cherrypy/_cpwsgiserver.py2
-rw-r--r--cherrypy/test/benchmark.py2
-rw-r--r--setup.py14
4 files changed, 11 insertions, 9 deletions
diff --git a/cherrypy/__init__.py b/cherrypy/__init__.py
index 6793d9b2..e60f7bb1 100644
--- a/cherrypy/__init__.py
+++ b/cherrypy/__init__.py
@@ -1,6 +1,6 @@
"""Global module that all modules developing with CherryPy should import."""
-__version__ = '3.0.0alpha'
+__version__ = '3.0.0beta'
import os as _os
_localdir = _os.path.dirname(__file__)
diff --git a/cherrypy/_cpwsgiserver.py b/cherrypy/_cpwsgiserver.py
index 9bce51fa..43fd5cff 100644
--- a/cherrypy/_cpwsgiserver.py
+++ b/cherrypy/_cpwsgiserver.py
@@ -456,7 +456,7 @@ class CherryPyWSGIServer(object):
"""
protocol = "HTTP/1.1"
- version = "CherryPy/3.0.0alpha"
+ version = "CherryPy/3.0.0beta"
ready = False
_interrupt = None
ConnectionClass = HTTPConnection
diff --git a/cherrypy/test/benchmark.py b/cherrypy/test/benchmark.py
index d1088413..e351c6c5 100644
--- a/cherrypy/test/benchmark.py
+++ b/cherrypy/test/benchmark.py
@@ -123,7 +123,7 @@ Completed 800 requests
Completed 900 requests
-Server Software: CherryPy/3.0.0alpha
+Server Software: CherryPy/3.0.0beta
Server Hostname: localhost
Server Port: 8080
diff --git a/setup.py b/setup.py
index 4345829b..48f62230 100644
--- a/setup.py
+++ b/setup.py
@@ -18,16 +18,18 @@ required_python_version = '2.3'
# arguments for the setup command
###############################################################################
name = "CherryPy"
-version = "3.0.0alpha"
-desc = "Object-Oriented web development framework"
-long_desc = "CherryPy is a pythonic, object-oriented web development framework"
+version = "3.0.0beta"
+desc = "Object-Oriented HTTP framework"
+long_desc = "CherryPy is a pythonic, object-oriented HTTP framework"
classifiers=[
#"Development Status :: 5 - Production/Stable",
- "Development Status :: 3 - Alpha",
+ "Development Status :: 4 - Beta",
+ "Environment :: Web Environment",
"Intended Audience :: Developers",
- "License :: Freely Distributable",
+ "License :: Freely Distributable",
+ "Operating System :: OS Independent",
"Programming Language :: Python",
- "Topic :: Internet ",
+ "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
"Topic :: Software Development :: Libraries :: Application Frameworks",
]
author="CherryPy Team"