diff --git a/requirements.txt b/requirements.txt index bacb03b32..eeb4fc208 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,7 +1,7 @@ # 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 Babel>=1.3 eventlet>=0.17.4 iso8601>=0.1.9 @@ -10,10 +10,10 @@ ordereddict oslo.config>=1.11.0 # Apache-2.0 oslo.concurrency>=2.1.0 # Apache-2.0 oslo.i18n>=1.5.0 # Apache-2.0 -oslo.log>=1.2.0 # Apache-2.0 +oslo.log>=1.6.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 pecan>=0.8.0 psutil<2.0.0,>=1.1.1 pyudev @@ -21,4 +21,4 @@ requests>=2.5.2 six>=1.9.0 stevedore>=1.5.0 # Apache-2.0 WSME>=0.7 -oslotest>=1.5.1 # Apache-2.0 +oslotest>=1.7.0 # Apache-2.0 diff --git a/setup.py b/setup.py index 056c16c2b..d8080d05c 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 4a3c454ee..0da514a31 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,7 +4,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' testrepository>=0.0.18 testtools>=1.4.0 python-subunit>=0.0.18