From c818e85381ce9211d016c2b1179de854bcbfff58 Mon Sep 17 00:00:00 2001
From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Sat, 16 Jan 2016 03:31:16 +0000
Subject: [PATCH] Updated from global requirements

Change-Id: I7d219ca0d0c774888d2146fa7a8549457c1e57ba
---
 requirements.txt      | 28 ++++++++++++++--------------
 test-requirements.txt | 26 +++++++++++++-------------
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 7f1e2d8fd..3eafef190 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -2,7 +2,7 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-pbr>=1.6
+pbr>=1.6 # Apache-2.0
 
 futurist>=0.6.0 # Apache-2.0
 oslo.config>=3.2.0 # Apache-2.0
@@ -16,35 +16,35 @@ stevedore>=1.5.0 # Apache-2.0
 debtcollector>=0.3.0 # Apache-2.0
 
 # for jsonutils
-six>=1.9.0
+six>=1.9.0 # MIT
 cachetools>=1.0.0 # MIT License
 
 
 # FIXME(markmc): remove this when the drivers no longer
 # import eventlet
 
-eventlet>=0.17.4
-greenlet>=0.3.2
+eventlet>=0.17.4 # MIT
+greenlet>=0.3.2 # MIT
 
-WebOb>=1.2.3
+WebOb>=1.2.3 # MIT
 
 # for the routing notifier
-PyYAML>=3.1.0
+PyYAML>=3.1.0 # MIT
 
 # rabbit driver is the default
 # we set the amqp version to ensure heartbeat works
-amqp>=1.4.0
-kombu>=3.0.7
-pika>=0.10.0
-pika-pool>=0.1.3
+amqp>=1.4.0 # LGPL
+kombu>=3.0.7 # BSD
+pika>=0.10.0 # BSD
+pika-pool>=0.1.3 # BSD
 
 # used by pika and zmq drivers
-futures>=3.0;python_version=='2.7' or python_version=='2.6'
-retrying>=1.2.3,!=1.3.0 # Apache-2.0
+futures>=3.0;python_version=='2.7' or python_version=='2.6' # BSD
+retrying!=1.3.0,>=1.2.3 # Apache-2.0
 
 # middleware
 oslo.middleware>=3.0.0 # Apache-2.0
 
 # needed by the aioeventlet executor
-aioeventlet>=0.4
-trollius>=1.0
+aioeventlet>=0.4 # Apache-2.0
+trollius>=1.0 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 309fbe766..2b62be5ee 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,19 +5,19 @@
 # Hacking already pins down pep8, pyflakes and flake8
 hacking<0.11,>=0.10.0
 
-discover
-fixtures>=1.3.1
-mock>=1.2
-mox3>=0.7.0
-python-subunit>=0.0.18
-testrepository>=0.0.18
-testscenarios>=0.4
-testtools>=1.4.0
+discover # BSD
+fixtures>=1.3.1 # Apache-2.0/BSD
+mock>=1.2 # BSD
+mox3>=0.7.0 # Apache-2.0
+python-subunit>=0.0.18 # Apache-2.0/BSD
+testrepository>=0.0.18 # Apache-2.0/BSD
+testscenarios>=0.4 # Apache-2.0/BSD
+testtools>=1.4.0 # MIT
 oslotest>=1.10.0 # Apache-2.0
 
 # for test_matchmaker_redis
-redis>=2.10.0
-retrying>=1.2.3,!=1.3.0 # Apache-2.0
+redis>=2.10.0 # MIT
+retrying!=1.3.0,>=1.2.3 # Apache-2.0
 
 # for test_impl_zmq
 pyzmq>=14.3.1 # LGPL+BSD
@@ -28,10 +28,10 @@ kafka-python>=0.9.2 # Apache-2.0
 # when we can require tox>= 1.4, this can go into tox.ini:
 #  [testenv:cover]
 #  deps = {[testenv]deps} coverage
-coverage>=3.6
+coverage>=3.6 # Apache-2.0
 
 # this is required for the docs build jobs
-sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
 oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
 
 # AMQP 1.0 support depends on the Qpid Proton AMQP 1.0
@@ -39,4 +39,4 @@ oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
 pyngus>=2.0.0 # Apache-2.0
 
 # Bandit security code scanner
-bandit>=0.13.2
+bandit>=0.13.2 # Apache-2.0