From bebdd58f8c39a15b6a740afff412918d24ce0d458364cf760c8a0f90dbc16b1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 13 Dec 2019 16:56:26 +0000 Subject: [PATCH] Accepting request 756812 from home:buschmann23:branches:devel:languages:python - Update to 4.6.7: - Use importlib.metadata from the standard library on Python 3.8+ (#1086). - Add peek lock settings to be changed using transport options (#1119). - Fix redis health checks (#1122). - Reset ready before execute callback (#1126). - Add missing parameter queue_args in kombu.connection.SimpleBuffer (#1128) - Update to 4.6.6: - Revert _lookup_direct and related changes of redis. - Python 3.8 support - Fix 'NoneType' object has no attribute 'can_read' bug of redis transport - Issue #1019 Fix redis transport socket timeout - Add wait timeout settings to receive queue message (#1110) - Bump py-amqp to 2.5.2 - Remove patches now included upstream: - python38.patch OBS-URL: https://build.opensuse.org/request/show/756812 OBS-URL: https://build.opensuse.org/package/show/devel:languages:python/python-kombu?expand=0&rev=149 --- kombu-4.6.5.tar.gz | 3 --- kombu-4.6.7.tar.gz | 3 +++ python-kombu.changes | 19 +++++++++++++++++++ python-kombu.spec | 14 ++++++-------- python38.patch | 36 ------------------------------------ 5 files changed, 28 insertions(+), 47 deletions(-) delete mode 100644 kombu-4.6.5.tar.gz create mode 100644 kombu-4.6.7.tar.gz delete mode 100644 python38.patch diff --git a/kombu-4.6.5.tar.gz b/kombu-4.6.5.tar.gz deleted file mode 100644 index e04e04b..0000000 --- a/kombu-4.6.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:c9078124ce2616b29cf6607f0ac3db894c59154252dee6392cdbbe15e5c4b566 -size 431601 diff --git a/kombu-4.6.7.tar.gz b/kombu-4.6.7.tar.gz new file mode 100644 index 0000000..a00e029 --- /dev/null +++ b/kombu-4.6.7.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:67b32ccb6fea030f8799f8fd50dd08e03a4b99464ebc4952d71d8747b1a52ad1 +size 395355 diff --git a/python-kombu.changes b/python-kombu.changes index 34fad8c..ba01bce 100644 --- a/python-kombu.changes +++ b/python-kombu.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Fri Dec 13 12:23:22 UTC 2019 - Matthias Fehring + +- Update to 4.6.7: + - Use importlib.metadata from the standard library on Python 3.8+ (#1086). + - Add peek lock settings to be changed using transport options (#1119). + - Fix redis health checks (#1122). + - Reset ready before execute callback (#1126). + - Add missing parameter queue_args in kombu.connection.SimpleBuffer (#1128) +- Update to 4.6.6: + - Revert _lookup_direct and related changes of redis. + - Python 3.8 support + - Fix 'NoneType' object has no attribute 'can_read' bug of redis transport + - Issue #1019 Fix redis transport socket timeout + - Add wait timeout settings to receive queue message (#1110) + - Bump py-amqp to 2.5.2 +- Remove patches now included upstream: + - python38.patch + ------------------------------------------------------------------- Tue Oct 8 08:39:47 UTC 2019 - Tomáš Chvátal diff --git a/python-kombu.spec b/python-kombu.spec index 617566a..d87493b 100644 --- a/python-kombu.spec +++ b/python-kombu.spec @@ -1,7 +1,7 @@ # # spec file for package python-kombu # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -18,18 +18,17 @@ %{?!python_module:%define python_module() python-%{**} python3-%{**}} Name: python-kombu -Version: 4.6.5 +Version: 4.6.7 Release: 0 Summary: AMQP Messaging Framework for Python License: BSD-3-Clause 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 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 amqp >= 2.5.2} BuildRequires: %{python_module boto3 >= 1.4.4} BuildRequires: %{python_module case >= 1.5.2} BuildRequires: %{python_module fakeredis} @@ -38,12 +37,12 @@ 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 redis >= 3.3.11} 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-amqp >= 2.5.2 Requires: python-importlib-metadata >= 0.18 Requires: python-setuptools Recommends: python-PyYAML >= 3.10 @@ -66,7 +65,6 @@ 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 @@ -82,7 +80,7 @@ sed -i -e 's:==:>=:g' requirements/*.txt requirements/extras/*.txt %files %{python_files} %license LICENSE -%doc AUTHORS Changelog FAQ README.rst THANKS TODO +%doc AUTHORS FAQ README.rst THANKS TODO %{python_sitelib}/kombu %{python_sitelib}/kombu-%{version}-py%{py_ver}.egg-info diff --git a/python38.patch b/python38.patch deleted file mode 100644 index e1fc9bc..0000000 --- a/python38.patch +++ /dev/null @@ -1,36 +0,0 @@ -From c75039547a57036a627e067173a2b4c136350b66 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= -Date: Tue, 20 Aug 2019 11:30:02 +0200 -Subject: [PATCH] Use importlib.metadata from the standard library on Python - 3.8+ - ---- - kombu/utils/compat.py | 6 +++++- - requirements/default.txt | 2 +- - 2 files changed, 6 insertions(+), 2 deletions(-) - -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 --import importlib_metadata -+ -+try: -+ from importlib import metadata as importlib_metadata -+except ImportError: -+ import importlib_metadata - - from kombu.five import reraise - -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 --importlib-metadata>=0.18 -+importlib-metadata>=0.18; python_version<"3.8"