summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-10-18 22:30:06 +0000
committerGerrit Code Review <review@openstack.org>2018-10-18 22:30:06 +0000
commit59fbccf914dedb63c0ce2983d9e4997e7b3673f1 (patch)
treec9afcc003f8cd70ed818174d029979c724261be0
parent79d540ec35b714b2678adbe6f740af60edbcacc7 (diff)
parentaaab4d7161ad16929534569a6cf1d619f916ffba (diff)
Merge "Updated from global requirements"
-rw-r--r--requirements.txt10
-rw-r--r--test-requirements.txt8
2 files changed, 9 insertions, 9 deletions
diff --git a/requirements.txt b/requirements.txt
index 81935e0..b88d9c0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,11 +2,11 @@
2# of appearance. Changing the order has an impact on the overall integration 2# of appearance. Changing the order has an impact on the overall integration
3# process, which may cause wedges in the gate later. 3# process, which may cause wedges in the gate later.
4oslo.i18n>=3.15.3 # Apache-2.0 4oslo.i18n>=3.15.3 # Apache-2.0
5six>=1.9.0 # MIT 5six>=1.10.0 # MIT
6requests>=2.14.2 # Apache-2.0 6requests>=2.14.2 # Apache-2.0
7oslo.config>=4.6.0 # Apache-2.0 7oslo.config>=5.2.0 # Apache-2.0
8oslo.utils>=3.31.0 # Apache-2.0 8oslo.utils>=3.33.0 # Apache-2.0
9python-cinderclient>=3.2.0 # Apache-2.0 9python-cinderclient>=3.3.0 # Apache-2.0
10python-glanceclient>=2.8.0 # Apache-2.0 10python-glanceclient>=2.8.0 # Apache-2.0
11python-neutronclient>=6.3.0 # Apache-2.0 11python-neutronclient>=6.7.0 # Apache-2.0
12python-novaclient>=9.1.0 # Apache-2.0 12python-novaclient>=9.1.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index b169579..88cd8c3 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,13 +7,13 @@ fixtures>=3.0.0 # Apache-2.0/BSD
7hacking>=1.1.0 7hacking>=1.1.0
8flake8<2.7.0,>=2.6.0 # MIT 8flake8<2.7.0,>=2.6.0 # MIT
9mock>=2.0.0 # BSD 9mock>=2.0.0 # BSD
10python-subunit>=0.0.18 # Apache-2.0/BSD 10python-subunit>=1.0.0 # Apache-2.0/BSD
11testrepository>=0.0.18 # Apache-2.0/BSD 11testrepository>=0.0.18 # Apache-2.0/BSD
12testscenarios>=0.4 # Apache-2.0/BSD 12testscenarios>=0.4 # Apache-2.0/BSD
13testtools>=1.4.0 # MIT 13testtools>=2.2.0 # MIT
14requests-mock>=1.1.0 # Apache-2.0 14requests-mock>=1.2.0 # Apache-2.0
15 15
16sphinx>=1.6.2 # BSD 16sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
17oslosphinx>=4.7.0 # Apache-2.0 17oslosphinx>=4.7.0 # Apache-2.0
18beautifulsoup4>=4.6.0 # MIT 18beautifulsoup4>=4.6.0 # MIT
19pylint>=1.5.0 # GPLv2 19pylint>=1.5.0 # GPLv2