summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-07-23 06:39:07 +0000
committerGerrit Code Review <review@openstack.org>2017-07-23 06:39:07 +0000
commit62e2b2d80e62831680e9e267294b7fda6fb7bde4 (patch)
tree4255743687ba91b616ed6ec6b00c902292903427
parent8b6318cfc1d8604282f97169232b3814bfa7914b (diff)
parent85239f49282c6a96200684d89dd48c8d5334ddd9 (diff)
Merge "Updated from global requirements"
-rw-r--r--requirements.txt2
-rw-r--r--test-requirements.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/requirements.txt b/requirements.txt
index a005faa..45dbd03 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@
9# PBR should always appear first 9# PBR should always appear first
10pbr!=2.1.0,>=2.0.0 # Apache-2.0 10pbr!=2.1.0,>=2.0.0 # Apache-2.0
11Babel!=2.4.0,>=2.3.4 # BSD 11Babel!=2.4.0,>=2.3.4 # BSD
12Django<1.10,>=1.8 # BSD 12Django<2.0,>=1.8 # BSD
13django-babel>=0.5.1 # BSD 13django-babel>=0.5.1 # BSD
14django-compressor>=2.0 # MIT 14django-compressor>=2.0 # MIT
15django-openstack-auth>=3.1.0 # Apache-2.0 15django-openstack-auth>=3.1.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 82edaa2..e0bbf3a 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -21,7 +21,7 @@ nosexcover # BSD
21openstack.nose-plugin>=0.7 # Apache-2.0 21openstack.nose-plugin>=0.7 # Apache-2.0
22oslosphinx>=4.7.0 # Apache-2.0 22oslosphinx>=4.7.0 # Apache-2.0
23selenium>=2.50.1 # Apache-2.0 23selenium>=2.50.1 # Apache-2.0
24sphinx!=1.6.1,>=1.5.1 # BSD 24sphinx>=1.6.2 # BSD
25testtools>=1.4.0 # MIT 25testtools>=1.4.0 # MIT
26# This also needs xvfb library installed on your OS 26# This also needs xvfb library installed on your OS
27xvfbwrapper>=0.1.3 #license: MIT 27xvfbwrapper>=0.1.3 #license: MIT