summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-08-17 07:35:09 +0000
committerGerrit Code Review <review@openstack.org>2018-08-17 07:35:09 +0000
commit3c83ccaac9431b6ede1872819180890c09aeb2c5 (patch)
tree3566285fb9ff8f4641bba9d701d79b3cd25a22bf
parent77f7031710a062f07e5258574020bab614c43867 (diff)
parent9fafc1f291226b710fabc3352b8e4bdc86dd0f2e (diff)
Merge "Updated from global requirements"1.1.0
-rw-r--r--requirements.txt5
-rw-r--r--test-requirements.txt2
2 files changed, 4 insertions, 3 deletions
diff --git a/requirements.txt b/requirements.txt
index 4d451d5..5dfc711 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,8 +9,9 @@
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<2.0,>=1.8 # BSD 12Django<2,>=1.11;python_version<'3.0' # BSD
13django-babel>=0.5.1 # BSD 13Django<2.1,>=1.11;python_version>='3.0' # BSD
14django-babel>=0.6.2 # BSD
14django-compressor>=2.0 # MIT 15django-compressor>=2.0 # MIT
15django-pyscss>=2.0.2 # BSD License (2 clause) 16django-pyscss>=2.0.2 # BSD License (2 clause)
16python-karborclient>=0.6.0 # Apache-2.0 17python-karborclient>=0.6.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 82d06d7..c93c9b2 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -21,7 +21,7 @@ nosexcover>=1.0.10 # 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.6,>=1.6.2 # BSD 24sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
25testtools>=2.2.0 # MIT 25testtools>=2.2.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