!19 屏蔽kombu搭配redis使用时因高版本依赖检测而引起的服务异常问题

From: @rabbitali 
Reviewed-by: @cherry530 
Signed-off-by: @cherry530
This commit is contained in:
openeuler-ci-bot 2024-07-10 07:17:05 +00:00 committed by Gitee
commit df675f987a
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 39 additions and 2 deletions

View File

@ -0,0 +1,33 @@
From b1fd781018c9006b252d4eb19178b288f6c9d10a Mon Sep 17 00:00:00 2001
From: rabbitali <wenxin32@foxmail.com>
Date: Fri, 5 Jul 2024 15:15:19 +0800
Subject: [PATCH 1/1] removed the strong dependency detection of redis version
---
kombu/transport/redis.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/kombu/transport/redis.py b/kombu/transport/redis.py
index 6797854..611e56d 100644
--- a/kombu/transport/redis.py
+++ b/kombu/transport/redis.py
@@ -3,6 +3,7 @@
import os
import numbers
import socket
+import warnings
from bisect import bisect
from collections import namedtuple
@@ -979,7 +980,7 @@ class Channel(virtual.Channel):
def _get_client(self):
if redis.VERSION < (3, 2, 0):
- raise VersionMismatch(
+ warnings.warn(
'Redis transport requires redis-py versions 3.2.0 or later. '
'You have {0.__version__}'.format(redis))
return redis.StrictRedis
--
2.33.0

View File

@ -1,11 +1,12 @@
%global _empty_manifest_terminate_build 0 %global _empty_manifest_terminate_build 0
Name: python-kombu Name: python-kombu
Version: 5.0.2 Version: 5.0.2
Release: 1 Release: 2
Summary: Messaging library for Python. Summary: Messaging library for Python.
License: BSD License: BSD
URL: https://github.com/celery/kombu URL: https://github.com/celery/kombu
Source0: https://files.pythonhosted.org/packages/3b/3a/f880f867bb2690aee3454aa31143d441fee79c5c5ce4d9537114675447b3/kombu-5.0.2.tar.gz Source0: https://files.pythonhosted.org/packages/3b/3a/f880f867bb2690aee3454aa31143d441fee79c5c5ce4d9537114675447b3/kombu-5.0.2.tar.gz
Patch0001: 0001-removed-the-strong-dependency-detection-of-redis-ver.patch
BuildArch: noarch BuildArch: noarch
Requires: python3-amqp Requires: python3-amqp
@ -58,7 +59,7 @@ The aim of Kombu is to make messaging in Python as easy as possible by providing
AMQP is the Advanced Message Queuing Protocol, an open standard protocol for message orientation, queuing, routing, reliability and security, for which the RabbitMQ messaging server is the most popular implementation. AMQP is the Advanced Message Queuing Protocol, an open standard protocol for message orientation, queuing, routing, reliability and security, for which the RabbitMQ messaging server is the most popular implementation.
%prep %prep
%autosetup -n kombu-5.0.2 %autosetup -n kombu-5.0.2 -p1
%build %build
%py3_build %py3_build
@ -98,5 +99,8 @@ mv %{buildroot}/doclist.lst .
%{_docdir}/* %{_docdir}/*
%changelog %changelog
* Wed Jul 10 2024 wenxin <wenxin32@foxmail.com> - 5.0.2-2
- Removed redis version strong dependency detection and changed it to alarm information reminder
* Mon Dec 28 2020 Python_Bot <Python_Bot@openeuler.org> * Mon Dec 28 2020 Python_Bot <Python_Bot@openeuler.org>
- Package Spec generated - Package Spec generated