Accepting request 730150 from devel:languages:python
- Update to 4.6.4: - Use importlib-metadata instead of pkg_resources for better performance - Allow users to switch URLs while omitting the resource identifier (#1032) - Don't stop receiving tasks on 503 SQS error. (#1064) - Fix maybe declare (#1066) - Revert "Revert "Use SIMEMBERS instead of SMEMBERS to check for queue (Redis Broker) - Fix MongoDB backend to work properly with TTL (#1076) - Make sure that max_retries=0 is treated differently than None (#1080) - Bump py-amqp to 2.5.1 - Add patch to fix build with py 3.8: * python38.patch OBS-URL: https://build.opensuse.org/request/show/730150 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/python-kombu?expand=0&rev=62
This commit is contained in:
commit
5380b56eef
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:eb365ea795cd7e629ba2f1f398e0c3ba354b91ef4de225ffdf6ab45fdfc7d581
|
|
||||||
size 427754
|
|
3
kombu-4.6.4.tar.gz
Normal file
3
kombu-4.6.4.tar.gz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:e5f0312dfb9011bebbf528ccaf118a6c2b5c3b8244451f08381fb23e7715809b
|
||||||
|
size 428946
|
@ -1,3 +1,18 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Sep 11 13:09:23 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
|
||||||
|
|
||||||
|
- Update to 4.6.4:
|
||||||
|
- Use importlib-metadata instead of pkg_resources for better performance
|
||||||
|
- Allow users to switch URLs while omitting the resource identifier (#1032)
|
||||||
|
- Don't stop receiving tasks on 503 SQS error. (#1064)
|
||||||
|
- Fix maybe declare (#1066)
|
||||||
|
- Revert "Revert "Use SIMEMBERS instead of SMEMBERS to check for queue (Redis Broker)
|
||||||
|
- Fix MongoDB backend to work properly with TTL (#1076)
|
||||||
|
- Make sure that max_retries=0 is treated differently than None (#1080)
|
||||||
|
- Bump py-amqp to 2.5.1
|
||||||
|
- Add patch to fix build with py 3.8:
|
||||||
|
* python38.patch
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Jul 19 10:45:25 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
|
Fri Jul 19 10:45:25 UTC 2019 - Tomáš Chvátal <tchvatal@suse.com>
|
||||||
|
|
||||||
|
@ -18,19 +18,20 @@
|
|||||||
|
|
||||||
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
|
%{?!python_module:%define python_module() python-%{**} python3-%{**}}
|
||||||
Name: python-kombu
|
Name: python-kombu
|
||||||
Version: 4.6.3
|
Version: 4.6.4
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: AMQP Messaging Framework for Python
|
Summary: AMQP Messaging Framework for Python
|
||||||
License: BSD-3-Clause
|
License: BSD-3-Clause
|
||||||
Group: Development/Languages/Python
|
Group: Development/Languages/Python
|
||||||
URL: https://github.com/celery/kombu
|
URL: https://github.com/celery/kombu
|
||||||
Source: https://files.pythonhosted.org/packages/source/k/kombu/kombu-%{version}.tar.gz
|
Source: https://files.pythonhosted.org/packages/source/k/kombu/kombu-%{version}.tar.gz
|
||||||
# Test requirements:
|
Patch0: python38.patch
|
||||||
BuildRequires: %{python_module PyYAML}
|
BuildRequires: %{python_module PyYAML}
|
||||||
BuildRequires: %{python_module Pyro4}
|
BuildRequires: %{python_module Pyro4}
|
||||||
BuildRequires: %{python_module amqp >= 2.5.0}
|
BuildRequires: %{python_module amqp >= 2.5.1}
|
||||||
BuildRequires: %{python_module boto3}
|
BuildRequires: %{python_module boto3 >= 1.4.4}
|
||||||
BuildRequires: %{python_module case >= 1.5.2}
|
BuildRequires: %{python_module case >= 1.5.2}
|
||||||
|
BuildRequires: %{python_module importlib-metadata >= 0.18}
|
||||||
BuildRequires: %{python_module msgpack > 0.5.2}
|
BuildRequires: %{python_module msgpack > 0.5.2}
|
||||||
BuildRequires: %{python_module pytest}
|
BuildRequires: %{python_module pytest}
|
||||||
BuildRequires: %{python_module pytz}
|
BuildRequires: %{python_module pytz}
|
||||||
@ -38,7 +39,8 @@ BuildRequires: %{python_module redis >= 3.2.0}
|
|||||||
BuildRequires: %{python_module setuptools >= 20.6.7}
|
BuildRequires: %{python_module setuptools >= 20.6.7}
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
BuildRequires: python-rpm-macros
|
BuildRequires: python-rpm-macros
|
||||||
Requires: python-amqp >= 2.5.0
|
Requires: python-amqp >= 2.5.1
|
||||||
|
Requires: python-importlib-metadata >= 0.18
|
||||||
Requires: python-setuptools
|
Requires: python-setuptools
|
||||||
Obsoletes: python-carrot
|
Obsoletes: python-carrot
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
@ -64,6 +66,7 @@ provide proven and tested solutions to common messaging problems.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n kombu-%{version}
|
%setup -q -n kombu-%{version}
|
||||||
|
%patch0 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%python_build
|
%python_build
|
||||||
|
36
python38.patch
Normal file
36
python38.patch
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
From c75039547a57036a627e067173a2b4c136350b66 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
|
||||||
|
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(-)
|
||||||
|
|
||||||
|
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 @@
|
||||||
|
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
|
||||||
|
|
||||||
|
diff --git a/requirements/default.txt b/requirements/default.txt
|
||||||
|
index 00e57cc09..e3ec1c894 100644
|
||||||
|
--- a/requirements/default.txt
|
||||||
|
+++ b/requirements/default.txt
|
||||||
|
@@ -1,2 +1,2 @@
|
||||||
|
amqp>=2.5.1,<3.0
|
||||||
|
-importlib-metadata>=0.18
|
||||||
|
+importlib-metadata>=0.18; python_version<"3.8"
|
Loading…
Reference in New Issue
Block a user