diff -pruN 8.6.0+ds1-3/debian/changelog 8.6.0+ds1-3ubuntu1/debian/changelog --- 8.6.0+ds1-3/debian/changelog 2022-05-12 15:27:36.000000000 +0000 +++ 8.6.0+ds1-3ubuntu1/debian/changelog 2022-05-18 10:47:40.000000000 +0000 @@ -1,3 +1,17 @@ +python-cheroot (8.6.0+ds1-3ubuntu1) kinetic; urgency=medium + + * Merge from Debian unstable (LP: #1967139), remaining changes + + d/rules: Enable test suite, skip small subset of tests + that rely on unpackaged dependencies, unset proxy + variable to support SSL tests. + + d/rules: Remove dh_auto_test no-op override. + * dropped: + + d/p/0*.patch: dropped as included in new upstream + * added: + + d/p/remove_pypytools_dependency.patch to work around test dependency + + -- Heinrich Schuchardt Wed, 18 May 2022 10:47:40 +0000 + python-cheroot (8.6.0+ds1-3) unstable; urgency=medium * Add a patch to declare a PEP440-compatible version (Closes: #1010894). @@ -36,6 +50,37 @@ python-cheroot (8.5.2+ds1-2) unstable; u -- Julien Puydt Fri, 27 Aug 2021 14:56:02 +0200 +python-cheroot (8.5.2+ds1-1ubuntu3) jammy; urgency=medium + + * d/p/000*.patch: Cherry pick fixes from maint/8.x branch upstream + to resolve test failures and compatibility with Python 3.10 + (LP: #1965306). + * d/p/skip-test_broken_connection_during_tcp_fin.patch: Drop, + cherry picked patch series resolves all test failures. + + -- James Page Thu, 17 Mar 2022 14:21:05 +0000 + +python-cheroot (8.5.2+ds1-1ubuntu2) impish; urgency=medium + + * d/rules: Run tests serially to prevent races. + + -- James Page Thu, 22 Jul 2021 18:40:11 +0100 + +python-cheroot (8.5.2+ds1-1ubuntu1) impish; urgency=medium + + * Enable execution of test suite during package build: + - d/rules: Enable test suite, skip small subset of tests + that rely on unpackaged dependencies, unset proxy + variable to support SSL tests. + - d/rules: Remove dh_auto_test no-op override. + - d/control: Add BD's for test execution. + - d/p/skip-test_broken_connection_during_tcp_fin.patch: + Skip broken connection tests as these use features from + a much newer version of pytest-mock which is not yet + packaged. + + -- James Page Thu, 22 Jul 2021 14:37:50 +0100 + python-cheroot (8.5.2+ds1-1) unstable; urgency=medium * New upstream release. diff -pruN 8.6.0+ds1-3/debian/control 8.6.0+ds1-3ubuntu1/debian/control --- 8.6.0+ds1-3/debian/control 2022-05-12 15:27:36.000000000 +0000 +++ 8.6.0+ds1-3ubuntu1/debian/control 2022-05-17 11:09:07.000000000 +0000 @@ -1,5 +1,6 @@ Source: python-cheroot -Maintainer: Debian Python Team +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Debian Python Team Uploaders: Julien Puydt Section: python Priority: optional @@ -7,11 +8,26 @@ Standards-Version: 4.6.0 Homepage: https://github.com/cherrypy/cheroot Build-Depends: debhelper-compat (= 13), dh-python, + pypy-lib, python3-all, + python3-jaraco.functools, + python3-jaraco.text, + python3-jaraco.context, + python3-more-itertools, + python3-openssl, python3-packaging, + python3-portend, python3-pytest, + python3-pytest-cov, + python3-pytest-mock, + python3-pytest-xdist, + python3-requests-toolbelt, + python3-requests-unixsocket, python3-setuptools, - python3-setuptools-scm-git-archive + python3-setuptools-scm-git-archive, + python3-six, + python3-sphinx, + python3-trustme Rules-Requires-Root: no Vcs-Git: https://salsa.debian.org/python-team/packages/python-cheroot.git Vcs-Browser: https://salsa.debian.org/python-team/packages/python-cheroot diff -pruN 8.6.0+ds1-3/debian/patches/remove_pypytools_dependency.patch 8.6.0+ds1-3ubuntu1/debian/patches/remove_pypytools_dependency.patch --- 8.6.0+ds1-3/debian/patches/remove_pypytools_dependency.patch 1970-01-01 00:00:00.000000000 +0000 +++ 8.6.0+ds1-3ubuntu1/debian/patches/remove_pypytools_dependency.patch 2022-05-17 11:09:07.000000000 +0000 @@ -0,0 +1,36 @@ +Remove dependency on pypytools + +Pypytools is not packaged in Ubuntu. + +Signed-off: Heinrich Schuchardt + +--- a/cheroot/test/test_server.py ++++ b/cheroot/test/test_server.py +@@ -16,7 +16,7 @@ + import requests_unixsocket + import six + +-from pypytools.gc.custom import DefaultGc ++import gc + from six.moves import queue, urllib + + from .._compat import bton, ntob +@@ -368,11 +368,17 @@ + test_high_number_of_file_descriptors, + ) + ++class GcWrapper: ++ def __enter__(self): ++ gc.disable() ++ ++ def __exit__(self, exc_type, exc_val, exc_tb): ++ gc.enable() + + @pytest.fixture + def _garbage_bin(): + """Disable garbage collection when this fixture is in use.""" +- with DefaultGc().nogc(): ++ with GcWrapper(): + yield + + diff -pruN 8.6.0+ds1-3/debian/patches/series 8.6.0+ds1-3ubuntu1/debian/patches/series --- 8.6.0+ds1-3/debian/patches/series 2022-05-12 15:27:36.000000000 +0000 +++ 8.6.0+ds1-3ubuntu1/debian/patches/series 2022-05-17 11:09:07.000000000 +0000 @@ -1 +1,2 @@ pep440_version_number.patch +remove_pypytools_dependency.patch diff -pruN 8.6.0+ds1-3/debian/rules 8.6.0+ds1-3ubuntu1/debian/rules --- 8.6.0+ds1-3/debian/rules 2022-05-12 15:27:36.000000000 +0000 +++ 8.6.0+ds1-3ubuntu1/debian/rules 2022-05-17 11:09:03.000000000 +0000 @@ -10,10 +10,11 @@ export PYBUILD_INSTALL_ARGS=mkdir -p {de cp -r cheroot {destdir}/usr/lib/python{version}/dist-packages && \ sed -e 's/VERSION/$(DEB_VERSION_UPSTREAM:+ds=)/g' debian/cheroot.egg-info > \ {destdir}/usr/lib/python{version}/dist-packages/cheroot-$(DEB_VERSION_UPSTREAM:+ds=).egg-info +# Run tests directly from package root as build step is skipped +# Ignore WSGI tests as missing dependency (jaraco.context). +# Disable automatic http(s)_proxy from pybuild for SSL tests. +export PYBUILD_TEST_ARGS=http_proxy= https_proxy= python{version} -m pytest --ignore-glob=**/test_wsgi.py -n1 export LC_ALL=C.UTF-8 %: dh $@ --with python3 --buildsystem=pybuild - -override_dh_auto_test: - @echo "Tests disabled because of missing depends"