diff --git a/requirements.txt b/requirements.txt index 72a83b1e..ad129789 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,13 +3,13 @@ # process, which may cause wedges in the gate later. Babel>=1.3 -pbr<2.0,>=0.11 +pbr<2.0,>=1.3 argparse iso8601>=0.1.9 PrettyTable<0.8,>=0.7 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 python-keystoneclient>=1.6.0 python-swiftclient>=2.2.0 PyYAML>=3.1.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 1a4bac8e..52bbeda9 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -8,11 +8,11 @@ coverage>=3.6 discover fixtures>=1.3.1 requests-mock>=0.6.0 # Apache-2.0 -mock>=1.1;python_version!='2.6' +mock!=1.1.4,>=1.1;python_version!='2.6' mock==1.0.1;python_version=='2.6' mox3>=0.7.0 oslosphinx>=2.5.0 # Apache-2.0 -oslotest>=1.5.1 # Apache-2.0 +oslotest>=1.7.0 # Apache-2.0 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 tempest-lib>=0.6.1 testrepository>=0.0.18