summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-18 22:10:37 +0000
committerGerrit Code Review <review@openstack.org>2016-08-18 22:10:37 +0000
commita28e281a912b42c2809a7338e215a6536b1facc2 (patch)
treea1a46f6eff9fbae35e78a73e01e0861f4a3ef420
parent20cd4eca59ea2b7af3858b0c8800b26a81717995 (diff)
parent51cbe414e3ea9da59c1cf0b34e96fd3cef52b514 (diff)
downloadpython-openstackclient-a28e281a912b42c2809a7338e215a6536b1facc2.tar.gz
Merge "update requirements and test requirements"
-rw-r--r--requirements.txt4
-rw-r--r--test-requirements.txt3
2 files changed, 3 insertions, 4 deletions
diff --git a/requirements.txt b/requirements.txt
index 5c840e27..3f8ec2d6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,14 +8,10 @@ Babel>=2.3.4 # BSD
cliff!=1.16.0,!=1.17.0,>=1.15.0 # Apache-2.0
keystoneauth1>=2.10.0 # Apache-2.0
openstacksdk>=0.9.0 # Apache-2.0
-os-client-config!=1.19.0,>=1.13.1 # Apache-2.0
osc-lib>=0.4.0 # Apache-2.0
-oslo.config>=3.14.0 # Apache-2.0
oslo.i18n>=2.1.0 # Apache-2.0
oslo.utils>=3.16.0 # Apache-2.0
python-glanceclient>=2.0.0 # Apache-2.0
python-keystoneclient!=1.8.0,!=2.1.0,>=1.7.0 # Apache-2.0
python-novaclient!=2.33.0,>=2.29.0 # Apache-2.0
python-cinderclient!=1.7.0,!=1.7.1,>=1.6.0 # Apache-2.0
-requests>=2.10.0 # Apache-2.0
-stevedore>=1.16.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 49bb4646..efd23655 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -9,8 +9,11 @@ mock>=2.0 # BSD
oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
oslotest>=1.10.0 # Apache-2.0
reno>=1.8.0 # Apache2
+requests>=2.10.0 # Apache-2.0
requests-mock>=1.0 # Apache-2.0
sphinx!=1.3b1,<1.3,>=1.2.1 # BSD
+stevedore>=1.16.0 # Apache-2.0
+os-client-config!=1.19.0,>=1.13.1 # Apache-2.0
os-testr>=0.7.0 # Apache-2.0
testrepository>=0.0.18 # Apache-2.0/BSD
testtools>=1.4.0 # MIT