summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-11-20 22:46:34 +0000
committerGerrit Code Review <review@openstack.org>2014-11-20 22:46:34 +0000
commit8c478fb98690d848951c7d40a6ec44bf5522833c (patch)
tree2c36c3c8efbfe2a99d238cca4950e9e10a5d94dc
parent33636836794287165f4c154c17ff56220c7f43d2 (diff)
parentddd11df1960db8f72cef5dfea247558a1b9dbd80 (diff)
downloadoslo-db-8c478fb98690d848951c7d40a6ec44bf5522833c.tar.gz
Merge "Updated from global requirements"
-rw-r--r--test-requirements-py2.txt2
-rw-r--r--test-requirements-py3.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/test-requirements-py2.txt b/test-requirements-py2.txt
index 0cfa61e..ac5c18a 100644
--- a/test-requirements-py2.txt
+++ b/test-requirements-py2.txt
@@ -16,4 +16,4 @@ oslosphinx>=2.2.0 # Apache-2.0
oslotest>=1.2.0 # Apache-2.0
testrepository>=0.0.18
testscenarios>=0.4
-testtools>=0.9.36,!=1.2.0,!=1.4.0
+testtools>=0.9.36,!=1.2.0
diff --git a/test-requirements-py3.txt b/test-requirements-py3.txt
index d75b387..58b9a3d 100644
--- a/test-requirements-py3.txt
+++ b/test-requirements-py3.txt
@@ -15,7 +15,7 @@ oslosphinx>=2.2.0 # Apache-2.0
oslotest>=1.2.0 # Apache-2.0
testrepository>=0.0.18
testscenarios>=0.4
-testtools>=0.9.36,!=1.2.0,!=1.4.0
+testtools>=0.9.36,!=1.2.0
# TODO(harlowja): add in pymysql when able to...
# https://review.openstack.org/#/c/123737