summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitreview1
-rw-r--r--requirements.txt3
-rw-r--r--test-requirements-py2.txt1
-rw-r--r--test-requirements-py3.txt1
4 files changed, 4 insertions, 2 deletions
diff --git a/.gitreview b/.gitreview
index aee0565..3a3bb84 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
host=review.openstack.org
port=29418
project=openstack/oslo.db.git
+defaultbranch=stable/kilo
diff --git a/requirements.txt b/requirements.txt
index 966a892..2ccf36f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,5 +13,8 @@ SQLAlchemy<=0.9.99,>=0.9.7
sqlalchemy-migrate!=0.9.8,<0.10.0,>=0.9.5
stevedore<1.4.0,>=1.3.0 # Apache-2.0
six>=1.9.0
+# NOTE(mriedem): testtools is capped so it must be installed
+# before testscenarios, which requires testtools uncapped.
+testtools>=0.9.36,!=1.2.0,<2.0.0
testresources>=0.2.4
testscenarios>=0.4
diff --git a/test-requirements-py2.txt b/test-requirements-py2.txt
index 48a4296..f94b6c6 100644
--- a/test-requirements-py2.txt
+++ b/test-requirements-py2.txt
@@ -16,5 +16,4 @@ sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
oslosphinx<2.6.0,>=2.5.0 # Apache-2.0
oslotest<1.6.0,>=1.5.1 # Apache-2.0
testrepository>=0.0.18
-testtools!=1.2.0,>=0.9.36
tempest-lib<0.5.0,>=0.4.0
diff --git a/test-requirements-py3.txt b/test-requirements-py3.txt
index db478e6..93435d0 100644
--- a/test-requirements-py3.txt
+++ b/test-requirements-py3.txt
@@ -15,5 +15,4 @@ oslosphinx<2.6.0,>=2.5.0 # Apache-2.0
oslotest<1.6.0,>=1.5.1 # Apache-2.0
PyMySQL>=0.6.2 # MIT License
testrepository>=0.0.18
-testtools!=1.2.0,>=0.9.36
tempest-lib<0.5.0,>=0.4.0