From 0c3aff1ba1f0e836e3dd56de81b2ee560e11c179 Mon Sep 17 00:00:00 2001 From: Rick Bartra Date: Tue, 22 Sep 2020 15:41:55 -0400 Subject: [PATCH] Update pip package versions in preparation of pip 20.3 When pip is upgraded to 20.3, the pip dependency resolver is much more strict and will no longer install a combination of packages that is mutually inconsistent[0]. These changes account for the fact that Shipyard imports Armada, Drydock, Promenade, and Deckhand. Having said that, with pip 20.3, the pip packages amongst those projects cannot conflict. A follow-up change may be needed if more conflicts are found. [0] https://pip.pypa.io/en/latest/user_guide/#changes-to-the-pip-dependency-resolver-in-20-2-2020 Change-Id: Icd10a452a3b9f67b3431d75ba00e942fe42d7c22 --- requirements.txt | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/requirements.txt b/requirements.txt index f27c50f2..99cb6c28 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,17 +1,20 @@ +amqp<2.7,>=2.6.0 deepdiff==3.3.0 gitpython grpcio>=1.16.0 -jsonschema>=2.6.0 -keystoneauth1==2.21.0 -keystonemiddleware==4.9.1 +jsonschema>=3.0.1<4 +keystoneauth1>=3.18.0 +keystonemiddleware==5.3.0 +kombu<4.7,>=4.6.10 kubernetes>=11.0.0 Paste>=2.0.3 PasteDeploy>=1.5.2 protobuf>=3.4.0 -PyYAML==3.12 +pyyaml~=5.1 requests retry -prometheus_client==0.7.0 +setuptools>=40.4.3 +prometheus_client>=0.7.0 # API falcon @@ -21,15 +24,15 @@ uwsgi>=2.0.15 click>=6.7 # Oslo -oslo.cache>=1.5.0 # Apache-2.0 +oslo.cache>=1.38.1 # Apache-2.0 oslo.concurrency>=3.8.0 # Apache-2.0 -oslo.config!=4.3.0,!=4.4.0,>=4.0.0 # Apache-2.0 +oslo.config>=7.0.0 # Apache-2.0 oslo.context>=2.14.0 # Apache-2.0 oslo.db>=4.24.0 # Apache-2.0 oslo.i18n!=3.15.2,>=2.1.0 # Apache-2.0 -oslo.log>=3.22.0 # Apache-2.0 +oslo.log>=3.45.2 # Apache-2.0 oslo.messaging!=5.25.0,>=5.24.2 # Apache-2.0 oslo.middleware>=3.27.0 # Apache-2.0 oslo.policy>=1.23.0 # Apache-2.0 -oslo.serialization!=2.19.1,>=1.10.0 # Apache-2.0 -oslo.utils>=3.20.0 # Apache-2.0 +oslo.serialization==2.29.2 # Apache-2.0 +oslo.utils>=3.42.1 # Apache-2.0