Commits

Jason R. Coombs committed 385fc16 Merge

Merge with cherrypy-3.2.x

  • Participants
  • Parent commits 98426c8, 70725db

Comments (0)

Files changed (6)

 80d84626b74687f961cf828ccd216405e66ebeba cherrypy-3.2.2
 81c92cbcf2302f83efa739970a35ec48733b177c cherrypy-3.2.2
 c9d13db2b4331474b768b3ed156ddae5030e7f2c 3.2.3
+cd8acbc5f2b3914d396f2925b2d5e2561cfd39a4 3.2.4

File cherrypy/__init__.py

 These API's are described in the `CherryPy specification <https://bitbucket.org/cherrypy/cherrypy/wiki/CherryPySpec>`_.
 """
 
-__version__ = "3.2.3"
+__version__ = "3.2.4"
 
 from cherrypy._cpcompat import urljoin as _urljoin, urlencode as _urlencode
 from cherrypy._cpcompat import basestring, unicodestr, set

File cherrypy/wsgiserver/wsgiserver2.py

     timeout = 10
     """The timeout in seconds for accepted connections (default 10)."""
 
-    version = "CherryPy/3.2.3"
+    version = "CherryPy/3.2.4"
     """A version string for the HTTPServer."""
 
     software = None

File cherrypy/wsgiserver/wsgiserver3.py

     timeout = 10
     """The timeout in seconds for accepted connections (default 10)."""
 
-    version = "CherryPy/3.2.3"
+    version = "CherryPy/3.2.4"
     """A version string for the HTTPServer."""
 
     software = None
 import platform
 import shutil
 
-VERSION='3.2.3'
+VERSION='3.2.4'
 
 if sys.version_info < (3,):
 	input = raw_input
 	subprocess.check_call(['hg', 'tag', NEXT_VERSION])
 
 dist_commands = [
-	[sys.executable, 'setup.py', 'sdist'],
+	[sys.executable, 'setup.py', 'sdist', '--format=zip'],
 	[sys.executable, 'setup.py', 'sdist', '--format=gztar'],
 	[sys.executable, 'setup.py', 'bdist_wininst'],
 ]
 # arguments for the setup command
 ###############################################################################
 name = "CherryPy"
-version = "3.2.3"
+version = "3.2.4"
 desc = "Object-Oriented HTTP framework"
 long_desc = "CherryPy is a pythonic, object-oriented HTTP framework"
 classifiers=[
     "cherrypy.scaffold",
     "cherrypy.wsgiserver",
 ]
-download_url="http://download.cherrypy.org/cherrypy/3.2.3/"
 data_files=[
     ('cherrypy', ['cherrypy/cherryd',
                   'cherrypy/favicon.ico',
     for scheme in list(INSTALL_SCHEMES.values()):
         scheme['data'] = scheme['purelib']
 
-    dist = setup(
+    setup(
         name=name,
         version=version,
         description=desc,
         url=url,
         license=cp_license,
         packages=packages,
-        download_url=download_url,
         data_files=data_files,
         scripts=scripts,
         cmdclass=cmd_class,