From a90970da156158f82e3f45b4d70329f6fd4cddba Mon Sep 17 00:00:00 2001 From: Sean McGinnis Date: Mon, 3 Jun 2019 15:08:33 -0500 Subject: [PATCH] Clean up test requirements testresources and testscenarios were added in ec40c3b6 to address an issue with oslo.db not pulling in its own requirements. tempest was used when we had the tempest plugin in the main cinder repo and was not removed when the plugin switched to its own repo. os-api-ref is used for building the API reference and was a leftover from before doc/requirements.txt was added. Change-Id: Ib4fc7cb6199c9581c19d34ea43a2d15ec9003f13 Signed-off-by: Sean McGinnis --- lower-constraints.txt | 5 +---- requirements.txt | 2 +- test-requirements.txt | 7 +++---- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/lower-constraints.txt b/lower-constraints.txt index 35c705e3397..a0b96330401 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -73,7 +73,7 @@ oslo.cache==1.29.0 oslo.concurrency==3.26.0 oslo.config==5.2.0 oslo.context==2.19.2 -oslo.db==4.27.0 +oslo.db==4.35.0 oslo.i18n==3.15.3 oslo.log==3.36.0 oslo.messaging==6.4.0 @@ -147,12 +147,9 @@ stevedore==1.20.0 suds-jurko==0.6 tabulate==0.8.5 taskflow==3.2.0 -tempest==17.1.0 Tempita==0.5.2 tenacity==4.9.0 testrepository==0.0.20 -testresources==2.0.0 -testscenarios==0.4 testtools==2.2.0 tooz==1.58.0 traceback2==1.4.0 diff --git a/requirements.txt b/requirements.txt index 2bc737b0482..6ab8df8fb70 100644 --- a/requirements.txt +++ b/requirements.txt @@ -19,7 +19,7 @@ oauth2client!=4.0.0,>=1.5.0 # Apache-2.0 oslo.config>=5.2.0 # Apache-2.0 oslo.concurrency>=3.26.0 # Apache-2.0 oslo.context>=2.19.2 # Apache-2.0 -oslo.db>=4.27.0 # Apache-2.0 +oslo.db>=4.35.0 # Apache-2.0 oslo.log>=3.36.0 # Apache-2.0 oslo.messaging>=6.4.0 # Apache-2.0 oslo.middleware>=3.31.0 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index d886ac6e389..8ecdcbd8c64 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -6,21 +6,20 @@ hacking>=2.0.0 # Apache-2.0 flake8-import-order # LGPLv3 +stestr>=2.2.0 # Apache-2.0 coverage!=4.4,>=4.0 # Apache-2.0 ddt>=1.2.1 # MIT fixtures>=3.0.0 # Apache-2.0/BSD -os-api-ref>=1.4.0 # Apache-2.0 oslotest>=3.2.0 # Apache-2.0 pycodestyle==2.5.0 # MIT License PyMySQL>=0.7.6 # MIT License psycopg2>=2.7 # LGPL/ZPL testtools>=2.2.0 # MIT -testresources>=2.0.0 # Apache-2.0/BSD -testscenarios>=0.4 # Apache-2.0/BSD oslo.versionedobjects[fixtures]>=1.31.2 # Apache-2.0 -tempest>=17.1.0 # Apache-2.0 + # bandit is not included in upper-constraints, # so we need to pin it here to a known working version bandit==1.6.0 # Apache-2.0 doc8>=0.6.0 # Apache-2.0 reno>=2.5.0 # Apache-2.0 +Pygments>=2.2.0 # BSD license