summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenStack Proposal Bot <openstack-infra@lists.openstack.org>2016-01-19 13:46:44 +0000
committerOpenStack Proposal Bot <openstack-infra@lists.openstack.org>2016-01-19 13:46:44 +0000
commitb525627ea2c928adf05b7e13f74fc746343a06a9 (patch)
tree229690aee477f877f668dc0fc45717ab7a0c5c81
parent47ce93c09f207ac233b9b8ca875c23f49b160133 (diff)
downloaddjango_openstack_auth-b525627ea2c928adf05b7e13f74fc746343a06a9.tar.gz
Updated from global requirements
Change-Id: I149eeb5c750e011be505ac910888c6ffb937b79e
-rw-r--r--requirements.txt10
-rw-r--r--test-requirements.txt12
2 files changed, 11 insertions, 11 deletions
diff --git a/requirements.txt b/requirements.txt
index 295b8d9..029bf0c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,10 +1,10 @@
# The order of packages is significant, because pip processes them in the order
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
-pbr>=1.6
-Django<1.9,>=1.8
+pbr>=1.6 # Apache-2.0
+Django<1.9,>=1.8 # BSD
oslo.config>=3.2.0 # Apache-2.0
oslo.policy>=0.5.0 # Apache-2.0
-python-keystoneclient!=1.8.0,>=1.6.0
-keystoneauth1>=2.1.0
-six>=1.9.0
+python-keystoneclient!=1.8.0,!=2.1.0,>=1.6.0 # Apache-2.0
+keystoneauth1>=2.1.0 # Apache-2.0
+six>=1.9.0 # MIT
diff --git a/test-requirements.txt b/test-requirements.txt
index 80cbd10..133922c 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,10 +2,10 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
hacking<0.11,>=0.10.0
-Babel>=1.3
-coverage>=3.6
-mock>=1.2
-mox3>=0.7.0
-sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
+Babel>=1.3 # BSD
+coverage>=3.6 # Apache-2.0
+mock>=1.2 # BSD
+mox3>=0.7.0 # Apache-2.0
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
-testscenarios>=0.4
+testscenarios>=0.4 # Apache-2.0/BSD