diff --git a/requirements.txt b/requirements.txt index c4141a1f..227cf33d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,12 +2,12 @@ # 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 Babel>=1.3 netaddr>=0.7.12 oslo.i18n>=1.5.0 # Apache-2.0 -oslo.utils>=1.6.0 # Apache-2.0 +oslo.utils>=1.9.0 # Apache-2.0 python-keystoneclient>=1.6.0 requests>=2.5.2 six>=1.9.0 diff --git a/setup.py b/setup.py index 056c16c2..d8080d05 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 db88d6f9..4f572aed 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -6,7 +6,8 @@ hacking<0.11,>=0.10.0 coverage>=3.6 discover -mock>=1.0 +mock>=1.1;python_version!='2.6' +mock==1.0.1;python_version=='2.6' oslo.config>=1.11.0 # Apache-2.0 oslosphinx>=2.5.0 # Apache-2.0 python-neutronclient<3,>=2.3.11