From a2fc5fa677b80a7a1a6c63275286dd93a7dbdf4d Mon Sep 17 00:00:00 2001 From: Sean McGinnis Date: Mon, 4 May 2020 14:01:42 -0500 Subject: [PATCH] Raise lower constraints to meet our minimums Python 3.6 is now our minimum Python runtime version to support. This raises several lower constraints versions to the minimum that supports 3.6 or later. This also raises greenlets and lxml versions to account for updates to cpython changes that break installation when installing under 3.7. Depends-on: https://review.opendev.org/725412 Change-Id: I34f7346a183e662f862a79df54a28d608a93c6c8 Signed-off-by: Sean McGinnis --- lower-constraints.txt | 53 +++++++++++++++++++++---------------------- requirements.txt | 28 +++++++++++------------ test-requirements.txt | 2 +- 3 files changed, 41 insertions(+), 42 deletions(-) diff --git a/lower-constraints.txt b/lower-constraints.txt index a2c41aafc8b..eb9067fc17c 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -1,24 +1,24 @@ alabaster==0.7.10 -alembic==0.9.8 +alembic==1.0.0 amqp==2.2.2 appdirs==1.4.3 asn1crypto==0.24.0 -automaton==1.14.0 +automaton==1.17.0 bandit==1.6.0 bcrypt==3.1.4 cachetools==2.0.1 -castellan==0.16.0 +castellan==1.3.0 certifi==2018.1.18 cffi==1.11.5 chardet==3.0.4 -cliff==2.11.0 +cliff==2.15.0 cmd2==0.8.1 contextlib2==0.5.5 -coverage==4.0 +coverage==4.1 cryptography==2.1 cursive==0.2.1 ddt==1.2.1 -debtcollector==1.19.0 +debtcollector==1.22.0 decorator==3.4.0 defusedxml==0.5.0 doc8==0.6.0 @@ -35,32 +35,31 @@ flake8-import-order==0.18.1 flake8-logging-format==0.6.0 future==0.16.0 futurist==1.6.0 -gitdb2==2.0.3 +gitdb2==2.0.5 GitPython==2.1.8 google-api-python-client==1.4.2 -greenlet==0.4.10 +greenlet==0.4.13 hacking==3.0.1 httplib2==0.9.1 idna==2.6 imagesize==1.0.0 -iso8601==0.1.11 +iso8601==0.1.12 Jinja2==2.10 jsonpatch==1.21 jsonpointer==2.0 jsonschema==2.6.0 -keystoneauth1==3.7.0 +keystoneauth1==3.14.0 keystonemiddleware==4.21.0 kombu==4.1.0 linecache2==1.0.0 -lxml==3.4.1 +lxml==4.2.0 Mako==1.0.7 -MarkupSafe==1.0 +MarkupSafe==1.1.0 mccabe==0.2.1 mock==2.0.0 -monotonic==1.4 msgpack==0.5.6 netaddr==0.7.19 -netifaces==0.10.6 +netifaces==0.10.7 networkx==1.11 oauth2client==1.5.0 openstackdocstheme==2.0.0 @@ -70,11 +69,11 @@ os-client-config==1.29.0 os-win==3.0.0 oslo.cache==1.29.0 oslo.concurrency==3.26.0 -oslo.config==5.2.0 -oslo.context==2.19.2 +oslo.config==6.11.0 +oslo.context==2.23.0 oslo.db==4.35.0 -oslo.i18n==3.15.3 -oslo.log==3.36.0 +oslo.i18n==3.24.0 +oslo.log==3.44.0 oslo.messaging==6.4.0 oslo.middleware==3.31.0 oslo.policy==1.44.1 @@ -91,7 +90,7 @@ osprofiler==1.4.0 paramiko==2.4.0 Paste==2.0.2 PasteDeploy==1.5.0 -pbr==2.0.0 +pbr==5.4.1 pep8==1.5.7 pika-pool==0.1.3 pika==0.10.0 @@ -101,18 +100,18 @@ pyasn1-modules==0.2.1 pyasn1==0.4.2 pycadf==2.7.0 pycodestyle==2.5.0 -pycparser==2.18 +pycparser==2.19 pyflakes==0.8.1 Pygments==2.2.0 pyinotify==0.9.6 PyMySQL==0.7.6 PyNaCl==1.2.1 pyOpenSSL==17.5.0 -pyparsing==2.1.0 +pyparsing==2.2.1 pyperclip==1.6.0 -python-barbicanclient==4.5.2 +python-barbicanclient==4.9.0 python-dateutil==2.7.0 -python-editor==1.0.3 +python-editor==1.0.4 python-glanceclient==2.15.0 python-keystoneclient==3.15.0 python-mimeparse==1.6.0 @@ -121,13 +120,13 @@ python-subunit==1.2.0 python-swiftclient==3.2.0 pytz==2013.6 pyudev==0.21.0 -PyYAML==3.12 +PyYAML==5.1 reno==2.5.0 repoze.lru==0.7 requests==2.14.2 requestsexceptions==1.4.0 retrying==1.2.3 -rfc3986==1.1.0 +rfc3986==1.3.0 Routes==2.3.1 rsa==3.4.2 rtslib-fb==2.1.65 @@ -138,12 +137,12 @@ Sphinx==2.0.0 sphinx-feature-classification==0.1.0 sphinxcontrib-websupport==1.0.1 sqlalchemy-migrate==0.11.0 -SQLAlchemy==1.0.10 +SQLAlchemy==1.3.0 SQLAlchemy-Utils==0.36.1 sqlparse==0.2.4 statsd==3.2.2 stestr==2.2.0 -stevedore==1.20.0 +stevedore==1.31.0 tabulate==0.8.5 taskflow==3.2.0 Tempita==0.5.2 diff --git a/requirements.txt b/requirements.txt index be0251685d2..68a87569e9c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,23 +2,23 @@ # 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!=2.1.0,>=5.4.1 # Apache-2.0 decorator>=3.4.0 # BSD defusedxml>=0.5.0 # PSF eventlet!=0.23.0,!=0.25.0,>=0.22.0 # MIT -greenlet>=0.4.10 # MIT +greenlet>=0.4.13 # MIT httplib2>=0.9.1 # MIT -iso8601>=0.1.11 # MIT +iso8601>=0.1.12 # MIT jsonschema>=2.6.0 # MIT -keystoneauth1>=3.7.0 # Apache-2.0 +keystoneauth1>=3.14.0 # Apache-2.0 keystonemiddleware>=4.21.0 # Apache-2.0 -lxml!=3.7.0,>=3.4.1 # BSD +lxml>=4.2.0 # BSD oauth2client!=4.0.0,>=1.5.0 # Apache-2.0 -oslo.config>=5.2.0 # Apache-2.0 +oslo.config>=6.11.0 # Apache-2.0 oslo.concurrency>=3.26.0 # Apache-2.0 -oslo.context>=2.19.2 # Apache-2.0 +oslo.context>=2.23.0 # Apache-2.0 oslo.db>=4.35.0 # Apache-2.0 -oslo.log>=3.36.0 # Apache-2.0 +oslo.log>=3.44.0 # Apache-2.0 oslo.messaging>=6.4.0 # Apache-2.0 oslo.middleware>=3.31.0 # Apache-2.0 oslo.policy>=1.44.1 # Apache-2.0 @@ -35,8 +35,8 @@ paramiko>=2.4.0 # LGPLv2.1+ Paste>=2.0.2 # MIT PasteDeploy>=1.5.0 # MIT psutil>=3.2.2 # BSD -pyparsing>=2.1.0 # MIT -python-barbicanclient>=4.5.2 # Apache-2.0 +pyparsing>=2.2.1 # MIT +python-barbicanclient>=4.9.0 # Apache-2.0 python-glanceclient>=2.15.0 # Apache-2.0 python-keystoneclient>=3.15.0 # Apache-2.0 python-novaclient>=9.1.0 # Apache-2.0 @@ -48,17 +48,17 @@ Routes>=2.3.1 # MIT taskflow>=3.2.0 # Apache-2.0 rtslib-fb>=2.1.65 # Apache-2.0 six>=1.10.0 # MIT -SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT +SQLAlchemy>=1.3.0 # MIT sqlalchemy-migrate>=0.11.0 # Apache-2.0 -stevedore>=1.20.0 # Apache-2.0 +stevedore>=1.31.0 # Apache-2.0 tabulate>=0.8.5 # MIT WebOb>=1.7.1 # MIT -oslo.i18n>=3.15.3 # Apache-2.0 +oslo.i18n>=3.24.0 # Apache-2.0 oslo.vmware>=2.35.0 # Apache-2.0 os-brick>=2.2.0 # Apache-2.0 os-win>=3.0.0 # Apache-2.0 tooz>=1.58.0 # Apache-2.0 google-api-python-client>=1.4.2 # Apache-2.0 -castellan>=0.16.0 # Apache-2.0 +castellan>=1.3.0 # Apache-2.0 cryptography>=2.1 # BSD/Apache-2.0 cursive>=0.2.1 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index 5f74a53fde7..de1f87ab743 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -8,7 +8,7 @@ flake8-import-order # LGPLv3 flake8-logging-format>=0.6.0 # Apache-2.0 stestr!=2.3.0,>=2.2.0 # Apache-2.0 -coverage!=4.4,>=4.0 # Apache-2.0 +coverage!=4.4,>=4.1 # Apache-2.0 ddt>=1.2.1 # MIT fixtures>=3.0.0 # Apache-2.0/BSD oslotest>=3.2.0 # Apache-2.0