From bd0b247a37859658ca8df34c9ca4afb345a4d282 Mon Sep 17 00:00:00 2001
From: Tony Breeds <tony@bakeyournoodle.com>
Date: Mon, 5 Dec 2016 12:52:56 +1100
Subject: [PATCH] Soft update from global-requirements

Currently the last item that blazar uses that isn't in g-r is lockfile
which means migrating to oslo.db.

Change-Id: If416bae3c0ee76cc5567ff460db150a7fb8c2262
---
 requirements.txt      | 41 +++++++++++++++++++++--------------------
 setup.py              |  0
 test-requirements.txt | 28 ++++++++++++++--------------
 3 files changed, 35 insertions(+), 34 deletions(-)
 mode change 100755 => 100644 setup.py

diff --git a/requirements.txt b/requirements.txt
index bedccdc7..1215023f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,25 +3,26 @@
 # process, which may cause wedges in the gate later.
 pbr>=1.8 # Apache-2.0
 
-alembic>=0.8.0
-Babel>=1.3
-eventlet>=0.17.4
-Flask>=0.10,<1.0
-iso8601>=0.1.9
-keystonemiddleware>=4.0.0,!=4.1.0  # Apache-2.0
-kombu>=3.0.7
+alembic>=0.8.4 # MIT
+Babel>=2.3.4 # BSD
+eventlet!=0.18.3,>=0.18.2 # MIT
+Flask!=0.11,<1.0,>=0.10 # BSD
+iso8601>=0.1.11 # MIT
+keystonemiddleware!=4.5.0,>=4.2.0 # Apache-2.0
+kombu!=4.0.0,!=4.0.1,>=3.0.25 # BSD
 oslo.concurrency>=3.8.0 # Apache-2.0
-oslo.config>=2.3.0  # Apache-2.0
-oslo.messaging>=1.16.0,!=1.17.0,!=1.17.1 # Apache-2.0
-oslo.serialization>=1.10.0              # Apache-2.0
-python-novaclient>=2.26.0
-netaddr>=0.7.12,!=0.7.16
-python-keystoneclient>=1.6.0
-pecan>=1.0.0
-sqlalchemy-migrate>=0.9.6
-Routes>=1.12.3,!=2.0
-SQLAlchemy>=0.9.9,<1.1.0
-stevedore>=1.5.0  # Apache-2.0
-WebOb>=1.2.3
-WSME>=0.6
+oslo.config!=3.18.0,>=3.14.0 # Apache-2.0
+oslo.messaging>=5.14.0 # Apache-2.0
+oslo.serialization>=1.10.0 # Apache-2.0
+python-novaclient!=2.33.0,>=2.29.0 # Apache-2.0
+netaddr!=0.7.16,>=0.7.13 # BSD
+python-keystoneclient>=3.8.0 # Apache-2.0
+pecan!=1.0.2,!=1.0.3,!=1.0.4,!=1.2,>=1.0.0 # BSD
+sqlalchemy-migrate>=0.9.6 # Apache-2.0
+Routes!=2.0,!=2.1,!=2.3.0,>=1.12.3;python_version=='2.7' # MIT
+Routes!=2.0,!=2.3.0,>=1.12.3;python_version!='2.7' # MIT
+SQLAlchemy<1.1.0,>=1.0.10 # MIT
+stevedore>=1.17.1 # Apache-2.0
+WebOb>=1.6.0 # MIT
+WSME>=0.8 # MIT
 
diff --git a/setup.py b/setup.py
old mode 100755
new mode 100644
diff --git a/test-requirements.txt b/test-requirements.txt
index ad9c8440..5c552f79 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,20 +1,20 @@
 # 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.
-hacking>=0.12.0,!=0.13.0,<0.14 # Apache-2.0
+hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
 
-nose
-mock>=1.0
-mox>=0.5.3
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
-sphinxcontrib-httpdomain
+nose # LGPL
+mock>=2.0 # BSD
+mox>=0.5.3 # Apache-2.0
+sphinx!=1.3b1,<1.4,>=1.2.1 # BSD
+sphinxcontrib-httpdomain # BSD
 lockfile>=0.8
 
-discover
-fixtures>=0.3.14
-testrepository>=0.0.18
-testscenarios>=0.4
-testtools>=1.4.0
-coverage>=3.6
-pylint==1.4.4  # GNU GPL v2
-sphinxcontrib-pecanwsme>=0.8
+discover # BSD
+fixtures>=3.0.0 # Apache-2.0/BSD
+testrepository>=0.0.18 # Apache-2.0/BSD
+testscenarios>=0.4 # Apache-2.0/BSD
+testtools>=1.4.0 # MIT
+coverage>=4.0 # Apache-2.0
+pylint==1.4.5 # GPLv2
+sphinxcontrib-pecanwsme>=0.8 # Apache-2.0