diff --git a/requirements.txt b/requirements.txt index 10fe86d80f..5654428ec8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,12 +1,13 @@ # The order of packages is significant, because pip processes them in the order # 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 SQLAlchemy<1.1.0,>=0.9.7 eventlet>=0.17.4 keystonemiddleware>=1.5.0 kombu>=3.0.7 -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 PasteDeploy>=1.5.0 Paste @@ -30,11 +31,11 @@ pexpect!=3.3,>=3.1 # ISC License oslo.config>=1.11.0 # Apache-2.0 oslo.i18n>=1.5.0 # Apache-2.0 oslo.serialization>=1.4.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 MySQL-python;python_version=='2.7' Babel>=1.3 six>=1.9.0 stevedore>=1.5.0 # Apache-2.0 -oslo.messaging!=1.12.0,>=1.8.0 # Apache-2.0 +oslo.messaging>=1.16.0 # Apache-2.0 osprofiler>=0.3.0 # Apache-2.0 diff --git a/setup.py b/setup.py index 056c16c2b8..d8080d05c8 100644 --- a/setup.py +++ b/setup.py @@ -25,5 +25,5 @@ except ImportError: pass setuptools.setup( - setup_requires=['pbr'], + setup_requires=['pbr>=1.3'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index 416a9ce7a8..f2be8cbf12 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -18,7 +18,8 @@ http://tarballs.openstack.org/python-troveclient/python-troveclient-master.tar.g -mock>=1.0 +mock>=1.1;python_version!='2.6' +mock==1.0.1;python_version=='2.6' mox3>=0.7.0 testtools>=1.4.0 discover