summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-07-23 12:31:14 +0000
committerGerrit Code Review <review@openstack.org>2015-07-23 12:31:14 +0000
commit4e4261769fc397e4636cc9369c25b047a4ab86dd (patch)
tree97b07204c3d23216deeda22b5d68f1e9c15a5e73
parent1e561af6f12a2e2ffac05bb6d8c2572f54a80a2c (diff)
parentb71422527c9739c23ae75d1e2adcc6d220893dc8 (diff)
downloadoslo-middleware-4e4261769fc397e4636cc9369c25b047a4ab86dd.tar.gz
Merge "Updated from global requirements"
-rw-r--r--test-requirements.txt3
1 files changed, 1 insertions, 2 deletions
diff --git a/test-requirements.txt b/test-requirements.txt
index 5da284f..154e323 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -4,8 +4,7 @@
fixtures>=1.3.1
hacking<0.11,>=0.10.0
-mock!=1.1.4,>=1.1;python_version!='2.6'
-mock==1.0.1;python_version=='2.6'
+mock>=1.2
oslosphinx>=2.5.0 # Apache-2.0
oslotest>=1.7.0 # Apache-2.0
sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2