Bug#923555: unblock: kombu/4.2.1-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Please unblock package kombu
the package FTBFS due to failing tests and 4.2.1-2 adds an upstream patch that
addressed this issue.
It also bumped standards version to 4.3.0 with no changes necessary and cleans
up build artifacts that were introduced by a newer pytest release since tha last
upload.
See attached debdiff for changes.
unblock kombu/4.2.1-2
- -- System Information:
Debian Release: buster/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: armhf
Kernel: Linux 4.19.0-3-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_DK.UTF-8, LC_CTYPE=en_DK.UTF-8 (charmap=UTF-8), LANGUAGE=en_US:en (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
LSM: AppArmor: enabled
-----BEGIN PGP SIGNATURE-----
iQFFBAEBCgAvFiEEqVSlRXW87UkkCnJc/9PIi5l90WoFAlx5mRMRHGZsYWRpQGRl
Ymlhbi5vcmcACgkQ/9PIi5l90Wo5HQf/Za1iUTzre1+QLjIAicFsbldIcV/2wOKP
BAe4XXVixv+y9IX/o3bIR3TkmJ5Yd3Bf/hhfXMxvINXPbd/OQsPXiB4Qx9TcPL61
DuX5cL4Fd6D4pFNtZMpyyvL6mppIXlcdlG2kGmXc/T8GVNg/1Z4uI+kwIRYIu+V5
alGNbuQzAUiVmsyGZf5tADCffkQAtbGzQucaJ+V1WZbBTSmBGauWreCgh8+XvgDj
8Phm/XwpHyZ/QD6hZ16vdTZ3v3VePqQpuzBl6RXfx7xMNBj3HiQQsgL6OVrw6xcQ
pbQElG6ueN0SM2jTjvL8Pj6c51rlSDHOw9CqxngMU4Y21BSQZNa81A==
=wcSM
-----END PGP SIGNATURE-----
diff -Nru kombu-4.2.1/debian/changelog kombu-4.2.1/debian/changelog
--- kombu-4.2.1/debian/changelog 2018-06-20 10:02:04.000000000 +0200
+++ kombu-4.2.1/debian/changelog 2019-03-01 20:03:25.000000000 +0100
@@ -1,3 +1,16 @@
+kombu (4.2.1-2) unstable; urgency=high
+
+ [ Ondřej Nový ]
+ * Use 'python3 -m sphinx' instead of sphinx-build for building docs
+
+ [ Michael Fladischer ]
+ * Apply upstream patch PR#978 to fix failing unittests of pyamqp
+ transport (Closes: #921787).
+ * Clean up pytest artifacts to allow two builds in a row.
+ * Bump Standards-Version to 4.3.0.
+
+ -- Michael Fladischer <fladi@debian.org> Fri, 01 Mar 2019 20:03:25 +0100
+
kombu (4.2.1-1) unstable; urgency=low
[ Ondřej Nový ]
diff -Nru kombu-4.2.1/debian/clean kombu-4.2.1/debian/clean
--- kombu-4.2.1/debian/clean 2018-06-20 10:02:04.000000000 +0200
+++ kombu-4.2.1/debian/clean 2019-03-01 20:03:25.000000000 +0100
@@ -1 +1,4 @@
kombu.egg-info/
+.pytest_cache/README.md
+.pytest_cache/v/cache/nodeids
+.pytest_cache/v/cache/stepwise
diff -Nru kombu-4.2.1/debian/control kombu-4.2.1/debian/control
--- kombu-4.2.1/debian/control 2018-06-20 10:02:04.000000000 +0200
+++ kombu-4.2.1/debian/control 2019-03-01 20:03:25.000000000 +0100
@@ -55,7 +55,7 @@
Build-Conflicts:
python-cjson,
python-sphinx,
-Standards-Version: 4.1.4
+Standards-Version: 4.3.0
Homepage: https://github.com/celery/kombu/
Vcs-Git: https://salsa.debian.org/python-team/modules/kombu.git
Vcs-Browser: https://salsa.debian.org/python-team/modules/kombu
diff -Nru kombu-4.2.1/debian/patches/0004-Fix-failing-unittests-of-pyamqp-transport.patch kombu-4.2.1/debian/patches/0004-Fix-failing-unittests-of-pyamqp-transport.patch
--- kombu-4.2.1/debian/patches/0004-Fix-failing-unittests-of-pyamqp-transport.patch 1970-01-01 01:00:00.000000000 +0100
+++ kombu-4.2.1/debian/patches/0004-Fix-failing-unittests-of-pyamqp-transport.patch 2019-03-01 20:03:25.000000000 +0100
@@ -0,0 +1,27 @@
+From: Matus Valo <matusvalo@gmail.com>
+Date: Thu, 3 Jan 2019 06:43:31 -0800
+Subject: Fix failing unittests of pyamqp transport.
+
+Failing unittests were caused by commit f16df2a17630c9804a6da614443c5e862271823f in pyamqp.
+---
+ t/unit/transport/test_pyamqp.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/t/unit/transport/test_pyamqp.py b/t/unit/transport/test_pyamqp.py
+index 8292991..32094b4 100644
+--- a/t/unit/transport/test_pyamqp.py
++++ b/t/unit/transport/test_pyamqp.py
+@@ -68,11 +68,11 @@ class test_Channel:
+ assert self.channel.connection is None
+
+ def test_basic_consume_registers_ack_status(self):
+- self.channel.wait_returns = 'my-consumer-tag'
++ self.channel.wait_returns = ['my-consumer-tag']
+ self.channel.basic_consume('foo', no_ack=True)
+ assert 'my-consumer-tag' in self.channel.no_ack_consumers
+
+- self.channel.wait_returns = 'other-consumer-tag'
++ self.channel.wait_returns = ['other-consumer-tag']
+ self.channel.basic_consume('bar', no_ack=False)
+ assert 'other-consumer-tag' not in self.channel.no_ack_consumers
+
diff -Nru kombu-4.2.1/debian/patches/series kombu-4.2.1/debian/patches/series
--- kombu-4.2.1/debian/patches/series 2018-06-20 10:02:04.000000000 +0200
+++ kombu-4.2.1/debian/patches/series 2019-03-01 20:03:25.000000000 +0100
@@ -1,3 +1,4 @@
0001-Remove-image-from-remote-donation-site-privacy-issue.patch
0002-Disable-intershpinx-mapping-for-now.patch
0003-Remove-pytest-sugar-from-test-requirements.patch
+0004-Fix-failing-unittests-of-pyamqp-transport.patch
diff -Nru kombu-4.2.1/debian/rules kombu-4.2.1/debian/rules
--- kombu-4.2.1/debian/rules 2018-06-20 10:02:04.000000000 +0200
+++ kombu-4.2.1/debian/rules 2019-03-01 20:03:25.000000000 +0100
@@ -7,7 +7,7 @@
override_dh_sphinxdoc:
ifeq (,$(findstring nodoc, $(DEB_BUILD_OPTIONS)))
- http_proxy=127.0.0.1:9 https_proxy=127.0.0.1:9 PYTHONPATH=. sphinx-build -b html -d docs/.build/.doctrees -N docs $(CURDIR)/debian/python-kombu-doc/usr/share/doc/python-kombu-doc/html
+ http_proxy=127.0.0.1:9 https_proxy=127.0.0.1:9 PYTHONPATH=. python3 -m sphinx -b html -d docs/.build/.doctrees -N docs $(CURDIR)/debian/python-kombu-doc/usr/share/doc/python-kombu-doc/html
dh_sphinxdoc
endif
Reply to: