summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-02-16 21:20:24 +0000
committerGerrit Code Review <review@openstack.org>2018-02-16 21:20:24 +0000
commit03c0ccbbc2725f50f5385c015d01ca1acc958c05 (patch)
treeb7eb1adf2a7bcf50e8148ee9f4205294f0bcc557
parentc9ca869d7c378093d01b91175b5944ced4a70495 (diff)
parent4a3499325bf19ad1fe09857ded995af78e5315fe (diff)
Merge "Updated from global requirements"
-rw-r--r--requirements.txt8
-rw-r--r--test-requirements.txt8
2 files changed, 8 insertions, 8 deletions
diff --git a/requirements.txt b/requirements.txt
index 2a5900f..0ca66c0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,14 +8,14 @@ eventlet!=0.18.3,!=0.20.1,<0.21.0,>=0.18.2 # MIT
8Flask!=0.11,<1.0,>=0.10 # BSD 8Flask!=0.11,<1.0,>=0.10 # BSD
9SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT 9SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT
10oslo.cache>=1.26.0 # Apache-2.0 10oslo.cache>=1.26.0 # Apache-2.0
11oslo.config>=4.6.0 # Apache-2.0 11oslo.config>=5.1.0 # Apache-2.0
12oslo.messaging>=5.29.0 # Apache-2.0 12oslo.messaging>=5.29.0 # Apache-2.0
13oslo.log>=3.30.0 # Apache-2.0 13oslo.log>=3.36.0 # Apache-2.0
14oslo.db>=4.27.0 # Apache-2.0 14oslo.db>=4.27.0 # Apache-2.0
15oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0 15oslo.serialization!=2.19.1,>=2.18.0 # Apache-2.0
16keystoneauth1>=3.2.0 # Apache-2.0 16keystoneauth1>=3.3.0 # Apache-2.0
17python-keystoneclient>=3.8.0 # Apache-2.0 17python-keystoneclient>=3.8.0 # Apache-2.0
18requests>=2.14.2 # Apache-2.0 18requests>=2.14.2 # Apache-2.0
19six>=1.9.0 # MIT 19six>=1.10.0 # MIT
20stevedore>=1.20.0 # Apache-2.0 20stevedore>=1.20.0 # Apache-2.0
21Routes>=2.3.1 # MIT 21Routes>=2.3.1 # MIT
diff --git a/test-requirements.txt b/test-requirements.txt
index 8f3209d..9217502 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,7 +3,7 @@
3# process, which may cause wedges in the gate later. 3# process, which may cause wedges in the gate later.
4 4
5os-testr>=1.0.0 # Apache-2.0 5os-testr>=1.0.0 # Apache-2.0
6testtools>=1.4.0 # MIT 6testtools>=2.2.0 # MIT
7flake8<2.6.0,>=2.5.4 # MIT 7flake8<2.6.0,>=2.5.4 # MIT
8mock>=2.0.0 # BSD 8mock>=2.0.0 # BSD
9requests-mock>=1.1.0 # Apache-2.0 9requests-mock>=1.1.0 # Apache-2.0
@@ -12,10 +12,10 @@ bashate>=0.5.1 # Apache-2.0
12hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 12hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
13 13
14coverage!=4.4,>=4.0 # Apache-2.0 14coverage!=4.4,>=4.0 # Apache-2.0
15python-subunit>=0.0.18 # Apache-2.0/BSD 15python-subunit>=1.0.0 # Apache-2.0/BSD
16sphinx>=1.6.2 # BSD 16sphinx!=1.6.6,>=1.6.2 # BSD
17oslosphinx>=4.7.0 # Apache-2.0 17oslosphinx>=4.7.0 # Apache-2.0
18oslotest>=1.10.0 # Apache-2.0 18oslotest>=3.2.0 # Apache-2.0
19testrepository>=0.0.18 # Apache-2.0/BSD 19testrepository>=0.0.18 # Apache-2.0/BSD
20testscenarios>=0.4 # Apache-2.0/BSD 20testscenarios>=0.4 # Apache-2.0/BSD
21 21