From c45107de47174bbe53e875e464641ce9a1cf5ab114c70859056b57f7e78b493f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Tue, 8 Oct 2019 08:58:11 +0000 Subject: [PATCH] - Update to 4.6.5: - Revert _lookup api and correct redis implemetnation. - Major overhaul of redis test cases by adding more full featured fakeredis module. - Add more test cases to boost coverage of kombu redis transport. - Refactor the producer consumer test cases to be based on original mocks and be passing - Fix lingering line length issue in test. - Sanitise url when include_password is false - Pinned pycurl to 7.43.0.2 as it is the latest build with wheels provided - Bump py-amqp to 2.5.2 - Rebase python38.patch OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-kombu?expand=0&rev=147 --- kombu-4.6.4.tar.gz | 3 --- kombu-4.6.5.tar.gz | 3 +++ python-kombu.changes | 14 ++++++++++++++ python-kombu.spec | 22 ++++++++++++---------- python38.patch | 20 ++++++++++---------- 5 files changed, 39 insertions(+), 23 deletions(-) delete mode 100644 kombu-4.6.4.tar.gz create mode 100644 kombu-4.6.5.tar.gz diff --git a/kombu-4.6.4.tar.gz b/kombu-4.6.4.tar.gz deleted file mode 100644 index 57fb5d2..0000000 --- a/kombu-4.6.4.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:e5f0312dfb9011bebbf528ccaf118a6c2b5c3b8244451f08381fb23e7715809b -size 428946 diff --git a/kombu-4.6.5.tar.gz b/kombu-4.6.5.tar.gz new file mode 100644 index 0000000..e04e04b --- /dev/null +++ b/kombu-4.6.5.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c9078124ce2616b29cf6607f0ac3db894c59154252dee6392cdbbe15e5c4b566 +size 431601 diff --git a/python-kombu.changes b/python-kombu.changes index b5e1f16..34fad8c 100644 --- a/python-kombu.changes +++ b/python-kombu.changes @@ -1,3 +1,17 @@ +------------------------------------------------------------------- +Tue Oct 8 08:39:47 UTC 2019 - Tomáš Chvátal + +- Update to 4.6.5: + - Revert _lookup api and correct redis implemetnation. + - Major overhaul of redis test cases by adding more full featured fakeredis module. + - Add more test cases to boost coverage of kombu redis transport. + - Refactor the producer consumer test cases to be based on original mocks and be passing + - Fix lingering line length issue in test. + - Sanitise url when include_password is false + - Pinned pycurl to 7.43.0.2 as it is the latest build with wheels provided + - Bump py-amqp to 2.5.2 +- Rebase python38.patch + ------------------------------------------------------------------- Wed Sep 11 13:09:23 UTC 2019 - Tomáš Chvátal diff --git a/python-kombu.spec b/python-kombu.spec index 8cb6ba5..617566a 100644 --- a/python-kombu.spec +++ b/python-kombu.spec @@ -18,38 +18,38 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-kombu -Version: 4.6.4 +Version: 4.6.5 Release: 0 Summary: AMQP Messaging Framework for Python License: BSD-3-Clause -Group: Development/Languages/Python URL: https://github.com/celery/kombu Source: https://files.pythonhosted.org/packages/source/k/kombu/kombu-%{version}.tar.gz Patch0: python38.patch -BuildRequires: %{python_module PyYAML} +BuildRequires: %{python_module Brotli >= 1.0.0} +BuildRequires: %{python_module PyYAML >= 3.10} BuildRequires: %{python_module Pyro4} +BuildRequires: %{python_module SQLAlchemy} BuildRequires: %{python_module amqp >= 2.5.1} BuildRequires: %{python_module boto3 >= 1.4.4} BuildRequires: %{python_module case >= 1.5.2} +BuildRequires: %{python_module fakeredis} BuildRequires: %{python_module importlib-metadata >= 0.18} -BuildRequires: %{python_module msgpack > 0.5.2} +BuildRequires: %{python_module msgpack} +BuildRequires: %{python_module pycurl >= 7.43.0.2} BuildRequires: %{python_module pytest} BuildRequires: %{python_module pytz} BuildRequires: %{python_module redis >= 3.2.0} BuildRequires: %{python_module setuptools >= 20.6.7} +BuildRequires: %{python_module zstandard} BuildRequires: fdupes BuildRequires: python-rpm-macros Requires: python-amqp >= 2.5.1 Requires: python-importlib-metadata >= 0.18 Requires: python-setuptools +Recommends: python-PyYAML >= 3.10 +Recommends: python-Brotli >= 1.0.0 Obsoletes: python-carrot BuildArch: noarch -%if 0%{?suse_version} -Suggests: couchdb -Suggests: mongodb -Suggests: python-Pyro4 -Suggests: rabbitmq-server -%endif %python_subpackages %description @@ -67,6 +67,8 @@ provide proven and tested solutions to common messaging problems. %prep %setup -q -n kombu-%{version} %patch0 -p1 +# pinned dependencies are bad +sed -i -e 's:==:>=:g' requirements/*.txt requirements/extras/*.txt %build %python_build diff --git a/python38.patch b/python38.patch index 5033f67..e1fc9bc 100644 --- a/python38.patch +++ b/python38.patch @@ -9,11 +9,11 @@ Subject: [PATCH] Use importlib.metadata from the standard library on Python requirements/default.txt | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) -diff --git a/kombu/utils/compat.py b/kombu/utils/compat.py -index c5f0bf118..a741c4350 100644 ---- a/kombu/utils/compat.py -+++ b/kombu/utils/compat.py -@@ -7,7 +7,11 @@ +Index: kombu-4.6.5/kombu/utils/compat.py +=================================================================== +--- kombu-4.6.5.orig/kombu/utils/compat.py ++++ kombu-4.6.5/kombu/utils/compat.py +@@ -7,7 +7,11 @@ import sys from functools import wraps from contextlib import contextmanager @@ -26,11 +26,11 @@ index c5f0bf118..a741c4350 100644 from kombu.five import reraise -diff --git a/requirements/default.txt b/requirements/default.txt -index 00e57cc09..e3ec1c894 100644 ---- a/requirements/default.txt -+++ b/requirements/default.txt +Index: kombu-4.6.5/requirements/default.txt +=================================================================== +--- kombu-4.6.5.orig/requirements/default.txt ++++ kombu-4.6.5/requirements/default.txt @@ -1,2 +1,2 @@ - amqp>=2.5.1,<3.0 + amqp==2.5.1 -importlib-metadata>=0.18 +importlib-metadata>=0.18; python_version<"3.8"