Updated from global requirements

Change-Id: Ia6f12d87f376841faebcab42ac70a72f6f222985

requirements.txt

@@ -2,9 +2,9 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-Babel>=1.3
-oslo.i18n>=2.1.0          # Apache-2.0
-oslo.utils>=3.4.0         # Apache-2.0
-pbr>=1.6
-python-keystoneclient>=1.6.0,!=1.8.0,!=2.1.0
-six>=1.9.0
+Babel>=1.3 # BSD
+oslo.i18n>=2.1.0 # Apache-2.0
+oslo.utils>=3.4.0 # Apache-2.0
+pbr>=1.6 # Apache-2.0
+python-keystoneclient!=1.8.0,!=2.1.0,>=1.6.0 # Apache-2.0
+six>=1.9.0 # MIT

setup.py

@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -26,5 +25,5 @@ except ImportError:
     pass
 
 setuptools.setup(
-    setup_requires=['pbr'],
+    setup_requires=['pbr>=1.8'],
     pbr=True)

test-requirements.txt

@@ -2,17 +2,17 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-coverage>=3.6
-discover
-hacking>=0.10.2,<0.11
-mock>=1.2
-oslosphinx>=2.5.0,!=3.4.0  # Apache-2.0
-oslotest>=1.10.0  # Apache-2.0
-python-subunit>=0.0.18
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
-testrepository>=0.0.18
-testscenarios>=0.4
-testtools>=1.4.0
+coverage>=3.6 # Apache-2.0
+discover # BSD
+hacking<0.11,>=0.10.2
+mock>=1.2 # BSD
+oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
+oslotest>=1.10.0 # Apache-2.0
+python-subunit>=0.0.18 # Apache-2.0/BSD
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
+testrepository>=0.0.18 # Apache-2.0/BSD
+testscenarios>=0.4 # Apache-2.0/BSD
+testtools>=1.4.0 # MIT
 
 # Needed for pypi packaging
-wheel
+wheel # MIT