From 212570df161a1e8d2cce9d1e2996c7c93ae0be13 Mon Sep 17 00:00:00 2001 From: Ghanshyam Mann Date: Sat, 1 Aug 2020 18:07:12 -0500 Subject: [PATCH] [goal] Migrate testing to ubuntu focal As per victoria cycle testing runtime and community goal[1] we need to migrate upstream CI/CD to Ubuntu Focal(20.04). Fixing: - bug#1886298 Bump the lower constraints for required deps which added python3.8 support in their later version. Story: #2007865 Task: #40207 Closes-Bug: #1886298 [1] https://governance.openstack.org/tc/goals/selected/victoria/migrate-ci-cd-jobs-to-ubuntu-focal.h> Change-Id: I18419ce93363fbf2eed174e81ed212ddae216b8c --- lower-constraints.txt | 12 ++++++------ requirements.txt | 2 +- setup.cfg | 4 ++-- test-requirements.txt | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lower-constraints.txt b/lower-constraints.txt index 607a27b01..df953e940 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -16,7 +16,7 @@ fasteners==0.7.0 fixtures==3.0.0 flake8==2.2.4 futurist==1.2.0 -greenlet==0.4.10 +greenlet==0.4.15 hacking==0.10.0 imagesize==0.7.1 iso8601==0.1.11 @@ -24,10 +24,10 @@ Jinja2==2.10 jsonschema==3.2.0 kazoo==2.6.0 keystoneauth1==3.4.0 -kombu==4.0.0 +kombu==4.3.0 linecache2==1.0.0 Mako==0.4.0 -MarkupSafe==1.0 +MarkupSafe==1.1.1 mccabe==0.2.1 mock==2.0.0 monotonic==0.6 @@ -44,7 +44,7 @@ oslotest==3.2.0 pbr==2.0.0 pep8==1.5.7 prettytable==0.7.2 -psycopg2==2.7.0 +psycopg2==2.8.0 pydot==1.2.4 pydotplus==2.0.2 pyflakes==0.8.1 @@ -55,7 +55,7 @@ python-editor==1.0.3 python-mimeparse==1.6.0 python-subunit==1.0.0 pytz==2013.6 -PyYAML==3.12 +PyYAML==3.13 redis==2.10.0 requests==2.14.2 requestsexceptions==1.2.0 @@ -65,7 +65,7 @@ snowballstemmer==1.2.1 SQLAlchemy-Utils==0.30.11 SQLAlchemy==1.0.10 stevedore==1.20.0 -tenacity==4.4.0 +tenacity==6.0.0 stestr==2.0.0 testscenarios==0.4 testtools==2.2.0 diff --git a/requirements.txt b/requirements.txt index 15ae60b31..65979f174 100644 --- a/requirements.txt +++ b/requirements.txt @@ -31,7 +31,7 @@ automaton>=1.9.0 # Apache-2.0 # For common utilities oslo.utils>=3.33.0 # Apache-2.0 oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0 -tenacity>=4.4.0 # Apache-2.0 +tenacity>=6.0.0 # Apache-2.0 # For lru caches and such cachetools>=2.0.0 # MIT License diff --git a/setup.cfg b/setup.cfg index 6f813495c..b3931e3b4 100644 --- a/setup.cfg +++ b/setup.cfg @@ -63,7 +63,7 @@ zookeeper = redis = redis>=2.10.0 # MIT workers = - kombu!=4.0.2,>=4.0.0 # BSD + kombu>=4.3.0 # BSD eventlet = eventlet!=0.18.3,!=0.20.1,!=0.21.0,>=0.18.2 # MIT database = @@ -71,7 +71,7 @@ database = alembic>=0.8.10 # MIT SQLAlchemy-Utils>=0.30.11 # BSD License PyMySQL>=0.7.6 # MIT License - psycopg2>=2.7.0 # LGPL/ZPL + psycopg2>=2.8.0 # LGPL/ZPL test = pydotplus>=2.0.2 # MIT License hacking<0.11,>=0.10.0 diff --git a/test-requirements.txt b/test-requirements.txt index 7ad3713ef..a3ad90d97 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -10,7 +10,7 @@ zake>=0.1.6 # Apache-2.0 redis>=2.10.0 # MIT # workers -kombu!=4.0.2,>=4.0.0 # BSD +kombu>=4.3.0 # BSD # eventlet eventlet!=0.18.3,!=0.20.1,!=0.21.0,>=0.18.2 # MIT @@ -20,7 +20,7 @@ SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT alembic>=0.8.10 # MIT SQLAlchemy-Utils>=0.30.11 # BSD License PyMySQL>=0.7.6 # MIT License -psycopg2>=2.7.0 # LGPL/ZPL +psycopg2>=2.8.0 # LGPL/ZPL # test pydotplus>=2.0.2 # MIT License