From 275c132fd5c9383b2540d3a7834013fd32cca90a Mon Sep 17 00:00:00 2001 From: Dina Saparbaeva Date: Thu, 17 Dec 2020 00:26:20 +0600 Subject: [PATCH] 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. Let's catch up package versions to newer ones that are supported in the python runtimes that the Wallaby release will be deployed to. [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 Change-Id: I6ddd11535e9365e8b55a6829967b886c2253d6f0 --- lower-constraints.txt | 52 +++++++++++++++++++++---------------------- requirements.txt | 8 +++---- test-requirements.txt | 12 +++++----- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/lower-constraints.txt b/lower-constraints.txt index 1c0d9d11..3da1807e 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -8,9 +8,9 @@ chardet==3.0.4 cliff==2.11.0 cmd2==0.8.1 contextlib2==0.5.5 -coverage==4.0 -cryptography==2.1.4 -ddt==1.0.1 +coverage==5.2.1 +cryptography==3.0 +ddt==1.4.1 debtcollector==1.19.0 decorator==4.2.1 deprecation==2.0 @@ -29,44 +29,44 @@ futurist==1.6.0 horizon==18.3.1 idna==2.6 imagesize==1.0.0 -iso8601==0.1.11 +iso8601==0.1.12 Jinja2==2.10 jmespath==0.9.3 jsonpatch==1.21 jsonpointer==2.0 jsonschema==2.6.0 -keystoneauth1==3.4.0 +keystoneauth1==4.2.1 linecache2==1.0.0 -MarkupSafe==1.0 -mccabe==0.2.1 +MarkupSafe==1.1 +mccabe==0.6.0 monotonic==1.4 -mox3==0.20.0 +mox3==0.25.0 msgpack==0.5.6 munch==2.2.0 -netaddr==0.7.19 +netaddr==0.8.0 netifaces==0.10.6 openstacksdk==0.12.0 os-client-config==1.29.0 os-service-types==1.2.0 osc-lib==1.10.0 -oslo.concurrency==3.26.0 +oslo.concurrency==4.3.0 oslo.config==5.2.0 -oslo.context==2.20.0 +oslo.context==3.1.1 oslo.i18n==3.20.0 oslo.log==3.37.0 oslo.policy==1.34.0 -oslo.serialization==2.25.0 -oslo.utils==3.33.0 +oslo.serialization==4.0.1 +oslo.utils==4.7.0 osprofiler==2.3.0 -packaging==17.1 -pbr==2.0.0 +packaging==20.4 +pbr==5.5.0 Pint==0.8.1 prettytable==0.7.2 pycparser==2.18 Pygments==2.2.0 pyinotify==0.9.6 pymongo==3.6.1 -pyOpenSSL==17.5.0 +pyOpenSSL==19.1.0 pyparsing==2.2.0 pyperclip==1.6.0 pyScss==1.3.7 @@ -74,34 +74,34 @@ pytest==5.3.5 python-cinderclient==5.0.0 python-dateutil==2.7.0 python-glanceclient==2.9.1 -python-keystoneclient==3.22.0 +python-keystoneclient==4.1.1 python-manilaclient==1.29.0 python-mimeparse==1.6.0 python-neutronclient==6.7.0 python-novaclient==10.1.0 -python-subunit==1.0.0 +python-subunit==1.4.0 python-swiftclient==3.5.0 pytz==2018.3 PyYAML==3.13 rcssmin==1.0.6 -requests==2.18.4 +requests==2.23.0 requestsexceptions==1.4.0 -rfc3986==1.1.0 +rfc3986==1.2.0 rjsmin==1.0.12 selenium==2.50.1 semantic-version==2.6.0 simplejson==3.13.2 -six==1.10.0 +six==1.15.0 snowballstemmer==1.2.1 -stevedore==1.28.0 -testrepository==0.0.18 +stevedore==3.2.2 +testrepository==0.0.20 testscenarios==0.4 -testtools==2.2.0 +testtools==2.4.0 traceback2==1.4.0 unittest2==1.1.0 urllib3==1.22 warlock==1.3.0 -WebOb==1.7.4 +WebOb==1.8.6 wrapt==1.10.11 XStatic==1.0.1 XStatic-Angular==1.5.8.0 @@ -123,7 +123,7 @@ XStatic-jquery-ui==1.12.0.1 XStatic-JQuery.quicksearch==2.0.3.1 XStatic-JQuery.TableSorter==2.14.5.1 XStatic-JSEncrypt==2.3.1.1 -XStatic-mdi==1.4.57.0 +XStatic-mdi==1.6.50.2 XStatic-objectpath==1.2.1.0 XStatic-Rickshaw==1.5.0.0 XStatic-roboto-fontface==0.5.0.0 diff --git a/requirements.txt b/requirements.txt index d1d4e399..e4f3f4ba 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,12 +2,12 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -pbr!=2.1.0,>=2.0.0 # Apache-2.0 +pbr>=5.5.0 # Apache-2.0 # Horizon Core Requirements django-compressor>=2.0 # MIT -iso8601>=0.1.11 # MIT -oslo.utils>=3.33.0 # Apache-2.0 -python-keystoneclient>=3.22.0 # Apache-2.0 +iso8601>=0.1.12 # MIT +oslo.utils>=4.7.0 # Apache-2.0 +python-keystoneclient>=4.1.1 # Apache-2.0 python-manilaclient>=1.29.0 # Apache-2.0 horizon>=17.1.0 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index 398eec02..a5a507c2 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,14 +2,14 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -hacking>=3.0.1,<3.1.0 # Apache-2.0 -coverage!=4.4,>=4.0 # Apache-2.0 -ddt>=1.0.1 # MIT -python-subunit>=1.0.0 # Apache-2.0/BSD +hacking>=3.1.0,<3.2.0 # Apache-2.0 +coverage>=5.2.1 # Apache-2.0 +ddt>=1.4.1 # MIT +python-subunit>=1.4.0 # Apache-2.0/BSD pytest>=5.3.5 # MIT -testrepository>=0.0.18 # Apache-2.0/BSD +testrepository>=0.0.20 # Apache-2.0/BSD testscenarios>=0.4 # Apache-2.0/BSD -testtools>=2.2.0 # MIT +testtools>=2.4.0 # MIT # integration tests requirements selenium>=2.50.1 # Apache-2.0 xvfbwrapper>=0.1.3 #license: MIT