From 861a0aa8b124caed4974d70318f16415fcb3feb882e90ae58cd2f44dc7d5a67a Mon Sep 17 00:00:00 2001 From: Alexandre Rogoski Date: Thu, 11 Apr 2013 17:01:36 +0000 Subject: [PATCH 1/6] - Update to 2.5.9: - Pidbox: Now warns if there are multiple nodes consuming from the same pidbox. - Adds Queue.on_declared A callback to be called when the queue is declared, with signature (name, messages, consumers). - Now uses fuzzy matching to suggest alternatives to typos in transport names. - SQS: Adds new transport option queue_prefix. Contributed by j0hnsmith. - pyamqp: No longer overrides verify_connection. - SQS: Now specifies the driver_type and driver_name attributes. Fix contributed by Mher Movsisyan. - Fixed bug with kombu.utils.retry_over_time when no errback specified. - Update to 2.5.9: - Pidbox: Now warns if there are multiple nodes consuming from the same pidbox. - Adds Queue.on_declared A callback to be called when the queue is declared, with signature (name, messages, consumers). - Now uses fuzzy matching to suggest alternatives to typos in transport names. - SQS: Adds new transport option queue_prefix. Contributed by j0hnsmith. - pyamqp: No longer overrides verify_connection. - SQS: Now specifies the driver_type and driver_name attributes. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-kombu?expand=0&rev=75 --- kombu-2.5.8.tar.gz | 3 --- kombu-2.5.9.tar.gz | 3 +++ python-kombu.changes | 20 ++++++++++++++++++++ python-kombu.spec | 2 +- python3-kombu.changes | 20 ++++++++++++++++++++ python3-kombu.spec | 2 +- 6 files changed, 45 insertions(+), 5 deletions(-) delete mode 100644 kombu-2.5.8.tar.gz create mode 100644 kombu-2.5.9.tar.gz diff --git a/kombu-2.5.8.tar.gz b/kombu-2.5.8.tar.gz deleted file mode 100644 index b777292..0000000 --- a/kombu-2.5.8.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:92a4b6129e7a08f24a1b50f8853e3cad321b564a496e8ecc0c7f2bae3f3b71e4 -size 302410 diff --git a/kombu-2.5.9.tar.gz b/kombu-2.5.9.tar.gz new file mode 100644 index 0000000..9d33b93 --- /dev/null +++ b/kombu-2.5.9.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f0f9b7a412964af67e8ac013b5dbe2299eb8f1bd68b09a6d3d85717bdf1ea459 +size 303193 diff --git a/python-kombu.changes b/python-kombu.changes index 3d37e81..0440fc5 100644 --- a/python-kombu.changes +++ b/python-kombu.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Thu Apr 11 16:51:37 UTC 2013 - alexandre@exatati.com.br + +- Update to 2.5.9: + - Pidbox: Now warns if there are multiple nodes consuming from + the same pidbox. + - Adds Queue.on_declared + A callback to be called when the queue is declared, + with signature (name, messages, consumers). + - Now uses fuzzy matching to suggest alternatives to typos in transport + names. + - SQS: Adds new transport option queue_prefix. + Contributed by j0hnsmith. + - pyamqp: No longer overrides verify_connection. + - SQS: Now specifies the driver_type and driver_name + attributes. + Fix contributed by Mher Movsisyan. + - Fixed bug with kombu.utils.retry_over_time when no errback + specified. + ------------------------------------------------------------------- Thu Mar 21 19:57:35 UTC 2013 - alexandre@exatati.com.br diff --git a/python-kombu.spec b/python-kombu.spec index f3536a4..ab3b13f 100644 --- a/python-kombu.spec +++ b/python-kombu.spec @@ -17,7 +17,7 @@ Name: python-kombu -Version: 2.5.8 +Version: 2.5.9 Release: 0 Summary: AMQP Messaging Framework for Python License: BSD-3-Clause diff --git a/python3-kombu.changes b/python3-kombu.changes index 10f26fa..f1a66f8 100644 --- a/python3-kombu.changes +++ b/python3-kombu.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +Thu Apr 11 16:51:37 UTC 2013 - alexandre@exatati.com.br + +- Update to 2.5.9: + - Pidbox: Now warns if there are multiple nodes consuming from + the same pidbox. + - Adds Queue.on_declared + A callback to be called when the queue is declared, + with signature (name, messages, consumers). + - Now uses fuzzy matching to suggest alternatives to typos in transport + names. + - SQS: Adds new transport option queue_prefix. + Contributed by j0hnsmith. + - pyamqp: No longer overrides verify_connection. + - SQS: Now specifies the driver_type and driver_name + attributes. + Fix contributed by Mher Movsisyan. + - Fixed bug with kombu.utils.retry_over_time when no errback + specified. + ------------------------------------------------------------------- Thu Mar 21 19:59:14 UTC 2013 - alexandre@exatati.com.br diff --git a/python3-kombu.spec b/python3-kombu.spec index 8af8d70..5cb899a 100644 --- a/python3-kombu.spec +++ b/python3-kombu.spec @@ -17,7 +17,7 @@ Name: python3-kombu -Version: 2.5.8 +Version: 2.5.9 Release: 0 Summary: AMQP Messaging Framework for Python License: BSD-2-Clause From 20af303231f2046c3ec650e452b6b07b3b0cfec41ce77e8eeacb0ccd31c6d49a Mon Sep 17 00:00:00 2001 From: Alexandre Rogoski Date: Fri, 12 Apr 2013 17:59:12 +0000 Subject: [PATCH 2/6] - Update to 2.5.10: Kombu 3 consumers will no longer accept pickle/yaml or msgpack by default, and you will have to explicitly enable untrusted deserializers either globally using kombu.enable_insecure_serializers, or using the accept argument to kombu.Consumer. - New utility function to disable/enable untrusted serializers. - kombu.disable_insecure_serializers - kombu.enable_insecure_serializers - Consumer: `accept` can now be used to specify a whitelist of content types to accept. If the accept whitelist is set and a message is received with a content type that is not in the whitelist then a :exc:`~kombu.exceptions.ContentDisallowed` exception is raised. Note that this error can be handled by the already existing `on_decode_error` callback Examples: Consumer(accept=['application/json']) Consumer(accept=['pickle', 'json']) - Now depends on amqp 1.0.11 - pidbox: Mailbox now supports the `accept` argument. - Redis: More friendly error for when keys are missing. - Connection URLs: The parser did not work well when there were multiple '+' tokens. OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-kombu?expand=0&rev=76 --- accept-newer-amqp-versions.diff | 31 ------------------------------- kombu-2.5.10.tar.gz | 3 +++ kombu-2.5.9.tar.gz | 3 --- python-kombu.changes | 27 +++++++++++++++++++++++++++ python-kombu.spec | 6 ++---- python3-kombu.spec | 6 ++---- 6 files changed, 34 insertions(+), 42 deletions(-) delete mode 100644 accept-newer-amqp-versions.diff create mode 100644 kombu-2.5.10.tar.gz delete mode 100644 kombu-2.5.9.tar.gz diff --git a/accept-newer-amqp-versions.diff b/accept-newer-amqp-versions.diff deleted file mode 100644 index cc46fa3..0000000 --- a/accept-newer-amqp-versions.diff +++ /dev/null @@ -1,31 +0,0 @@ -Index: kombu.egg-info/requires.txt -=================================================================== ---- kombu.egg-info/requires.txt.orig -+++ kombu.egg-info/requires.txt -@@ -1,2 +1,2 @@ - anyjson>=0.3.3 --amqp>=1.0.10,<1.1.0 -\ No newline at end of file -+amqp>=1.0.10 -\ No newline at end of file -Index: requirements/default.txt -=================================================================== ---- requirements/default.txt.orig -+++ requirements/default.txt -@@ -1,2 +1,2 @@ - anyjson>=0.3.3 --amqp>=1.0.10,<1.1.0 -+amqp>=1.0.10 -Index: setup.cfg -=================================================================== ---- setup.cfg.orig -+++ setup.cfg -@@ -28,7 +28,7 @@ upload-dir = docs/.build/html - - [bdist_rpm] - requires = anyjson >= 0.3.3 -- amqp < 1.1.0 -+ amqp >= 1.0.9 - importlib - ordereddict - diff --git a/kombu-2.5.10.tar.gz b/kombu-2.5.10.tar.gz new file mode 100644 index 0000000..bc1798f --- /dev/null +++ b/kombu-2.5.10.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:01c1e56fe88053b6e7801682277c4cc8318c485d8bd47c830c08567bfac680e2 +size 304810 diff --git a/kombu-2.5.9.tar.gz b/kombu-2.5.9.tar.gz deleted file mode 100644 index 9d33b93..0000000 --- a/kombu-2.5.9.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f0f9b7a412964af67e8ac013b5dbe2299eb8f1bd68b09a6d3d85717bdf1ea459 -size 303193 diff --git a/python-kombu.changes b/python-kombu.changes index 0440fc5..c08875a 100644 --- a/python-kombu.changes +++ b/python-kombu.changes @@ -1,3 +1,30 @@ +------------------------------------------------------------------- +Fri Apr 12 17:47:22 UTC 2013 - alexandre@exatati.com.br + +- Update to 2.5.10: + Kombu 3 consumers will no longer accept pickle/yaml or msgpack + by default, and you will have to explicitly enable untrusted deserializers + either globally using kombu.enable_insecure_serializers, or + using the accept argument to kombu.Consumer. + - New utility function to disable/enable untrusted serializers. + - kombu.disable_insecure_serializers + - kombu.enable_insecure_serializers + - Consumer: `accept` can now be used to specify a whitelist + of content types to accept. + If the accept whitelist is set and a message is received + with a content type that is not in the whitelist then a + :exc:`~kombu.exceptions.ContentDisallowed` exception + is raised. Note that this error can be handled by the already + existing `on_decode_error` callback + Examples: + Consumer(accept=['application/json']) + Consumer(accept=['pickle', 'json']) + - Now depends on amqp 1.0.11 + - pidbox: Mailbox now supports the `accept` argument. + - Redis: More friendly error for when keys are missing. + - Connection URLs: The parser did not work well when there were + multiple '+' tokens. + ------------------------------------------------------------------- Thu Apr 11 16:51:37 UTC 2013 - alexandre@exatati.com.br diff --git a/python-kombu.spec b/python-kombu.spec index ab3b13f..6593eaf 100644 --- a/python-kombu.spec +++ b/python-kombu.spec @@ -17,14 +17,13 @@ Name: python-kombu -Version: 2.5.9 +Version: 2.5.10 Release: 0 Summary: AMQP Messaging Framework for Python License: BSD-3-Clause Group: Development/Languages/Python Url: http://github.com/ask/kombu/ Source: http://pypi.python.org/packages/source/k/kombu/kombu-%{version}.tar.gz -Patch0: accept-newer-amqp-versions.diff BuildRequires: python-PyYAML BuildRequires: python-amqplib BuildRequires: python-anyjson @@ -35,7 +34,7 @@ BuildRequires: python-msgpack-python BuildRequires: python-nose-cover3 BuildRequires: python-simplejson BuildRequires: python-unittest2 >= 0.5.0 -Requires: python-amqp >= 1.0.8 +Requires: python-amqp >= 1.0.11 Requires: python-anyjson >= 0.3.3 %if 0%{?suse_version} && 0%{?suse_version} <= 1110 Requires: python-importlib @@ -65,7 +64,6 @@ provide proven and tested solutions to common messaging problems. %prep %setup -q -n kombu-%{version} -%patch0 # For rpmlint warning: remove shebang from python library: sed -i '/^#!/d' ./kombu/tests/test_serialization.py # NOTE(saschpe): We have a newer python-amqp, but this shouldn't be an issue: diff --git a/python3-kombu.spec b/python3-kombu.spec index 5cb899a..8e03433 100644 --- a/python3-kombu.spec +++ b/python3-kombu.spec @@ -17,14 +17,13 @@ Name: python3-kombu -Version: 2.5.9 +Version: 2.5.10 Release: 0 Summary: AMQP Messaging Framework for Python License: BSD-2-Clause Group: Development/Languages/Python Url: http://github.com/ask/kombu/ Source: http://pypi.python.org/packages/source/k/kombu/kombu-%{version}.tar.gz -Patch0: accept-newer-amqp-versions.diff BuildRequires: python3 BuildRequires: python3-PyYAML BuildRequires: python3-amqplib @@ -36,7 +35,7 @@ BuildRequires: python3-msgpack-python BuildRequires: python3-nose-cover3 BuildRequires: python3-simplejson BuildRequires: python3-unittest2 -Requires: python3-amqp >= 1.0.8 +Requires: python3-amqp >= 1.0.11 Requires: python3-anyjson Suggests: couchdb Suggests: mongodb @@ -57,7 +56,6 @@ providing an idiomatic high-level interface for the AMQP protocol, and also provide proven and tested solutions to common messaging problems. %prep -%setup -q -n kombu-%{version} %patch0 # For rpmlint warning: remove shebang from python library: sed -i '/^#!/d' ./kombu/tests/test_serialization.py From 461ef3cb7a0c57a0f686f213d0d9dccc29151dce3e04011605ec56e9a845af23 Mon Sep 17 00:00:00 2001 From: Todd R Date: Sat, 13 Apr 2013 10:32:23 +0000 Subject: [PATCH 3/6] Accepting request 163866 from devel:languages:python3 - Change suggests to recommends since suggests are not well supported - Disable simplejson on openSUSE <= 12.2 since it is not supported OBS-URL: https://build.opensuse.org/request/show/163866 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-kombu?expand=0&rev=77 --- accept-newer-amqp-versions.diff | 31 +++++++++++++++++++++++++++++++ python-kombu.changes | 5 +++++ python-kombu.spec | 6 +++--- python3-kombu.changes | 33 +++++++++++++++++++++++++++++++++ python3-kombu.spec | 10 ++++++---- 5 files changed, 78 insertions(+), 7 deletions(-) create mode 100644 accept-newer-amqp-versions.diff diff --git a/accept-newer-amqp-versions.diff b/accept-newer-amqp-versions.diff new file mode 100644 index 0000000..cc46fa3 --- /dev/null +++ b/accept-newer-amqp-versions.diff @@ -0,0 +1,31 @@ +Index: kombu.egg-info/requires.txt +=================================================================== +--- kombu.egg-info/requires.txt.orig ++++ kombu.egg-info/requires.txt +@@ -1,2 +1,2 @@ + anyjson>=0.3.3 +-amqp>=1.0.10,<1.1.0 +\ No newline at end of file ++amqp>=1.0.10 +\ No newline at end of file +Index: requirements/default.txt +=================================================================== +--- requirements/default.txt.orig ++++ requirements/default.txt +@@ -1,2 +1,2 @@ + anyjson>=0.3.3 +-amqp>=1.0.10,<1.1.0 ++amqp>=1.0.10 +Index: setup.cfg +=================================================================== +--- setup.cfg.orig ++++ setup.cfg +@@ -28,7 +28,7 @@ upload-dir = docs/.build/html + + [bdist_rpm] + requires = anyjson >= 0.3.3 +- amqp < 1.1.0 ++ amqp >= 1.0.9 + importlib + ordereddict + diff --git a/python-kombu.changes b/python-kombu.changes index c08875a..9616d92 100644 --- a/python-kombu.changes +++ b/python-kombu.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sat Apr 13 10:17:23 UTC 2013 - toddrme2178@gmail.com + +- Changes suggests to recommends since suggets are not well supported + ------------------------------------------------------------------- Fri Apr 12 17:47:22 UTC 2013 - alexandre@exatati.com.br diff --git a/python-kombu.spec b/python-kombu.spec index 6593eaf..a027aaf 100644 --- a/python-kombu.spec +++ b/python-kombu.spec @@ -40,9 +40,9 @@ Requires: python-anyjson >= 0.3.3 Requires: python-importlib Requires: python-ordereddict %endif -Suggests: couchdb -Suggests: mongodb -Suggests: rabbitmq-server +Recommends: couchdb +Recommends: mongodb +Recommends: rabbitmq-server BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} && 0%{?suse_version} <= 1110 %{!?python_sitelib: %global python_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} diff --git a/python3-kombu.changes b/python3-kombu.changes index f1a66f8..97103b4 100644 --- a/python3-kombu.changes +++ b/python3-kombu.changes @@ -1,3 +1,36 @@ +------------------------------------------------------------------- +Fri Apr 12 17:47:22 UTC 2013 - alexandre@exatati.com.br + +- Update to 2.5.10: + Kombu 3 consumers will no longer accept pickle/yaml or msgpack + by default, and you will have to explicitly enable untrusted deserializers + either globally using kombu.enable_insecure_serializers, or + using the accept argument to kombu.Consumer. + - New utility function to disable/enable untrusted serializers. + - kombu.disable_insecure_serializers + - kombu.enable_insecure_serializers + - Consumer: `accept` can now be used to specify a whitelist + of content types to accept. + If the accept whitelist is set and a message is received + with a content type that is not in the whitelist then a + :exc:`~kombu.exceptions.ContentDisallowed` exception + is raised. Note that this error can be handled by the already + existing `on_decode_error` callback + Examples: + Consumer(accept=['application/json']) + Consumer(accept=['pickle', 'json']) + - Now depends on amqp 1.0.11 + - pidbox: Mailbox now supports the `accept` argument. + - Redis: More friendly error for when keys are missing. + - Connection URLs: The parser did not work well when there were + multiple '+' tokens. + +------------------------------------------------------------------- +Fri Apr 12 12:06:17 UTC 2013 - toddrme2178@gmail.com + +- Change suggests to recommends since suggests are not well supported +- Disable simplejson on openSUSE <= 12.2 since it is not supported + ------------------------------------------------------------------- Thu Apr 11 16:51:37 UTC 2013 - alexandre@exatati.com.br diff --git a/python3-kombu.spec b/python3-kombu.spec index 8e03433..e951d77 100644 --- a/python3-kombu.spec +++ b/python3-kombu.spec @@ -33,13 +33,15 @@ BuildRequires: python3-distribute BuildRequires: python3-mock BuildRequires: python3-msgpack-python BuildRequires: python3-nose-cover3 +%if 0%{?suse_version} >= 1230 BuildRequires: python3-simplejson +%endif BuildRequires: python3-unittest2 Requires: python3-amqp >= 1.0.11 Requires: python3-anyjson -Suggests: couchdb -Suggests: mongodb -Suggests: rabbitmq-server +Recommends: couchdb +Recommends: mongodb +Recommends: rabbitmq-server BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch @@ -56,7 +58,7 @@ providing an idiomatic high-level interface for the AMQP protocol, and also provide proven and tested solutions to common messaging problems. %prep -%patch0 +%setup -q -n kombu-%{version} # For rpmlint warning: remove shebang from python library: sed -i '/^#!/d' ./kombu/tests/test_serialization.py From f6388bd9c5129e815b1e8c6d91421ca1c64b50220dcf9da0484a580e0bc6f8dd Mon Sep 17 00:00:00 2001 From: Todd R Date: Sat, 13 Apr 2013 10:32:59 +0000 Subject: [PATCH 4/6] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-kombu?expand=0&rev=78 --- accept-newer-amqp-versions.diff | 31 ------------------------------- 1 file changed, 31 deletions(-) delete mode 100644 accept-newer-amqp-versions.diff diff --git a/accept-newer-amqp-versions.diff b/accept-newer-amqp-versions.diff deleted file mode 100644 index cc46fa3..0000000 --- a/accept-newer-amqp-versions.diff +++ /dev/null @@ -1,31 +0,0 @@ -Index: kombu.egg-info/requires.txt -=================================================================== ---- kombu.egg-info/requires.txt.orig -+++ kombu.egg-info/requires.txt -@@ -1,2 +1,2 @@ - anyjson>=0.3.3 --amqp>=1.0.10,<1.1.0 -\ No newline at end of file -+amqp>=1.0.10 -\ No newline at end of file -Index: requirements/default.txt -=================================================================== ---- requirements/default.txt.orig -+++ requirements/default.txt -@@ -1,2 +1,2 @@ - anyjson>=0.3.3 --amqp>=1.0.10,<1.1.0 -+amqp>=1.0.10 -Index: setup.cfg -=================================================================== ---- setup.cfg.orig -+++ setup.cfg -@@ -28,7 +28,7 @@ upload-dir = docs/.build/html - - [bdist_rpm] - requires = anyjson >= 0.3.3 -- amqp < 1.1.0 -+ amqp >= 1.0.9 - importlib - ordereddict - From ca9cec7bd183a89457ed4e5faea186147810e08f522da964d5d677e4853db1f6 Mon Sep 17 00:00:00 2001 From: Todd R Date: Sat, 13 Apr 2013 10:33:14 +0000 Subject: [PATCH 5/6] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-kombu?expand=0&rev=79 --- python-kombu.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/python-kombu.changes b/python-kombu.changes index 9616d92..bb62293 100644 --- a/python-kombu.changes +++ b/python-kombu.changes @@ -2,6 +2,7 @@ Sat Apr 13 10:17:23 UTC 2013 - toddrme2178@gmail.com - Changes suggests to recommends since suggets are not well supported +- Remove unused patch ------------------------------------------------------------------- Fri Apr 12 17:47:22 UTC 2013 - alexandre@exatati.com.br From 8a2c2d08ff4a7ce3bc402cf2d6ff21356f8eb91d50c0e6e6da4c870faed4b306 Mon Sep 17 00:00:00 2001 From: Todd R Date: Sat, 13 Apr 2013 10:33:26 +0000 Subject: [PATCH 6/6] OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-kombu?expand=0&rev=80 --- python3-kombu.changes | 1 + 1 file changed, 1 insertion(+) diff --git a/python3-kombu.changes b/python3-kombu.changes index 97103b4..c1911d3 100644 --- a/python3-kombu.changes +++ b/python3-kombu.changes @@ -24,6 +24,7 @@ Fri Apr 12 17:47:22 UTC 2013 - alexandre@exatati.com.br - Redis: More friendly error for when keys are missing. - Connection URLs: The parser did not work well when there were multiple '+' tokens. +- Remove unused patch ------------------------------------------------------------------- Fri Apr 12 12:06:17 UTC 2013 - toddrme2178@gmail.com