From df7362702aad0e2e06145042f26dcfc6e1cb6cab Mon Sep 17 00:00:00 2001 From: Zhao Chao Date: Mon, 16 Apr 2018 17:46:04 +0800 Subject: [PATCH] Cleanup testrepository and os-testr requirements We have migrated to stestr for a while, however the related requirements is not updated, this patch does the cleanup, also updates requirements for stestr. Change-Id: I9c8cf2f90ced2261293f91faefc3099740540fe7 Signed-off-by: Zhao Chao --- lower-constraints.txt | 4 +--- test-requirements.txt | 3 +-- tox.ini | 1 - 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/lower-constraints.txt b/lower-constraints.txt index cbce5ed2e7..d8ecb3285e 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -74,7 +74,6 @@ openstacksdk==0.12.0 os-api-ref==1.4.0 os-client-config==1.29.0 os-service-types==1.2.0 -os-testr==1.0.0 osc-lib==1.10.0 oslo.cache==1.29.0 oslo.concurrency==3.26.0 @@ -149,12 +148,11 @@ sqlalchemy-migrate==0.11.0 SQLAlchemy==1.0.10 sqlparse==0.2.4 statsd==3.2.2 -stestr==2.0.0 +stestr==1.1.0 stevedore==1.20.0 Tempita==0.5.2 tenacity==4.9.0 termcolor==1.1.0 -testrepository==0.0.18 testresources==2.0.1 testscenarios==0.5.0 testtools==2.2.0 diff --git a/test-requirements.txt b/test-requirements.txt index ceee40f692..32403d077d 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -18,13 +18,12 @@ proboscis>=1.2.5.3 # Apache-2.0 python-troveclient>=2.2.0 # Apache-2.0 mock>=2.0.0 # BSD testtools>=2.2.0 # MIT -testrepository>=0.0.18 # Apache-2.0/BSD pymongo!=3.1,>=3.0.2 # Apache-2.0 redis>=2.10.0 # MIT psycopg2>=2.6.2 # LGPL/ZPL cassandra-driver!=3.6.0,>=2.1.4 # Apache-2.0 couchdb>=0.8 # Apache-2.0 -os-testr>=1.0.0 # Apache-2.0 +stestr>=1.1.0 # Apache-2.0 doc8>=0.6.0 # Apache-2.0 astroid<1.4.0 # LGPLv2.1 # breaks pylint 1.4.4 pylint==1.4.5 # GPLv2 diff --git a/tox.ini b/tox.ini index 7b7945b7ab..803001aa71 100644 --- a/tox.ini +++ b/tox.ini @@ -17,7 +17,6 @@ install_command = pip install \ deps = -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = find ./trove -type f -name "*.pyc" -delete - rm -f .testrepository/times.dbm rm -f trove_test.sqlite stestr run --serial '{posargs}' stestr slowest