summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-08-14 01:36:36 +0000
committerGerrit Code Review <review@openstack.org>2015-08-14 01:36:36 +0000
commit3c6565235464fa724929b5abe8f2c32c001996bf (patch)
tree033ca81126feb00998b85970c854d5674f815cf4
parente9147ca0e04b610eaebdbe23d9eb7100c4a20819 (diff)
parent7c7f46a33d30a68b4e070fc5d1515f8a668f3b04 (diff)
downloadpython-swiftclient-3c6565235464fa724929b5abe8f2c32c001996bf.tar.gz
Merge "Update mock to get away from env markers"
-rw-r--r--test-requirements.txt3
1 files changed, 1 insertions, 2 deletions
diff --git a/test-requirements.txt b/test-requirements.txt
index 909cb04..7f7e405 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,8 +2,7 @@ hacking>=0.10.0,<0.11
coverage>=3.6
discover
-mock>=1.0;python_version!='2.6'
-mock==1.0.1;python_version=='2.6'
+mock>=1.2
oslosphinx
python-keystoneclient>=0.7.0
sphinx>=1.1.2,<1.2