From 692606788c225c5188ce086b209901fe8cde7834 Mon Sep 17 00:00:00 2001 From: Yasufumi Ogawa Date: Tue, 8 Dec 2020 01:12:21 +0000 Subject: [PATCH] Fix a failure in tox lower-constraints To resolve a failure in checking lower-constraints on zuul [1], update depending packages as below. * glance-store 0.26.1 is not compatible with jsonschema 3.2.0. It was updated in [2] becuase jsonschema<3.2.0 doesn't support python3.8, so update to introduce glance-store>=2.4.0 for considering running in wallaby [3]. * requests 2.14.2 is not compatible with heat-translator 2.0.0. Although requests>=2.18.0 is required from heat-translator, use 2.20.0 for avoiding another dependency between kubernetes 11.0.0 which requires urllib3>=1.24.2. It's because requests 2.18.0 has dependency 'urllib3<1.22'. * tosca-parser 1.6.0 is not compatible with heat-translator 2.0.0. It is updated to 1.6.1 as required as tosca-parser>=1.6.1. * amqp>=2.4.0,<3.0 should be installed. Add it in `requirements.txt` and amqp==2.4.0 in `lower-constraints.txt`. * keystoneauth1>=3.18.0 and futurist>=2.1.0 are required for openstacksdk 0.44.0. * alembic>=0.9.6 is required for oslo-db 5.0.0. * eventlet!=0.18.3,!=0.20.1,>=0.18.2 is required for glance-store 2.4.0 and oslo-service 1.24.0. * Update tempest 17.1.0 requires jsonschema<3.0.0 to tempest 22.0.0 requires jsonschema>=3.2.0. * Update warlock from 1.3.0 to 1.3.3 for avoiding to download several versions of depending packages might be happend for a recent pip's update [4]. [1] https://zuul.opendev.org/t/openstack/build/fa38f87776d942248fb32ef7c8afe3e2 [2] commit 38a171cc "Cap jsonschema 3.2.0 as the minimal version" [3] https://releases.openstack.org/wallaby/index.html [4] http://pyfound.blogspot.com/2020/11/pip-20-3-new-resolver.html Change-Id: Ib4f9e19450a093c5ed9bd9c68ea7980f98980682 Signed-off-by: Yasufumi Ogawa --- lower-constraints.txt | 20 ++++++++++---------- requirements.txt | 11 ++++++----- test-requirements.txt | 2 +- 3 files changed, 17 insertions(+), 16 deletions(-) diff --git a/lower-constraints.txt b/lower-constraints.txt index d4491d05f..c939eaeb4 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 anyjson==0.3.3 appdirs==1.4.3 asn1crypto==0.24.0 @@ -25,13 +25,13 @@ docutils==0.14 dogpile.cache==0.6.5 dulwich==0.19.0 enum-compat==0.0.2 -eventlet==0.22.0 +eventlet==0.18.2 extras==1.0.0 fasteners==0.14.1 fixtures==3.0.0 future==0.16.0 -futurist==1.6.0 -glance-store==0.26.1 +futurist==2.1.0 +glance-store==2.4.0 google-auth==1.4.1 greenlet==0.4.15 heat-translator==2.0.0 @@ -44,7 +44,7 @@ jmespath==0.9.3 jsonpatch==1.21 jsonpointer==2.0 jsonschema==3.2.0 -keystoneauth1==3.15.0 +keystoneauth1==3.18.0 keystonemiddleware==4.17.0 kombu==4.3.0 kubernetes==11.0.0 @@ -118,7 +118,7 @@ pytz==2018.3 PyYAML==5.1 repoze.lru==0.7 requests-oauthlib==0.8.0 -requests==2.14.2 +requests==2.20.0 requests-mock==1.2.0 requestsexceptions==1.4.0 restructuredtext-lint==1.1.3 @@ -135,21 +135,21 @@ sqlparse==0.2.4 statsd==3.2.2 stestr==2.0.0 stevedore==1.20.0 -tempest==17.1.0 +tempest==22.0.0 Tempita==0.5.2 tenacity==4.12.0 testresources==2.0.1 testscenarios==0.5.0 testtools==2.2.0 tooz==1.58.0 -tosca-parser==1.6.0 +tosca-parser==1.6.1 traceback2==1.4.0 unittest2==1.1.0 urllib3==1.24.2 vine==1.1.4 voluptuous==0.11.1 waitress==1.1.0 -warlock==1.3.0 +warlock==1.3.3 WebOb==1.7.1 websocket-client==0.47.0 WebTest==2.0.27 diff --git a/requirements.txt b/requirements.txt index 1cb0d74a4..1ad248c83 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,9 +6,10 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0 Paste>=2.0.2 # MIT PasteDeploy>=1.5.0 # MIT Routes>=2.3.1 # MIT +amqp>=2.4.0 anyjson>=0.3.3 # BSD -eventlet!=0.23.0,!=0.25.0,>=0.22.0 # MIT -requests>=2.14.2 # Apache-2.0 +eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT +requests>=2.20.0 # Apache-2.0 jsonschema>=3.2.0 # MIT keystonemiddleware>=4.17.0 # Apache-2.0 kombu>=4.3.0 # BSD @@ -18,7 +19,7 @@ sqlalchemy-filters>=0.10.0 WebOb>=1.7.1 # MIT python-heatclient>=1.10.0 # Apache-2.0 python-keystoneclient>=3.8.0 # Apache-2.0 -alembic>=0.8.10 # MIT +alembic>=0.9.6 # MIT stevedore>=1.20.0 # Apache-2.0 oslo.concurrency>=3.26.0 # Apache-2.0 oslo.config>=5.2.0 # Apache-2.0 @@ -39,7 +40,7 @@ openstacksdk>=0.44.0 # Apache-2.0 python-neutronclient>=6.7.0 # Apache-2.0 python-novaclient>=9.1.0 # Apache-2.0 rfc3986>=1.1.0 # Apache-2.0 -tosca-parser>=1.6.0 # Apache-2.0 +tosca-parser>=1.6.1 # Apache-2.0 heat-translator>=2.0.0 # Apache-2.0 cryptography>=2.7 # BSD/Apache-2.0 paramiko>=2.7.1 # LGPLv2.1+ @@ -53,4 +54,4 @@ tooz>=1.58.0 # Apache-2.0 PyYAML>=5.1 # MIT # Glance Store -glance-store>=0.26.1 # Apache-2.0 +glance-store>=2.4.0 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index d541b968f..d97bbfb70 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -13,7 +13,7 @@ python-subunit>=1.0.0 # Apache-2.0/BSD python-tackerclient>=0.8.0 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0 stestr>=2.0.0 # Apache-2.0 -tempest>=17.1.0 # Apache-2.0 +tempest>=22.0.0 # Apache-2.0 testtools>=2.2.0 # MIT WebTest>=2.0.27 # MIT python-barbicanclient>=4.5.2 # Apache-2.0