Merge "Update requirements"

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.
 
-pbr!=0.7,<1.0,>=0.6
+pbr>=1.6
 Babel>=1.3
-python-keystoneclient<1.4.0,>=1.2.0
-stevedore<1.4.0,>=1.3.0 # Apache-2.0
-oslo.i18n<1.6.0,>=1.5.0 # Apache-2.0
-oslo.serialization<1.5.0,>=1.4.0 # Apache-2.0
-oslo.utils<1.5.0,>=1.4.0 # Apache-2.0
+python-keystoneclient!=1.8.0,>=1.6.0
+stevedore>=1.5.0 # Apache-2.0
+oslo.i18n>=1.5.0 # Apache-2.0
+oslo.serialization>=1.4.0 # Apache-2.0
+oslo.utils!=2.6.0,>=2.0.0 # Apache-2.0

setup.py

@@ -25,5 +25,5 @@ except ImportError:
     pass
 
 setuptools.setup(
-    setup_requires=['pbr'],
+    setup_requires=['pbr>=1.8'],
     pbr=True)

test-requirements.txt

@@ -8,8 +8,8 @@ coverage>=3.6
 discover
 python-subunit>=0.0.18
 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
-oslosphinx<2.6.0,>=2.5.0 # Apache-2.0
-oslotest<1.6.0,>=1.5.1 # Apache-2.0
+oslosphinx>=2.5.0 # Apache-2.0
+oslotest>=1.10.0 # Apache-2.0
 testrepository>=0.0.18
 testscenarios>=0.4
-testtools!=1.2.0,>=0.9.36
+testtools>=1.4.0