Updated from global requirements

Change-Id: I2246ce4ec35e0d60ca68dc6920d6d558a43fde7d

requirements.txt

@@ -2,8 +2,8 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-pbr>=1.6  # Apache-2.0
-Babel>=1.3  # BSD
-testrepository>=0.0.18  # Apache-2.0/BSD
-python-subunit>=0.0.18  # Apache-2.0/BSD
-testtools>=1.4.0  # MIT
+pbr>=1.6 # Apache-2.0
+Babel>=1.3 # BSD
+testrepository>=0.0.18 # Apache-2.0/BSD
+python-subunit>=0.0.18 # Apache-2.0/BSD
+testtools>=1.4.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>=1.3'],
+    setup_requires=['pbr>=1.8'],
     pbr=True)

test-requirements.txt

@@ -2,13 +2,13 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-hacking>=0.10.2,<0.11  # Apache-2.0
+hacking<0.11,>=0.10.2 # Apache-2.0
 
-coverage>=3.6  # Apache-2.0
-discover  # BSD
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3  # BSD
-oslosphinx>=2.2.0  # Apache-2.0
-oslotest>=1.2.0  # Apache-2.0
-testscenarios>=0.4  # Apache-2.0/BSD
-ddt>=1.0.1  # MIT
-six>=1.9.0  # MIT
+coverage>=3.6 # Apache-2.0
+discover # BSD
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
+oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
+oslotest>=1.10.0 # Apache-2.0
+testscenarios>=0.4 # Apache-2.0/BSD
+ddt>=1.0.1 # MIT
+six>=1.9.0 # MIT