Merge "Updated from global requirements"

requirements.txt

@@ -3,7 +3,7 @@
 # process, which may cause wedges in the gate later.
 
 # pbr should be first
-pbr<2.0,>=0.11
+pbr<2.0,>=1.3
 
 alembic>=0.7.2
 Babel>=1.3
@@ -17,14 +17,14 @@ oslo.config>=1.11.0 # Apache-2.0
 oslo.context>=0.2.0 # Apache-2.0
 oslo.db>=1.12.0 # Apache-2.0
 oslo.i18n>=1.5.0 # Apache-2.0
-oslo.log>=1.2.0 # Apache-2.0
-oslo.messaging!=1.12.0,>=1.8.0 # Apache-2.0
+oslo.log>=1.6.0 # Apache-2.0
+oslo.messaging>=1.16.0 # Apache-2.0
 oslo.middleware!=2.0.0,>=1.2.0 # Apache-2.0
 oslo.policy>=0.5.0 # Apache-2.0
 oslo.rootwrap>=2.0.0 # Apache-2.0
 oslo.serialization>=1.4.0 # Apache-2.0
 oslo.service>=0.1.0 # Apache-2.0
-oslo.utils>=1.6.0 # Apache-2.0
+oslo.utils>=1.9.0 # Apache-2.0
 oslo.concurrency>=2.1.0 # Apache-2.0
 paramiko>=1.13.0
 Paste
@@ -33,7 +33,8 @@ python-neutronclient<3,>=2.3.11
 keystonemiddleware>=1.5.0
 requests>=2.5.2
 retrying!=1.3.0,>=1.2.3 # Apache-2.0
-Routes!=2.0,!=2.1,>=1.12.3
+Routes!=2.0,!=2.1,>=1.12.3;python_version=='2.7'
+Routes!=2.0,>=1.12.3;python_version!='2.7'
 six>=1.9.0
 SQLAlchemy<1.1.0,>=0.9.7
 stevedore>=1.5.0 # Apache-2.0

setup.py

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

test-requirements.txt

@@ -13,7 +13,7 @@ fixtures>=1.3.1
 mock>=1.1;python_version!='2.6'
 mock==1.0.1;python_version=='2.6'
 PyMySQL>=0.6.2 # MIT License
-oslotest>=1.5.1 # Apache-2.0
+oslotest>=1.7.0 # Apache-2.0
 oslosphinx>=2.5.0 # Apache-2.0
 psycopg2
 python-subunit>=0.0.18