summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-02-20 06:19:38 +0000
committerGerrit Code Review <review@openstack.org>2017-02-20 06:19:38 +0000
commit124caad93eeeb92f901aca5d899a434809c639a8 (patch)
tree1cc3e01cd6ec0db2d02c7e0fde18b1b0d09d9c6c
parent3ac8cdff3f849479d5c703689474692eb448abad (diff)
parent8221869f4e2e2bd71785eb1f12618fc4348116ff (diff)
Merge "Updated from global requirements"
-rw-r--r--requirements.txt4
-rw-r--r--test-requirements.txt4
2 files changed, 4 insertions, 4 deletions
diff --git a/requirements.txt b/requirements.txt
index 0d87ee9..a0cf3f8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@
4 4
5keystoneauth1>=2.18.0 # Apache-2.0 5keystoneauth1>=2.18.0 # Apache-2.0
6oslo.config!=3.18.0,>=3.14.0 # Apache-2.0 6oslo.config!=3.18.0,>=3.14.0 # Apache-2.0
7oslo.context>=2.9.0 # Apache-2.0 7oslo.context>=2.12.0 # Apache-2.0
8oslo.i18n>=2.1.0 # Apache-2.0 8oslo.i18n>=2.1.0 # Apache-2.0
9oslo.log>=3.11.0 # Apache-2.0 9oslo.log>=3.11.0 # Apache-2.0
10oslo.serialization>=1.10.0 # Apache-2.0 10oslo.serialization>=1.10.0 # Apache-2.0
@@ -13,6 +13,6 @@ pbr>=1.8 # Apache-2.0
13positional>=1.1.1 # Apache-2.0 13positional>=1.1.1 # Apache-2.0
14pycadf!=2.0.0,>=1.1.0 # Apache-2.0 14pycadf!=2.0.0,>=1.1.0 # Apache-2.0
15python-keystoneclient>=3.8.0 # Apache-2.0 15python-keystoneclient>=3.8.0 # Apache-2.0
16requests!=2.12.2,>=2.10.0 # Apache-2.0 16requests!=2.12.2,!=2.13.0,>=2.10.0 # Apache-2.0
17six>=1.9.0 # MIT 17six>=1.9.0 # MIT
18WebOb>=1.6.0 # MIT 18WebOb>=1.6.0 # MIT
diff --git a/test-requirements.txt b/test-requirements.txt
index 4ca9b84..da0df94 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,7 +6,7 @@ hacking<0.11,>=0.10.0
6flake8-docstrings==0.2.1.post1 # MIT 6flake8-docstrings==0.2.1.post1 # MIT
7 7
8coverage>=4.0 # Apache-2.0 8coverage>=4.0 # Apache-2.0
9docutils!=0.13.1,>=0.11 # OSI-Approved Open Source, Public Domain 9docutils>=0.11 # OSI-Approved Open Source, Public Domain
10fixtures>=3.0.0 # Apache-2.0/BSD 10fixtures>=3.0.0 # Apache-2.0/BSD
11mock>=2.0 # BSD 11mock>=2.0 # BSD
12pycrypto>=2.6 # Public Domain 12pycrypto>=2.6 # Public Domain
@@ -14,7 +14,7 @@ oslosphinx>=4.7.0 # Apache-2.0
14oslotest>=1.10.0 # Apache-2.0 14oslotest>=1.10.0 # Apache-2.0
15reno>=1.8.0 # Apache-2.0 15reno>=1.8.0 # Apache-2.0
16requests-mock>=1.1 # Apache-2.0 16requests-mock>=1.1 # Apache-2.0
17sphinx!=1.3b1,<1.4,>=1.2.1 # BSD 17sphinx>=1.5.1 # BSD
18stevedore>=1.17.1 # Apache-2.0 18stevedore>=1.17.1 # Apache-2.0
19testrepository>=0.0.18 # Apache-2.0/BSD 19testrepository>=0.0.18 # Apache-2.0/BSD
20testresources>=0.2.4 # Apache-2.0/BSD 20testresources>=0.2.4 # Apache-2.0/BSD