Updated from global requirements

Change-Id: Ia59961b0b4bbdc0be1037b364e273cc11181fe7d

requirements.txt

@@ -2,7 +2,7 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 
-pbr<2.0,>=0.11
+pbr<2.0,>=1.3
 #
 # The greenlet package must be compiled with gcc and needs
 # the Python.h headers. Make sure you install the python-dev
@@ -14,7 +14,8 @@ SQLAlchemy<1.1.0,>=0.9.7
 anyjson>=0.3.3
 eventlet>=0.17.4
 PasteDeploy>=1.5.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'
 WebOb>=1.2.3
 sqlalchemy-migrate>=0.9.6
 httplib2>=0.7.5
@@ -25,10 +26,10 @@ oslo.config>=1.11.0 # Apache-2.0
 oslo.concurrency>=2.1.0 # Apache-2.0
 oslo.context>=0.2.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
 stevedore>=1.5.0 # Apache-2.0
 taskflow>=0.11.0
-keystonemiddleware>=1.5.0
+keystonemiddleware>=2.0.0
 WSME>=0.7
 # For openstack/common/lockutils
 posix-ipc
@@ -44,15 +45,15 @@ Paste
 
 jsonschema!=2.5.0,<3.0.0,>=2.0.0
 python-keystoneclient>=1.6.0
-pyOpenSSL>=0.11
+pyOpenSSL>=0.14
 # Required by openstack.common libraries
 six>=1.9.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.middleware>=1.2.0,!=2.0.0  # Apache-2.0
+oslo.log>=1.6.0 # Apache-2.0
+oslo.messaging>=1.16.0 # Apache-2.0
+oslo.middleware>=2.4.0 # Apache-2.0
 oslo.policy>=0.5.0 # Apache-2.0
 oslo.serialization>=1.4.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,13 +13,14 @@ coverage>=3.6
 discover
 fixtures>=1.3.1
 mox3>=0.7.0
-mock>=1.0
+mock!=1.1.4,>=1.1;python_version!='2.6'
+mock==1.0.1;python_version=='2.6'
 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
 requests>=2.5.2
 testrepository>=0.0.18
 testtools>=1.4.0
 psutil<2.0.0,>=1.1.1
-oslotest>=1.5.1 # Apache-2.0
+oslotest>=1.7.0 # Apache-2.0
 # Optional packages that should be installed when testing
 PyMySQL>=0.6.2 # MIT License
 psycopg2