From b7447c78ec6b6fff43d420b8d88c5da3cb503b34 Mon Sep 17 00:00:00 2001 From: Goutham Pacha Ravi Date: Thu, 10 Dec 2020 22:27:34 -0800 Subject: [PATCH] [stable/victoria] Update requirements pip 20.3 brings in a strict dependency resolver which is enabled by default. This causes our lower-constraints tests to fail, because the requirement files were out of date from reality - they had conflicting requirements which previous versions of pip were ignoring. In this stable branch, we could just adjust a couple of direct dependencies that are too low: alembic>=0.8.10 --> alembic>=0.9.6 (Oct 2017 [3]) keystoneauth1>=3.4.0 --> keystoneauth1>=3.6.2 (May 2018 [4]) and a code linting dependency: hacking>=3.0.1,<3.1.0 --> hacking>=3.1.0,<3.2.0 (May 2020 [5]) Also adjust corresponding indirect dependencies and their minimum signalled versions. [1] http://pyfound.blogspot.com/2020/11/pip-20-3-new-resolver.html [2] https://pip.pypa.io/en/stable/user_guide/#changes-to-the-pip-dependency-resolver-in-20-3-2020 [3] https://pypi.org/project/alembic/0.9.6/ [4] https://pypi.org/project/keystoneauth1/3.6.2/ [5] https://pypi.org/project/hacking/3.1.0/ Change-Id: I2d7840219728ef5729a3be48b2e8f5873d51fec1 Signed-off-by: Goutham Pacha Ravi --- lower-constraints.txt | 11 ++++++----- requirements.txt | 4 ++-- test-requirements.txt | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/lower-constraints.txt b/lower-constraints.txt index cfbb8a8f97..c100e90a19 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -1,6 +1,6 @@ alabaster==0.7.10 -alembic==0.8.10 -amqp==2.2.2 +alembic==0.9.6 +amqp==2.4.0 appdirs==1.4.3 asn1crypto==0.24.0 bashate==0.5.1 @@ -13,7 +13,7 @@ cliff==2.11.0 cmd2==0.8.1 contextlib2==0.5.5 coverage==4.0 -cryptography==2.1.4 +cryptography==2.5.0 ddt==1.0.1 debtcollector==1.19.0 decorator==4.2.1 @@ -21,6 +21,7 @@ deprecation==2.0 docutils==0.14 dogpile.cache==0.6.5 dulwich==0.19.0 +enum34===1.1.6 enum-compat==0.0.2 eventlet==0.22.0 extras==1.0.0 @@ -37,14 +38,14 @@ Jinja2==2.10 jmespath==0.9.3 jsonpatch==1.21 jsonpointer==2.0 -keystoneauth1==3.4.0 +keystoneauth1==3.6.2 keystonemiddleware==4.17.0 kombu==4.3.0 linecache2==1.0.0 lxml==4.5.0 Mako==1.0.7 MarkupSafe==1.1.1 -mccabe==0.2.1 +mccabe==0.6.0 monotonic==1.4 mox3==0.25.0 msgpack==0.5.6 diff --git a/requirements.txt b/requirements.txt index 18943aa222..72d250e2d6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ # pbr should be first pbr!=2.1.0,>=2.0.0 # Apache-2.0 -alembic>=0.8.10 # MIT +alembic>=0.9.6 # MIT eventlet>=0.22.0,!=0.23.0,!=0.25.0 # MIT greenlet>=0.4.15 # MIT lxml>=4.5.0 # BSD @@ -30,7 +30,7 @@ Paste>=2.0.2 # MIT PasteDeploy>=1.5.0 # MIT pyparsing>=2.1.0 # MIT python-neutronclient>=6.7.0 # Apache-2.0 -keystoneauth1>=3.4.0 # Apache-2.0 +keystoneauth1>=3.6.2 # Apache-2.0 keystonemiddleware>=4.17.0 # Apache-2.0 requests>=2.14.2 # Apache-2.0 retrying!=1.3.0,>=1.2.3 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index aa31ff609f..55ccdfb14d 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,7 +3,7 @@ # process, which may cause wedges in the gate later. # hacking should be first -hacking>=3.0.1,<3.1.0 # Apache-2.0 +hacking>=3.1.0,<3.2.0 # Apache-2.0 bashate>=0.5.1 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0