From 9103b5439dd4e28c9e3341a1434c8a1705502a28 Mon Sep 17 00:00:00 2001 From: Renat Akhmerov Date: Tue, 1 Oct 2019 17:46:56 +0700 Subject: [PATCH] Add the explicit dependency from kombu * The explicit dependency from kombu forces the right version of amqp to be downloaded. Otherwise the "docs" job fails with a version conflict because it downloads amqp 2.5.2 but the upper constraints allow only 2.5.1. This is rather a workaround that unblocks CI until https://review.opendev.org/#/c/681382/ is merged Change-Id: I990d125e86943c019dc1b60070cb67c4f75787c0 --- lower-constraints.txt | 2 +- requirements.txt | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lower-constraints.txt b/lower-constraints.txt index 00c38498f..be69e9429 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -44,7 +44,7 @@ jsonschema==2.6.0 kazoo==2.2 keystoneauth1==3.4.0 keystonemiddleware==4.18.0 -kombu==4.0.0 +kombu==4.6.1 linecache2==1.0.0 logutils==0.3.5 Mako==0.4.0 diff --git a/requirements.txt b/requirements.txt index 167cc70fe..22ff08163 100644 --- a/requirements.txt +++ b/requirements.txt @@ -13,6 +13,7 @@ gnocchiclient>=3.3.1 # Apache-2.0 Jinja2>=2.10 # BSD License (3 clause) #jsonschema>=2.6.0 # MIT keystonemiddleware>=4.18.0 # Apache-2.0 +kombu!=4.0.2,>=4.6.1 # BSD mistral-lib>=1.2.0 # Apache-2.0 networkx<2.3,>=1.10;python_version<'3.0' # BSD networkx>=2.3;python_version>='3.4' # BSD