From c8d6fed762607fad8f73ade531cb06d6b919b096 Mon Sep 17 00:00:00 2001
From: Eyal <eyal.bar-ilan@nokia.com>
Date: Sun, 17 Nov 2019 12:59:06 +0200
Subject: [PATCH] Make sure minimum amqp is 2.5.2

amqp fixed a bug in 2.5.2 that is needed
also update kombu to support amqp 2.5.2

see
https://review.opendev.org/#/c/693704/
https://github.com/celery/py-amqp/commit/86cb254dceab75e0240b4fa6b97249de70036a4b


Change-Id: I4b72d8feb85c2b9b4657510c356cd21e22fe40c2
Closes-bug: #1852058
---
 lower-constraints.txt | 4 ++--
 requirements.txt      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lower-constraints.txt b/lower-constraints.txt
index 49feaa653..ff23649dc 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -1,5 +1,5 @@
 alabaster==0.7.10
-amqp==2.4.1
+amqp==2.5.2
 appdirs==1.3.0
 Babel==2.3.4
 bandit==1.1.0
@@ -28,7 +28,7 @@ imagesize==0.7.1
 iso8601==0.1.11
 Jinja2==2.10
 keystoneauth1==3.4.0
-kombu==4.6.1
+kombu==4.6.6
 linecache2==1.0.0
 MarkupSafe==1.0
 mccabe==0.2.1
diff --git a/requirements.txt b/requirements.txt
index 7ed73945c..6de25a490 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -25,8 +25,8 @@ PyYAML>=3.12 # MIT
 
 # rabbit driver is the default
 # we set the amqp version to ensure heartbeat works
-amqp>=2.4.1 # BSD
-kombu!=4.0.2,>=4.6.1 # BSD
+amqp>=2.5.2 # BSD
+kombu>=4.6.6 # BSD
 
 # middleware
 oslo.middleware>=3.31.0 # Apache-2.0