From 8b7bb910b2bf1d97cd74c682c9e362e407aca3c9 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Fri, 9 Jun 2017 03:52:13 +0000 Subject: [PATCH] Updated from global requirements Change-Id: I8fb4c8ef937c8667a022605ce21417b3da5e6d5d --- requirements.txt | 4 ++-- setup.py | 2 +- test-requirements.txt | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements.txt b/requirements.txt index 44e5118a..893a5f97 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,6 +2,6 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -pbr>=1.8 # Apache-2.0 -Babel>=2.3.4 # BSD +pbr!=2.1.0,>=2.0.0 # Apache-2.0 +Babel!=2.4.0,>=2.3.4 # BSD python-barbicanclient>=4.0.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 ac9ff48b..4c152b71 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,13 +4,13 @@ hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 http://tarballs.openstack.org/horizon/horizon-master.tar.gz#egg=horizon -coverage>=4.0 # Apache-2.0 +coverage!=4.4,>=4.0 # Apache-2.0 ddt>=1.0.1 # MIT django-nose>=1.4.4 # BSD python-subunit>=0.0.18 # Apache-2.0/BSD nose-exclude # LGPL selenium>=2.50.1 # Apache-2.0 -sphinx>=1.5.1 # BSD +sphinx!=1.6.1,>=1.5.1 # BSD oslosphinx>=4.7.0 # Apache-2.0 oslotest>=1.10.0 # Apache-2.0 testrepository>=0.0.18 # Apache-2.0/BSD