From c0ee8848618620e9a3b28df46d754bf8595a918e Mon Sep 17 00:00:00 2001 From: Goutham Pacha Ravi Date: Thu, 10 Dec 2020 19:48:03 -0800 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: I5a31b561654aa368bb85a56f4dd38276cfdbb91a Signed-off-by: Goutham Pacha Ravi --- lower-constraints.txt | 106 +++++++++++++++++++++--------------------- requirements.txt | 72 ++++++++++++++-------------- test-requirements.txt | 20 ++++---- 3 files changed, 99 insertions(+), 99 deletions(-) diff --git a/lower-constraints.txt b/lower-constraints.txt index f92fa35306..abf5f0e7cd 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==1.4.2 +amqp==2.5.2 appdirs==1.4.3 asn1crypto==0.24.0 bashate==0.5.1 @@ -12,9 +12,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==2.5 +ddt==1.4.1 debtcollector==1.19.0 decorator==4.2.1 deprecation==2.0 @@ -22,33 +22,33 @@ docutils==0.14 dogpile.cache==0.6.5 dulwich==0.19.0 enum-compat==0.0.2 -eventlet==0.22.0 +eventlet==0.26.1 extras==1.0.0 fasteners==0.14.1 fixtures==3.0.0 future==0.16.0 futurist==1.6.0 -greenlet==0.4.15 +greenlet==0.4.16 idna==2.6 imagesize==1.0.0 ipaddress==1.0.17 -iso8601==0.1.11 +iso8601==0.1.12 Jinja2==2.10 jmespath==0.9.3 jsonpatch==1.21 jsonpointer==2.0 -keystoneauth1==3.4.0 -keystonemiddleware==4.17.0 -kombu==4.3.0 +keystoneauth1==4.2.1 +keystonemiddleware==9.1.0 +kombu==4.6.6 linecache2==1.0.0 -lxml==4.5.0 +lxml==4.5.2 Mako==1.0.7 MarkupSafe==1.1.1 monotonic==1.4 mox3==0.25.0 msgpack==0.5.6 munch==2.2.0 -netaddr==0.7.18 +netaddr==0.8.0 netifaces==0.10.6 openstacksdk==0.12.0 os-api-ref==1.4.0 @@ -56,27 +56,27 @@ os-client-config==1.29.0 os-service-types==1.2.0 osc-lib==1.10.0 oslo.cache==1.29.0 -oslo.concurrency==3.26.0 -oslo.config==5.2.0 -oslo.context==2.19.2 -oslo.db==5.1.1 -oslo.i18n==3.15.3 -oslo.log==4.3.0 -oslo.messaging==6.4.0 -oslo.middleware==3.31.0 -oslo.policy==1.30.0 -oslo.reports==1.18.0 -oslo.rootwrap==5.8.0 -oslo.serialization==2.18.0 -oslo.service==2.1.1 -oslo.upgradecheck==0.1.0 -oslo.utils==3.40.2 -oslotest==3.2.0 -packaging==17.1 -paramiko==2.7.1 -Paste==2.0.2 -PasteDeploy==1.5.0 -pbr==2.0.0 +oslo.concurrency==4.3.0 +oslo.config==8.3.2 +oslo.context==3.1.1 +oslo.db==8.4.0 +oslo.i18n==5.0.1 +oslo.log==4.4.0 +oslo.messaging==12.5.0 +oslo.middleware==4.1.1 +oslo.policy==3.5.0 +oslo.reports==2.2.0 +oslo.rootwrap==6.2.0 +oslo.serialization==4.0.1 +oslo.service==2.4.0 +oslo.upgradecheck==1.1.1 +oslo.utils==4.7.0 +oslotest==4.4.1 +packaging==20.4 +paramiko==2.7.2 +Paste==3.4.3 +PasteDeploy==2.1.0 +pbr==5.5.0 pika==0.10.0 pika-pool==0.1.3 prettytable==0.7.2 @@ -87,48 +87,48 @@ pycadf==2.7.0 pycparser==2.18 Pygments==2.2.0 pyinotify==0.9.6 -PyMySQL==0.8.0 +PyMySQL==0.10.0 PyNaCl==1.2.1 -pyparsing==2.1.0 +pyparsing==2.4.7 pyperclip==1.6.0 python-cinderclient==3.3.0 python-dateutil==2.7.0 python-editor==1.0.3 -python-glanceclient==2.15.0 -python-keystoneclient==3.15.0 +python-glanceclient==3.2.2 +python-keystoneclient==4.1.1 python-mimeparse==1.6.0 python-neutronclient==6.7.0 -python-novaclient==9.1.0 -python-subunit==1.2.0 +python-novaclient==17.2.1 +python-subunit==1.4.0 pytz==2018.3 -PyYAML==3.13 +PyYAML==5.1 repoze.lru==0.7 -requests==2.14.2 -requests-mock==1.2.0 +requests==2.23.0 +requests-mock==1.7.0 requestsexceptions==1.4.0 retrying==1.2.3 -rfc3986==1.1.0 -Routes==2.3.1 +rfc3986==1.2.0 +Routes==2.4.1 simplejson==3.13.2 -six==1.10.0 +six==1.15.0 snowballstemmer==1.2.1 -SQLAlchemy==1.0.10 +SQLAlchemy==1.3.1 sqlalchemy-migrate==0.11.0 sqlparse==0.2.4 statsd==3.2.2 -stestr==2.0.0 -stevedore==1.20.0 +stestr==3.0.1 +stevedore==3.2.2 Tempita==0.5.2 tenacity==6.0.0 testrepository==0.0.20 -testresources==2.0.0 +testresources==2.0.1 testscenarios==0.4 -testtools==2.2.0 -tooz==1.58.0 +testtools==2.4.0 +tooz==2.7.1 traceback2==1.4.0 unittest2==1.1.0 urllib3==1.22 vine==1.1.4 voluptuous==0.11.1 -WebOb==1.7.1 +WebOb==1.8.6 wrapt==1.10.11 diff --git a/requirements.txt b/requirements.txt index e9b226b821..c70afc3abc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,43 +3,43 @@ # process, which may cause wedges in the gate later. # pbr should be first -pbr!=2.1.0,>=2.0.0 # Apache-2.0 +pbr>=5.5.0 # Apache-2.0 -alembic>=0.8.10 # MIT -eventlet>=0.22.0,!=0.23.0,!=0.25.0 # MIT -greenlet>=0.4.15 # MIT -lxml>=4.5.0 # BSD -netaddr>=0.7.18 # BSD -oslo.config>=5.2.0 # Apache-2.0 -oslo.context>=2.19.2 # Apache-2.0 -oslo.db>=5.1.1 # Apache-2.0 -oslo.i18n>=3.15.3 # Apache-2.0 -oslo.log>=4.3.0 # Apache-2.0 -oslo.messaging>=6.4.0 # Apache-2.0 -oslo.middleware>=3.31.0 # Apache-2.0 -oslo.policy>=1.30.0 # Apache-2.0 -oslo.reports>=1.18.0 # Apache-2.0 -oslo.rootwrap>=5.8.0 # Apache-2.0 -oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0 -oslo.service>=2.1.1 # Apache-2.0 -oslo.upgradecheck>=0.1.0 # Apache-2.0 -oslo.utils>=3.40.2 # Apache-2.0 -oslo.concurrency>=3.26.0 # Apache-2.0 -paramiko>=2.7.1 # LGPLv2.1+ -Paste>=2.0.2 # MIT -PasteDeploy>=1.5.0 # MIT -pyparsing>=2.1.0 # MIT +alembic>=1.4.2 # MIT +eventlet>=0.26.1 # MIT +greenlet>=0.4.16 # MIT +lxml>=4.5.2 # BSD +netaddr>=0.8.0 # BSD +oslo.config>=8.3.2 # Apache-2.0 +oslo.context>=3.1.1 # Apache-2.0 +oslo.db>=8.4.0 # Apache-2.0 +oslo.i18n>=5.0.1 # Apache-2.0 +oslo.log>=4.4.0 # Apache-2.0 +oslo.messaging>=12.5.0 # Apache-2.0 +oslo.middleware>=4.1.1 # Apache-2.0 +oslo.policy>=3.5.0 # Apache-2.0 +oslo.reports>=2.2.0 # Apache-2.0 +oslo.rootwrap>=6.2.0 # Apache-2.0 +oslo.serialization>=4.0.1 # Apache-2.0 +oslo.service>=2.4.0 # Apache-2.0 +oslo.upgradecheck>=1.1.1 # Apache-2.0 +oslo.utils>=4.7.0 # Apache-2.0 +oslo.concurrency>=4.3.0 # Apache-2.0 +paramiko>=2.7.2 # LGPLv2.1+ +Paste>=3.4.3 # MIT +PasteDeploy>=2.1.0 # MIT +pyparsing>=2.4.7 # MIT python-neutronclient>=6.7.0 # Apache-2.0 -keystoneauth1>=3.4.0 # Apache-2.0 -keystonemiddleware>=4.17.0 # Apache-2.0 -requests>=2.14.2 # Apache-2.0 +keystoneauth1>=4.2.1 # Apache-2.0 +keystonemiddleware>=9.1.0 # Apache-2.0 +requests>=2.23.0 # Apache-2.0 retrying!=1.3.0,>=1.2.3 # Apache-2.0 -Routes>=2.3.1 # MIT -six>=1.10.0 # MIT -SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT -stevedore>=1.20.0 # Apache-2.0 -tooz>=1.58.0 # Apache-2.0 +Routes>=2.4.1 # MIT +six>=1.15.0 # MIT +SQLAlchemy>=1.3.1 # MIT +stevedore>=3.2.2 # Apache-2.0 +tooz>=2.7.1 # Apache-2.0 python-cinderclient!=4.0.0,>=3.3.0 # Apache-2.0 -python-novaclient>=9.1.0 # Apache-2.0 -python-glanceclient>=2.15.0 # Apache-2.0 -WebOb>=1.7.1 # MIT +python-novaclient>=17.2.1 # Apache-2.0 +python-glanceclient>=3.2.2 # Apache-2.0 +WebOb>=1.8.6 # MIT diff --git a/test-requirements.txt b/test-requirements.txt index aa31ff609f..434c9b7d6c 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,24 +3,24 @@ # 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 -ddt>=1.0.1 # MIT +coverage>=5.2.1 # Apache-2.0 +ddt>=1.4.1 # MIT fixtures>=3.0.0 # Apache-2.0/BSD -iso8601>=0.1.11 # MIT -oslotest>=3.2.0 # Apache-2.0 +iso8601>=0.1.12 # MIT +oslotest>=4.4.1 # Apache-2.0 # Do not remove 'PyMySQL' and 'psycopg2-binary' dependencies. They are used # by oslo_db lib for running MySQL and PostgreSQL DB migration tests. # See https://docs.openstack.org/oslo.db/latest/contributor/index.html#how-to-run-unit-tests -PyMySQL>=0.8.0 # MIT License +PyMySQL>=0.10.0 # MIT License psycopg2-binary>=2.8.5 # LGPL/ZPL -requests-mock>=1.2.0 # Apache-2.0 +requests-mock>=1.7.0 # Apache-2.0 os-api-ref>=1.4.0 # Apache-2.0 -stestr>=2.0.0 # Apache-2.0 -testresources>=2.0.0 # Apache-2.0/BSD +stestr>=3.0.1 # Apache-2.0 +testresources>=2.0.1 # Apache-2.0/BSD testscenarios>=0.4 # Apache-2.0/BSD -testtools>=2.2.0 # MIT +testtools>=2.4.0 # MIT