summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-03-23 05:22:38 +0000
committerGerrit Code Review <review@openstack.org>2015-03-23 05:22:38 +0000
commit91cf1cef2e81f343327ad0af9318ffa7232c4f5b (patch)
treee1723bdca5bcc9567651baf1b5c2ac7d8af37dd1
parent8ca92f749eaa59c29f0140f152c913b559b906e0 (diff)
parent5397d9da18add2827a44b480251bae3bf520f54a (diff)
downloadpython-barbicanclient-91cf1cef2e81f343327ad0af9318ffa7232c4f5b.tar.gz
Merge "Updated from global requirements"
-rw-r--r--requirements.txt8
-rw-r--r--test-requirements.txt6
2 files changed, 7 insertions, 7 deletions
diff --git a/requirements.txt b/requirements.txt
index 420d3da..b125e91 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ argparse
requests>=2.2.0,!=2.4.0
six>=1.9.0
python-keystoneclient>=1.1.0
-cliff>=1.7.0 # Apache-2.0
-oslo.i18n>=1.3.0 # Apache-2.0
-oslo.serialization>=1.2.0 # Apache-2.0
-oslo.utils>=1.2.0 # Apache-2.0
+cliff>=1.10.0,<1.11.0 # Apache-2.0
+oslo.i18n>=1.5.0,<1.6.0 # Apache-2.0
+oslo.serialization>=1.4.0,<1.5.0 # Apache-2.0
+oslo.utils>=1.4.0,<1.5.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 92a1915..8cad4fb 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,13 +5,13 @@ coverage>=3.6
discover
hacking>=0.7.0
fixtures>=0.3.14
-requests-mock>=0.5.1 # Apache-2.0
+requests-mock>=0.6.0 # Apache-2.0
mock>=1.0
testrepository>=0.0.18
testtools>=0.9.36,!=1.2.0
-oslotest>=1.2.0
+oslotest>=1.5.1,<1.6.0 # Apache-2.0
nose
# Documentation build requirements
sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
-oslosphinx>=2.2.0 # Apache-2.0
+oslosphinx>=2.5.0,<2.6.0 # Apache-2.0