diff --git a/fix-tests.patch b/fix-tests.patch deleted file mode 100644 index faabaff..0000000 --- a/fix-tests.patch +++ /dev/null @@ -1,38 +0,0 @@ -Index: kombu-3.0.26/kombu/tests/transport/test_qpid.py -=================================================================== ---- kombu-3.0.26.orig/kombu/tests/transport/test_qpid.py -+++ kombu-3.0.26/kombu/tests/transport/test_qpid.py -@@ -1155,7 +1155,7 @@ class TestChannel(ExtraAssertionsMixin, - self.mock_broker.addQueue.side_effect = unique_exception - with self.assertRaises(unique_exception.__class__): - self.my_channel.queue_declare(mock_queue) -- self.mock_broker.addQueue.assert_called_once() -+ assert self.mock_broker.addQueue.called - - def test_exchange_declare_raises_exception_and_silenced(self): - """Create exchange where an exception is raised and then silenced""" -@@ -1308,10 +1308,10 @@ class TestChannel(ExtraAssertionsMixin, - self.my_channel.basic_publish( - mock_message, mock_exchange, mock_routing_key, - ) -- mock_encode_body.assert_called_once( -+ mock_encode_body.assert_called_once_with( - mock_original_body, mock_body_encoding, - ) -- mock_buffer.assert_called_once(mock_encode_body) -+ mock_buffer.assert_called_once_with(mock_encoded_body) - self.assertIs(mock_message['body'], mock_encoded_buffered_body) - self.assertIs( - mock_message['properties']['body_encoding'], mock_body_encoding, -@@ -1567,8 +1567,9 @@ class TestTransportInit(Case): - self.mock_verify_runtime_environment.assert_called_once_with() - - def test_transport___init___calls_parent_class___init__(self): -- Transport(Mock()) -- self.mock_base_Transport__init__.assert_caled_once_with() -+ m = Mock() -+ Transport(m) -+ self.mock_base_Transport__init__.assert_called_once_with(m) - - def test_transport___init___calls_os_pipe(self): - Transport(Mock()) diff --git a/kombu-3.0.26.tar.gz b/kombu-3.0.26.tar.gz deleted file mode 100644 index f6b86dd..0000000 --- a/kombu-3.0.26.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1f565abd44c4b7dfaa4dd543d52f982d2f006aba0a2b3830542b4d25a801fe09 -size 375553 diff --git a/kombu-3.0.33.tar.gz b/kombu-3.0.33.tar.gz new file mode 100644 index 0000000..8c2e53b --- /dev/null +++ b/kombu-3.0.33.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:853d18ca958a598787ceb8c297a369745b82965bf28276861272f14745977999 +size 379423 diff --git a/python-kombu.changes b/python-kombu.changes index 318a67c..193c213 100644 --- a/python-kombu.changes +++ b/python-kombu.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Jan 13 17:34:21 UTC 2016 - antoine.belvire@laposte.net + +- Update to 3.0.33: + * Now depends on :mod:`amqp` 1.4.9 + * Redis: Fixed problem with auxilliary connections causing the + main consumer connection to be closed (Issue #550) + * Qpid: No longer uses threads to operate, to ensure + compatibility with all environments (Issue #531) +- See /usr/share/doc/packages/python-kombu/Changelog for changes + introduced between 3.0.27 and 3.0.32 +- Remove fix-tests.patch + ------------------------------------------------------------------- Mon Sep 14 08:58:49 UTC 2015 - tbechtold@suse.com diff --git a/python-kombu.spec b/python-kombu.spec index 4962e8a..9629d7e 100644 --- a/python-kombu.spec +++ b/python-kombu.spec @@ -1,7 +1,7 @@ # # spec file for package python-kombu # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,19 +17,18 @@ Name: python-kombu -Version: 3.0.26 +Version: 3.0.33 Release: 0 Summary: AMQP Messaging Framework for Python License: BSD-3-Clause Group: Development/Languages/Python Url: https://github.com/celery/kombu Source: http://pypi.python.org/packages/source/k/kombu/kombu-%{version}.tar.gz -Patch0: fix-tests.patch BuildRequires: python-devel BuildRequires: python-setuptools # Test requirements: BuildRequires: python-PyYAML -BuildRequires: python-amqp >= 1.4.6 +BuildRequires: python-amqp >= 1.4.9 BuildRequires: python-anyjson >= 0.3.3 BuildRequires: python-boto BuildRequires: python-mock @@ -72,7 +71,6 @@ provide proven and tested solutions to common messaging problems. %setup -q -n kombu-%{version} # For rpmlint warning: remove shebang from python library: sed -i '/^#!/d' ./kombu/tests/test_serialization.py -%patch0 -p1 %build python setup.py build