summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2017-11-26 05:30:47 +0000
committerGerrit Code Review <review@openstack.org>2017-11-26 05:30:47 +0000
commitd02469528e3864214a0c718a941eb7e9756138ed (patch)
treecbab9b52332b6186d043a80c6ef045b0cb006428
parent4bf3b3263870a4ec81cf372713cacec446b3ee84 (diff)
parent4371d219525b860d47dd8ce039c11de9d7bd0aab (diff)
Merge "Updated from global requirements"
-rw-r--r--requirements.txt2
-rw-r--r--test-requirements.txt6
2 files changed, 4 insertions, 4 deletions
diff --git a/requirements.txt b/requirements.txt
index 131d102..d17d834 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -48,7 +48,7 @@ python-novaclient>=9.1.0 # Apache-2.0
48python-keystoneclient>=3.8.0 # Apache-2.0 48python-keystoneclient>=3.8.0 # Apache-2.0
49requests>=2.14.2 # Apache-2.0 49requests>=2.14.2 # Apache-2.0
50setuptools!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,!=34.3.1,!=34.3.2,!=36.2.0,>=16.0 # PSF/ZPL 50setuptools!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,!=34.3.1,!=34.3.2,!=36.2.0,>=16.0 # PSF/ZPL
51six>=1.9.0 # MIT 51six>=1.10.0 # MIT
52stevedore>=1.20.0 # Apache-2.0 52stevedore>=1.20.0 # Apache-2.0
53taskflow>=2.7.0 # Apache-2.0 53taskflow>=2.7.0 # Apache-2.0
54cryptography!=2.0,>=1.9 # BSD/Apache-2.0 54cryptography!=2.0,>=1.9 # BSD/Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 1b3cb99..3bc25fe 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -17,12 +17,12 @@ oslotest>=1.10.0 # Apache-2.0
17osprofiler>=1.4.0 # Apache-2.0 17osprofiler>=1.4.0 # Apache-2.0
18os-api-ref>=1.4.0 # Apache-2.0 18os-api-ref>=1.4.0 # Apache-2.0
19os-testr>=1.0.0 # Apache-2.0 19os-testr>=1.0.0 # Apache-2.0
20python-subunit>=0.0.18 # Apache-2.0/BSD 20python-subunit>=1.0.0 # Apache-2.0/BSD
21pytz>=2013.6 # MIT 21pytz>=2013.6 # MIT
22sphinx>=1.6.2 # BSD 22sphinx>=1.6.2 # BSD
23tempest>=16.1.0 # Apache-2.0 23tempest>=17.1.0 # Apache-2.0
24testrepository>=0.0.18 # Apache-2.0/BSD 24testrepository>=0.0.18 # Apache-2.0/BSD
25testscenarios>=0.4 # Apache-2.0/BSD 25testscenarios>=0.4 # Apache-2.0/BSD
26testtools>=1.4.0 # MIT 26testtools>=2.2.0 # MIT
27# releasenotes 27# releasenotes
28reno>=2.5.0 # Apache-2.0 28reno>=2.5.0 # Apache-2.0