From 6772bdbd3b1c039e2688eba46c4490f4ef2fc0d7 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Fri, 3 Mar 2017 22:48:35 +0000 Subject: [PATCH] Updated from global requirements Change-Id: I9e3198bc843886f267dbb39b8d1dc4c7be4894df --- requirements.txt | 6 +++--- setup.py | 2 +- test-requirements.txt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements.txt b/requirements.txt index 9cd780be..f79862f9 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,15 +2,15 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. astroid<1.4.0 # LGPLv2.1 # breaks pylint 1.4.4 -setuptools!=24.0.0,>=16.0 # PSF/ZPL -pbr>=1.8 # Apache-2.0 +setuptools!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,>=16.0 # PSF/ZPL +pbr>=2.0.0 # Apache-2.0 python-swiftclient>=3.2.0 # Apache-2.0 python-cinderclient!=1.7.0,!=1.7.1,>=1.6.0 # Apache-2.0 python-glanceclient>=2.5.0 # Apache-2.0 python-novaclient>=7.1.0 # Apache-2.0 python-openstackclient>=3.3.0 # Apache-2.0 python-freezerclient>=1.0.0 # Apache-2.0 -oslo.utils>=3.18.0 # Apache-2.0 +oslo.utils>=3.20.0 # Apache-2.0 oslo.i18n>=2.1.0 # Apache-2.0 oslo.log>=3.11.0 # Apache-2.0 oslo.config!=3.18.0,>=3.14.0 # Apache-2.0 diff --git a/setup.py b/setup.py index 782bb21f..566d8443 100644 --- a/setup.py +++ b/setup.py @@ -25,5 +25,5 @@ except ImportError: pass setuptools.setup( - setup_requires=['pbr>=1.8'], + setup_requires=['pbr>=2.0.0'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index 168d5ae5..ea1b61a0 100644 --- a/test-requirements.txt +++ b/test-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. flake8<2.6.0,>=2.5.4 # MIT -hacking>=0.12.0,!=0.13.0,<0.14 # Apache-2.0 +hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 coverage>=4.0 # Apache-2.0 mock>=2.0 # BSD pylint==1.4.5 # GPLv2