[Python-modules-commits] [cherrypy3] 07/15: change version to 8.9.1-1 [ Stephan Sürken ] New upstream: 8.9.1
Stephan Suerken
absurd at moszumanska.debian.org
Mon Nov 27 08:40:48 UTC 2017
This is an automated email from the git hooks/post-receive script.
absurd pushed a commit to branch master
in repository cherrypy3.
commit c13372401f6d555b66e5c10b8ce763ab58688b50
Merge: 286e041 aa45601
Author: Stephan Sürken <absurd at debian.org>
Date: Thu Nov 23 11:07:58 2017 +0100
change version to 8.9.1-1
[ Stephan Sürken ]
New upstream: 8.9.1
.gitignore | 3 ++
.travis.yml | 14 +++++-
CHANGES.rst | 16 +++++++
CherryPy.egg-info/PKG-INFO | 8 ++--
CherryPy.egg-info/SOURCES.txt | 2 +-
CherryPy.egg-info/entry_points.txt | 3 ++
CherryPy.egg-info/requires.txt | 2 +-
PKG-INFO | 8 ++--
README.rst | 6 +--
cherrypy/__main__.py | 5 +-
cherrypy/cherryd | 6 ---
cherrypy/process/plugins.py | 1 -
cherrypy/process/wspbus.py | 53 +++++++++++++++++++++-
cherrypy/scaffold/__init__.py | 2 +-
cherrypy/test/helper.py | 21 ++++++++-
debian/.git-dpm | 6 +--
debian/changelog | 7 ++-
.../0001-disable-sphinx-rst.linker-extension.patch | 2 +-
...02-use-mock.mock-instead-of-unittest.mock.patch | 2 +-
.../patches/0003-disable-test_antistampede.patch | 2 +-
.../0004-unrepr-also-from-__builtin__.patch | 2 +-
setup.py | 6 +--
22 files changed, 137 insertions(+), 40 deletions(-)
diff --cc debian/.git-dpm
index 245b7cf,0000000..837d98d
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
+# see git-dpm(1) from git-dpm package
- 09b76eb0d3b9f1544bb5d6f57d91a715585ae918
- 09b76eb0d3b9f1544bb5d6f57d91a715585ae918
- fa7140228740b12dd04d7b4ed2e76ad92cb43640
++aa456012b683c2e735a106f9c4301e4fc54bf8e4
++aa456012b683c2e735a106f9c4301e4fc54bf8e4
++bce9bebc84b185f8b3c8bdb087efbc470eb33200
+bce9bebc84b185f8b3c8bdb087efbc470eb33200
+cherrypy3_8.9.1.orig.tar.gz
+cc65735f5f95d36136571116849e0de2ea224199
+714010
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/changelog
index 14e3922,0000000..0ff2a83
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,569 -1,0 +1,572 @@@
- cherrypy3 (8.8.0-1) UNRELEASED; urgency=medium
++cherrypy3 (8.9.1-1) UNRELEASED; urgency=medium
+
+ [ Ondřej Nový ]
+ * Fixed VCS URL (https)
+
+ [ Carl Suster ]
+ * New upstream release (Closes: #828942, #801496).
+ * Add myself to uploaders.
+ * d/patches:
+ - 00_supress_profiler_warning.diff: delete since profiler is included
+ in Debian python packages now (Closes: #460616).
+ - 01_cherryd_location_fix.diff: delete since this is instead handled with
+ the test suite configuration in d/rules.
+ - 02_issue_1328.diff, 03_issue_1199.diff, 04_issue_1315.diff:
+ delete since these issues have now been fixed upstream.
+ - Add 0001-disable-sphinx-rst.linker-extension.patch to work around a
+ harmless B-D on an unpackaged sphinx extension.
+ - Add 0002-use-mock.mock-instead-of-unittest.mock.patch to use the
+ Debian-packaged version of the unittest.mock backport to Python 2.
+ - Add 0003-disable-test_antistampede.patch to skip a test which would run
+ for a long time if it fails. Either this or upstream changes make the
+ test suite run quickly now (Closes: #785647).
+ - Add 0004-unrepr-also-from-__builtin__.patch to fix a Python 2-only test
+ failure pending more thorough investigation.
+ * Remove d/README.Debian (it described the previous profiler situation).
+ * Remove d/README.source (it described the pre-DPMT workflow).
+ * d/control:
+ - Run wrap-and-sort -abst.
+ - Bump standards version to 3.9.8 (no changes).
+ - Add missing B-Ds on:
+ python-coverage and python3-coverage,
+ python-mock and python3-mock,
+ python-objgraph and python3-objgraph,
+ python-pytest and python3-pytest,
+ python-setuptools-scm and python3-setuptools-scm,
+ - Add missing Recommends on:
+ python-openssl and python3-openssl,
+ python-routes and python3-routes (was Depends),
+ python-simplejson and python3-simplejson,
+ - Remove old autopkgtest XS-Testsuite header.
+ - Make the package descriptions different.
+ * d/rules:
+ - LICENSE.{ txt => md }.
+ - Install executables in /usr/bin instead of /usr/sbin.
+ - Also generate manpage for cherryd3 with help2man.
+ - Only install the tutorial in the -doc package.
+ * d/docs: README.{ txt => rst }.
+ * Raise debhelper compat to 10:
+ - replace override_dh_clean with d/clean.
+ * d/source/options (extend-diff-ignore) and d/clean:
+ - add .egg-info.
+ - add files created by test suite.
+ * d/copyright: update to DEP-5 format and extend years.
+ * Replace epydoc API docs with sphinx docs in a -doc package:
+ - d/control: add a -doc binary package (Closes: #787756).
+ - d/control: drop B-D-I on python-epydoc (helps with #827313).
+ - replace d/python-cherrypy3{ .doc-base.api => -doc.doc-base }.
+ - d/rules: remove epydoc overrides and add for sphinx instead.
+ - remove d/python-cherrypy3.install which was for epydoc files.
+ - also install the rst files as txt documentation.
+ * Remove broken tutorial link from d/python-cherrypy3.install
+ (Closes: #781349).
+ * Remove outdated d/NEWS.
+ * Enable test suite using pybuild (or nosetests) and don't install it.
+ * Install tutorial as documentation with d/python-cherrypy3-doc.docs.
+
- -- Carl Suster <carl at contraflo.ws> Thu, 12 Jan 2017 18:01:50 +1100
++ [ Stephan Sürken ]
++ * New upstream: 8.9.1
++
++ -- Stephan Sürken <absurd at debian.org> Thu, 23 Nov 2017 11:07:58 +0100
+
+cherrypy3 (3.5.0-2) unstable; urgency=medium
+
+ * debian/control:
+ - set team as maintainer
+
+ -- Gustavo Noronha Silva <kov at debian.org> Mon, 01 Dec 2014 14:24:00 -0200
+
+cherrypy3 (3.5.0-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream release.
+ * d/patches:
+ - 02_compat.diff: This was previously removed from the quilt stack
+ but not from svn. That's now done.
+ - 02_issue_1328.diff, 03_issue_1199.diff, 04_issue_1315.diff:
+ Added to work around DEP-8 test failures.
+
+ -- Barry Warsaw <barry at debian.org> Mon, 30 Jun 2014 17:19:47 -0400
+
+cherrypy3 (3.3.0-1) unstable; urgency=medium
+
+ * Team upload.
+
+ [ Jackson Doak ]
+ * debian/rules: Move cherryd to /usr/sbin/ where it belongs
+ * debian/control, debian/tests/: Add autopkgtest. Thanks Chuck Short
+ * debian/control: Add missing depends on python-routes. LP: #463065
+
+ [ Barry Warsaw ]
+ * New upstream version.
+ - Closes: #494342
+ * debian/control: Bump Standards-Version to 3.9.5 with no other
+ changes necessary.
+ * Rebuild drops dependency on python3.3. Closes: #751642
+ * debian/watch: Updated to point to PyPI page.
+ * debian/rules: Temporarily make cherrypy/cherryd executable so
+ help2man can extract the --help text.
+ * debian/patches:
+ - 00_supress_profiler_warning.diff: Refreshed.
+ - 01_cherryd_location_fix.diff: Refreshed.
+ - 02_compat.diff: Removed; applied upstream. Closes: #722671
+
+ -- Barry Warsaw <barry at debian.org> Tue, 17 Jun 2014 18:37:53 -0400
+
+cherrypy3 (3.2.2-4) unstable; urgency=low
+
+ * Team upload.
+ * Switch to "3.0 (quilt)" source, to actually apply patches.
+
+ -- Dmitrijs Ledkovs <dmitrij.ledkov at ubuntu.com> Fri, 20 Sep 2013 20:23:21 +0100
+
+cherrypy3 (3.2.2-3) unstable; urgency=low
+
+ [ Jakub Wilk ]
+ * Use canonical URIs for Vcs-* fields.
+ * Drop obsolete Conflicts with python2.3-cherrypy and python2.4-cherrypy.
+ * Fix a typo in README.Debian.
+
+ [ Dmitrijs Ledkovs ]
+ * Team upload
+ * Add python3 package (Closes: #714403)
+
+ -- Dmitrijs Ledkovs <dmitrij.ledkov at ubuntu.com> Sun, 08 Sep 2013 20:54:01 +0100
+
+cherrypy3 (3.2.2-2) unstable; urgency=low
+
+ * Team upload.
+ * Set PYTHONPATH when running help2man (closes: #655166). Thanks to Stéphane
+ Graber for the bug report and for the patch.
+
+ -- Jakub Wilk <jwilk at debian.org> Wed, 08 Feb 2012 22:39:13 +0100
+
+cherrypy3 (3.2.2-1) unstable; urgency=low
+
+ [ JCF Ploemen ]
+ * New upstream release (Closes: #571196).
+ * Bumped Standards-Version to 3.8.4 (no changes needed).
+ * Removing patch 02: no longer needed, incorporated upstream.
+ * Updating patch 00 to match release.
+ * Install cherryd man page via debian/manpages.
+ * debian/copyright:
+ + Added notice for cherrypy/lib/httpauth.py.
+ + Fixed years.
+ * debian/watch:
+ + Don't hit on the -py3 release by blocking '-' from the version.
+ + Mangle upstream version, inserting a tilde for beta/rc.
+
+ [ Stéphane Graber <stgraber at ubuntu.com> ]
+ * Convert from python-support to dh_python2 (#654375)
+ - debian/pyversions: Removed (no longer needed)
+ - debian/rules
+ + Replace call to dh_pysupport by dh_python2
+ + Add --with=python2 to all dh calls
+ - debian/control
+ + Drop build-depends on python-support
+ + Bump build-depends on python-all to >= 2.6.6-3~
+ + Replace XS-Python-Version by X-Python-Version
+ + Remove XB-Python-Version from binary package
+
+ [ Gustavo Noronha ]
+ * debian/control, debian/rules, debian/manpages:
+ - use help2man to generate a manpage for cherryd at build time, since
+ one is no longer shipped along with the source code
+ * debian/control:
+ - add python-nose to Build-Depends, since it's used during the
+ documentation build for cross-reference generation
+
+ -- Gustavo Noronha Silva <kov at debian.org> Fri, 06 Jan 2012 10:13:27 -0200
+
+cherrypy3 (3.1.2-1) unstable; urgency=low
+
+ * New upstream release (Closes: #528473)
+ * debian/rules:
+ - use the quilt make include file instead of using custom code; should
+ make the package convertable to the new quilt source format
+ (Closes: #538677)
+ * debian/control:
+ - updated Standards-Version with no changes
+ * debian/python-cherrypy3.links:
+ - fix link to point to the new place where python-support installs files
+
+ -- Gustavo Noronha Silva <kov at debian.org> Sat, 15 Aug 2009 14:52:43 -0300
+
+cherrypy3 (3.1.1-3) unstable; urgency=low
+
+ [ Bernd Zeimetz ]
+ * debian/rules: Fixed to work with dh >= 7.3.5 which will build with all
+ installed Python versions.
+ * debian/control: Replace the python-all-dev Build-Dep by python-all.
+ Cherrypy doesn't build extensions, so we don't need the C headers.
+
+ -- Debian Python Modules Team <python-modules-team at lists.alioth.debian.org> Tue, 21 Jul 2009 11:04:48 +0200
+
+cherrypy3 (3.1.1-2) unstable; urgency=low
+
+ * Making lintian happy release
+ - uploading to unstable
+ * debian/control:
+ - added ${misc:Depends} to python-cherrypy3's Depends line
+ * debian/rules, debian/control:
+ - use debhelper 7 instead of cdbs; this rework also makes our
+ installation process stop depending on python-support locations
+ (Closes: #516144)
+ - use quilt for patches
+ * debian/README.source:
+ - added, to document usage of quilt
+ * debian/rules:
+ - remove aditional LICENSE.txt file that is being installed
+ * debian/rules, debian/python-cherrypy3.dirs, debian/python-cherrypy3.links,
+ debian/patches/01_cherryd_location_fix.diff:
+ - don't move the tutorial module to the documentation directory, since
+ the cherrypy test structure, which is useful, actually wants to have
+ it where it is; move the cherryd utility to /usr/sbin; the patch fixes
+ where the tests want to run cherryd from
+ * debian/python-cherrypy3.doc-base.api:
+ - fixed manual section
+ * debian/source.lintian-overrides:
+ - removed; no longer needed
+
+ -- Gustavo Noronha Silva <kov at debian.org> Sun, 22 Feb 2009 14:20:28 -0300
+
+cherrypy3 (3.1.1-1) experimental; urgency=low
+
+ [ Gustavo Noronha Silva ]
+ * New upstream version
+ * debian/patches/03_CVE-2008-0252.diff:
+ - removed; applied upstream
+ * debian/control:
+ - remove -1 from build-dependency
+ - upgrade Standards-Version to 3.8.0, with no further changes
+
+ [ Sandro Tosi ]
+ * debian/control
+ - switch Vcs-Browser field to viewsvn
+
+ -- Gustavo Noronha Silva <kov at debian.org> Wed, 01 Oct 2008 08:21:45 -0300
+
+cherrypy3 (3.0.2-2) unstable; urgency=low
+
+ [ Piotr Ożarowski ]
+ * Vcs-Browser and Homepage fields added
+ * Rename XS-Vcs-Svn to Vcs-Svn
+
+ [ Sandro Tosi ]
+ * debian/control
+ - fix Vcs-Browser field
+
+ [ Gustavo Noronha Silva ]
+ * This update addresses the following security issue:
+ - Directory traversal vulnerability in the _get_file_path function
+ in filter/sessionfilter.py allows remote attackers to create or
+ delete arbitrary files, and possibly read and write portions of
+ arbitrary files, via a crafted session id in a cookie
+ (CVE-2008-0252).
+ * debian/control:
+ - updated standards-version to 3.7.3; no changes
+
+ -- Gustavo Noronha Silva <kov at debian.org> Thu, 24 Jan 2008 14:30:48 -0200
+
+cherrypy3 (3.0.2-1) unstable; urgency=low
+
+ * New upstream release
+ * debian/rules:
+ - call epydoc with full-name arguments; thanks to Cyril Brulebois
+ <cyril.brulebois at enst-bretagne.fr> for providing the fix.
+ (Closes: #433904)
+ * debian/python-cherrypy3.doc-base.api:
+ - fix HTML files location
+
+ -- Gustavo Noronha Silva <kov at debian.org> Thu, 09 Aug 2007 21:14:40 -0300
+
+cherrypy3 (3.0.1-2) unstable; urgency=low
+
+ [ Piotr Ożarowski ]
+ * New python-support handles egg's directory name correctly
+ - bump python-support required version
+ - remove mv part from debian/rules
+ (Closes: #423749)
+
+ -- Gustavo Noronha Silva <kov at debian.org> Sat, 19 May 2007 17:01:51 -0300
+
+cherrypy3 (3.0.1-1) unstable; urgency=low
+
+ * New upstream release
+ * debian/watch:
+ - updated to understand the new layout of the new download
+ source for CherryPy
+ * debian/rules:
+ - I heartly agree with Sam Clegg on this; the tutorial should be
+ in /usr/share/doc/python-cherrypy3, not inside the Python package
+ namespace (Closes: #415526)
+ * debian/control:
+ - updated python-support and python-all-dev version requirements
+ and moved them to build-deps because they are needed on clean
+ * debian/control, debian/rules, debian/python-cherrypy3.doc-base.api,
+ debian/python-cherrypy3.install:
+ - build API documentation as a step in the package build and install
+ it; this uses epydoc
+
+ -- Gustavo Noronha Silva <kov at debian.org> Sat, 21 Apr 2007 14:40:09 -0300
+
+cherrypy3 (3.0.0-1) unstable; urgency=low
+
+ * New upstream release
+ * debian/control:
+ - updated for the new source and binary packages names
+ - conflict with python-cherrypy
+ - add source information for new python policy
+ * debian/pyversions:
+ - added; was missing
+ * debian/README.Debian:
+ - document that this version of CherryPy is incompatible with
+ 2.2, and where to find the upgrade instructions
+ * debian/rules, debian/source.lintian-overrides:
+ - updated for the new package name
+ * debian/rules:
+ - cleaning up for newer cdbs version
+ * debian/patches/00_supress_profiler_warning.diff:
+ - updated for the new version
+
+ * Piotr Ozarowski <ozarow at gmail.com>:
+ - Added XS-Vcs-Svn field
+
+ -- Gustavo Noronha Silva <kov at debian.org> Mon, 8 Jan 2007 22:51:47 -0200
+
+python-cherrypy (2.2.1-3) unstable; urgency=low
+
+ * debian/rules, debian/control:
+ - updated to follow the new Python Policy, build-depending on the
+ newest versions of cdbs, python-support and debhelper
+ (Closes: #373517)
+ * debian/python-cherrypy.{postinst,prerm}:
+ - removed; generated by python-support
+
+ -- Gustavo Noronha Silva <kov at debian.org> Sun, 4 Jun 2006 23:50:37 -0300
+
+python-cherrypy (2.2.1-2) unstable; urgency=low
+
+ * debian/patches/02_eggify.diff:
+ - fixed to only patch setup.py, so that it imports setup
+ from setuptools instead of distutils; ez_setup is not
+ needed
+ * debian/patches/00_supress_profiler_warning.diff:
+ - stop warning about the profiler module not being packaged
+ in the main python distribution; that is documented in
+ README.Debian
+ * debian/control:
+ - move python and python-setuptools to Build-Depends,
+ since they are needed at the clean target
+ * debian/watch:
+ - new uscan support file, using the sf.net trick
+
+ -- Gustavo Noronha Silva <kov at debian.org> Sun, 4 Jun 2006 23:44:26 -0300
+
+python-cherrypy (2.2.1-1) unstable; urgency=low
+
+ * debian/patches/*:
+ - renamed to have numbers defining the order in which they
+ should be applied
+ * debian/README.Debian:
+ - added, documenting the Python profiler only being available
+ in a non-free package problem
+ * debian/rules, debian/python-cherrypy.{postinst,prerm}:
+ - install py files to the python-cherrypy instead of cherrypy
+ for python-support; using the package name is the correct,
+ documented way of doing it.
+ * debian/patches/01_auto-reload-with-python-support.diff:
+ - removed because python-support >= 0.2, which I depend upon
+ provides symlinks for the .py files;
+ * debian/control:
+ - depend on python-support >= 0.2; see above
+ - Standards-Version to 3.7.2, no changes
+
+ -- Gustavo Noronha Silva <kov at debian.org> Sat, 13 May 2006 17:06:10 -0300
+
+python-cherrypy (2.2.0-3) unstable; urgency=low
+
+ * Upload to unstable (duh)
+
+ -- Gustavo Noronha Silva <kov at debian.org> Thu, 4 May 2006 00:25:21 -0300
+
+python-cherrypy (2.2.0-2) experimental; urgency=low
+
+ * debian/source.lintian-overrides:
+ - this package needs debhelper and cdbs for the clean target
+ to be run
+ * debian/control:
+ - increased Standards-Version to 3.7 with no changes
+ * debian/rules:
+ - use --install-lib instead of moving stuff manually
+ - also install tutorial and test using --install-data
+
+ -- Gustavo Noronha Silva <kov at debian.org> Thu, 4 May 2006 00:00:28 -0300
+
+python-cherrypy (2.2.0-1) unstable; urgency=low
+
+ * New upstream release
+ * debian/control, debian/rules:
+ - no longer provides the transition packages for cherrypy2.1
+ * debian/patches/auto-reload-with-python-support.diff:
+ - updated for the new version
+ * debian/control:
+ - moved cdbs and debhelper to Build-Depends
+ * debian/rules:
+ - removed the code to auto-generate the Uploaders field, since
+ it will not be used
+ - fix the arguments passed to dh_compress so .py and .pdf files
+ are actually not compressed
+
+ -- Gustavo Noronha Silva <kov at debian.org> Sun, 23 Apr 2006 10:08:43 -0300
+
+python-cherrypy (2.1.1-3) unstable; urgency=low
+
+ * Python Modules Team upload
+ * debian/control:
+ - added the team in Uploaders field
+ * debian/rules:
+ - install the egg info without the python version in the name of
+ the directory
+ * debian/NEWS.Debian -> debian/NEWS:
+ - renamed so debhelper will take care of installing it;
+ (Closes: #362039).
+
+ -- Gustavo Noronha Silva <kov at debian.org> Sun, 16 Apr 2006 16:56:12 -0300
+
+python-cherrypy (2.1.1-2) unstable; urgency=low
+
+ * Debian revision with source package name change
+ * changed source package name back to something more generic, since
+ it seems like there won't be compatibility breakage again anytime
+ soon
+ * use python-support
+ * debian/patches/eggify.diff:
+ - add patch to provide EGG-INFO stuff, so that packages that depend
+ on that information, such as TurboGears, will be able to use
+ CherryPy
+ * debian/patches/auto-reload-with-python-support.diff:
+ - auto-reload doesn't like the .py files to be in a different path as the
+ pyc files; I need a better solution for this, but for now the auto-reloader
+ simply ignores the files in the cherrypy distribution (which is OK, since they
+ are not supposed to be modified after the package is installed).
+ * debian/control:
+ - build-depends on python-setup-tools >= 0.6a9-1, needed to provide the
+ EGG-INFO stuff
+ * debian/copyright:
+ - de-wikify the authors names
+ * debian/control, debian/rules:
+ - add dummy transition packages for python-cherrypy2.1, and deal with what
+ cdbs's python stuff likes to do when it sees lots of python${ver}-module
+ packages on the control file =D
+ * debian/NEWS.Debian:
+ - document big changes, and that this version is incompatible with
+ CherryPy 2.0
+
+ -- Gustavo Noronha Silva <kov at debian.org> Sun, 2 Apr 2006 12:47:52 -0300
+
+cherrypy2.1 (2.1.1-1) unstable; urgency=low
+
+ * SECURITY bug fix (CVE-2006-0847)
+ * New upstream release fixing a security bug (Closes: #353542)
+
+ -- Gustavo Noronha Silva <kov at debian.org> Tue, 21 Feb 2006 07:47:33 -0300
+
+cherrypy2.1 (2.1.0-1) unstable; urgency=low
+
+ * New backwards-incompatible version, thus new source
+ package to keep both on the archive (Closes: #334933)
+ * debian/control:
+ - packages conflict with their 2.0 versions counterparts
+ - enhanced description, mention the backwards incompatibility
+ and that it's part of the Turbo Gears framework
+ - changed maintainer to myself
+ * debian/copyright:
+ - modified downloaded from location to mention cherrypy.org instead
+ of the sourceforge page
+ * debian/rules:
+ - avoid compressing the pdf and py files on the tutorial documentation
+ directory
+ - do not try to move the tutorial from unversioned site-packages
+ directory since there's no tutorial in there
+
+ -- Gustavo Noronha Silva <kov at debian.org> Sun, 13 Nov 2005 20:24:08 -0200
+
+python-cherrypy (2.0.0f-2) unstable; urgency=low
+
+ * Packaging based on the work by Bob Tanner <tanner at real-time.com>
+ * New Upstream Release
+ * debian/control:
+ - Standards-Version is now 3.6.2
+ - add python to the Build-Depends (Closes: #322452)
+ * debian/rules:
+ - clean hack to work around cdbs bug
+ * debian/changelog:
+ - fixed date format on the 0.9-1 upload (Web->Wed)
+
+ -- Gustavo Noronha Silva <kov at debian.org> Sun, 13 Nov 2005 19:24:27 -0200
+
+python-cherrypy (2.0.0f-1) unstable; urgency=low
+
+ * New upstream release
+ * debian/control:
+ - turn all packages into Arch: all packages, as they should be
+ - create packages for python2.3 and python2.4
+ - Build-Depend-Indep on python2.3-dev and python2.4-dev (Closes: #306381)
+ * debian/rules:
+ - adapted post-install rule to work with multiple python versions
+ supported
+
+ -- Gustavo Noronha Silva <kov at debian.org> Mon, 20 Jun 2005 16:45:45 -0300
+
+python-cherrypy (2.0.0b-1) experimental; urgency=low
+
+ * New upstream version. (Closes: #284511)
+ - package rebuilt from scratch, changelog kept for historic
+ reasons
+ - comaintaince with Raphael Goulais
+ * Source package name change.
+
+ -- Gustavo Noronha Silva <kov at debian.org> Sun, 17 Apr 2005 16:39:06 -0300
+
+cherrypy (0.10-1) unstable; urgency=low
+
+ * New Upstream Version
+
+ -- Raphael Goulais <rafou at debian.org> Mon, 26 Apr 2004 18:01:00 +0200
+
+cherrypy (0.9-1) unstable; urgency=low
+
+ * New Upstream Version
+
+ -- Raphael Goulais (Rafou) <raphael at nicedays.net> Wed, 28 Nov 2003 12:34:37 +0100
+
+cherrypy (0.8.99rc1-1) unstable; urgency=low
+
+ * New Upstream Version
+
+ -- Raphael Goulais (Rafou) <raphael at nicedays.net> Tue, 18 Nov 2003 15:03:08 +0100
+
+cherrypy (0.8-3) unstable; urgency=low
+
+ * Removed python2.1 and python2.3 from build depends (Closes: #192715)
+
+ -- Raphael Goulais (Rafou) <raphael at nicedays.net> Mon, 12 May 2003 16:12:00 +0200
+
+cherrypy (0.8-2) unstable; urgency=low
+
+ * White Space Policy : Changed 4 spaces to tabs in lib files
+ * Removed CR/LF from most files
+ * Backported python2.3 fixes from CVS
+ * Removed doc sources from cherrypy-doc
+ * Modified doc/Makefile (more targets, added clean)
+ * Regenerated html doc with png images instead of gif
+
+ -- Raphael Goulais (Rafou) <raphael at nicedays.net> Wed, 16 Apr 2003 21:29:00 +0200
+
+cherrypy (0.8-1) unstable; urgency=low
+
+ * Initial Release (Closes: #188144)
+
+ -- Raphael Goulais (Rafou) <raphael at nicedays.net> Tue, 08 Apr 2003 15:20:00 +0200
+
diff --cc debian/patches/0001-disable-sphinx-rst.linker-extension.patch
index fa12fd4,0000000..c07dd5d
mode 100644,000000..100644
--- a/debian/patches/0001-disable-sphinx-rst.linker-extension.patch
+++ b/debian/patches/0001-disable-sphinx-rst.linker-extension.patch
@@@ -1,22 -1,0 +1,22 @@@
- From 056a32618b385e9572995f79bf269e0e36767908 Mon Sep 17 00:00:00 2001
++From 752d360040428d9e014710912dbcebd48913f7a7 Mon Sep 17 00:00:00 2001
+From: Carl Suster <carl at contraflo.ws>
+Date: Wed, 4 Jan 2017 16:34:49 +1100
+Subject: disable sphinx rst.linker extension
+
+This is not yet packaged in Debian and is harmless to ignore for now.
+---
+ docs/conf.py | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/docs/conf.py b/docs/conf.py
+index b14e42a..ff883b2 100644
+--- a/docs/conf.py
++++ b/docs/conf.py
+@@ -38,7 +38,6 @@ extensions = [
+ 'sphinx.ext.autodoc',
+ 'sphinx.ext.todo',
+ 'sphinx.ext.intersphinx',
+- 'rst.linker',
+ ]
+
+ intersphinx_mapping = {
diff --cc debian/patches/0002-use-mock.mock-instead-of-unittest.mock.patch
index 401a82c,0000000..468798d
mode 100644,000000..100644
--- a/debian/patches/0002-use-mock.mock-instead-of-unittest.mock.patch
+++ b/debian/patches/0002-use-mock.mock-instead-of-unittest.mock.patch
@@@ -1,51 -1,0 +1,51 @@@
- From a4c6395e84750b9996483b23cf0dead2995ab7cd Mon Sep 17 00:00:00 2001
++From 34c265bb00428be25e6db302843cb4246a07751d Mon Sep 17 00:00:00 2001
+From: Carl Suster <carl at contraflo.ws>
+Date: Wed, 4 Jan 2017 17:33:16 +1100
+Subject: use mock.mock instead of unittest.mock
+
+Upstream uses backports.unittest_mock. Instead, we use python*-mock
+which is available in Debian and does the same job of backporting Python
+3's unittest mock other than calling it mock.mock instead. This patch
+just switches to this import statement in the test suite.
+---
+ cherrypy/test/test_encoding.py | 2 +-
+ cherrypy/test/test_http.py | 2 +-
+ cherrypy/wsgiserver/test_wsgiserver.py | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/cherrypy/test/test_encoding.py b/cherrypy/test/test_encoding.py
+index 93778da..197c224 100644
+--- a/cherrypy/test/test_encoding.py
++++ b/cherrypy/test/test_encoding.py
+@@ -2,7 +2,7 @@
+
+ import gzip
+ import io
+-from unittest import mock
++from mock import mock
+
+ import six
+
+diff --git a/cherrypy/test/test_http.py b/cherrypy/test/test_http.py
+index 8cba5a1..a8bd0a3 100644
+--- a/cherrypy/test/test_http.py
++++ b/cherrypy/test/test_http.py
+@@ -4,7 +4,7 @@ import errno
+ import mimetypes
+ import socket
+ import sys
+-from unittest import mock
++from mock import mock
+
+ import six
+
+diff --git a/cherrypy/wsgiserver/test_wsgiserver.py b/cherrypy/wsgiserver/test_wsgiserver.py
+index b1b6741..3fe2b1f 100644
+--- a/cherrypy/wsgiserver/test_wsgiserver.py
++++ b/cherrypy/wsgiserver/test_wsgiserver.py
+@@ -1,4 +1,4 @@
+-from unittest import mock
++from mock import mock
+
+ import six
+
diff --cc debian/patches/0003-disable-test_antistampede.patch
index 85ea2f3,0000000..868d15d
mode 100644,000000..100644
--- a/debian/patches/0003-disable-test_antistampede.patch
+++ b/debian/patches/0003-disable-test_antistampede.patch
@@@ -1,31 -1,0 +1,31 @@@
- From 5ab452085331ad130ae659633c8dcafc12325e1f Mon Sep 17 00:00:00 2001
++From 4ab07243a663ed76a046daea5f16f2dd6fc25a62 Mon Sep 17 00:00:00 2001
+From: Carl Suster <carl at contraflo.ws>
+Date: Fri, 6 Jan 2017 19:44:00 +1100
+Subject: disable test_antistampede
+
+This test spawns many threads that all make a request to an endpoint in
+the web server which does nothing but sleep and return a string. The
+idea is that if caching works this is very fast, so the test assertion
+is that the test was completed quickly.
+
+If the test fails it could run for quite a while, and there is a known
+problem upstream which makes this test unreliable which is why it is
+marked as allowed to fail for pytest. To speed things up, we disable it
+completely until it works more reliably.
+---
+ cherrypy/test/test_caching.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cherrypy/test/test_caching.py b/cherrypy/test/test_caching.py
+index fa2b8cb..1e95341 100644
+--- a/cherrypy/test/test_caching.py
++++ b/cherrypy/test/test_caching.py
+@@ -292,7 +292,7 @@ class CacheTest(helper.CPWebCase):
+ self.assertHeader('Age')
+
+ @pytest.mark.xfail(reason='#1536')
+- def test_antistampede(self):
++ def disabled_test_antistampede(self):
+ SECONDS = 4
+ slow_url = '/long_process?seconds={SECONDS}'.format(**locals())
+ # We MUST make an initial synchronous request in order to create the
diff --cc debian/patches/0004-unrepr-also-from-__builtin__.patch
index a7da41d,0000000..bbcbad0
mode 100644,000000..100644
--- a/debian/patches/0004-unrepr-also-from-__builtin__.patch
+++ b/debian/patches/0004-unrepr-also-from-__builtin__.patch
@@@ -1,45 -1,0 +1,45 @@@
- From 09b76eb0d3b9f1544bb5d6f57d91a715585ae918 Mon Sep 17 00:00:00 2001
++From aa456012b683c2e735a106f9c4301e4fc54bf8e4 Mon Sep 17 00:00:00 2001
+From: Carl Suster <carl at contraflo.ws>
+Date: Fri, 6 Jan 2017 20:21:51 +1100
+Subject: unrepr also from __builtin__
+
+The Python2 tests are failing because __import__ is not found either as
+a module or inside the module "builtins". According to the docs at
+https://docs.python.org/2/library/functions.html#__import__ this
+function is instead inside the module "__builtin__".
+
+This patch makes unrepr also look for the name inside __builtin__ so
+that it can find __import__. It is not clear why this works upstream but
+not in Debian.
+---
+ cherrypy/lib/reprconf.py | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/cherrypy/lib/reprconf.py b/cherrypy/lib/reprconf.py
+index 2553292..0e380b5 100644
+--- a/cherrypy/lib/reprconf.py
++++ b/cherrypy/lib/reprconf.py
+@@ -321,6 +321,11 @@ class _Builder2:
+ return getattr(builtins, name)
+ except AttributeError:
+ pass
++ try:
++ import __builtin__
++ return getattr(__builtin__, name)
++ except AttributeError:
++ pass
+
+ raise TypeError('unrepr could not resolve the name %s' % repr(name))
+
+@@ -465,6 +470,11 @@ class _Builder3:
+ return getattr(builtins, name)
+ except AttributeError:
+ pass
++ try:
++ import __builtin__
++ return getattr(__builtin__, name)
++ except AttributeError:
++ pass
+
+ raise TypeError('unrepr could not resolve the name %s' % repr(name))
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/cherrypy3.git
More information about the Python-modules-commits
mailing list