From 57f6eb74e74d8d4f5297aea0f82d6a749e0dbe12 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Fri, 10 Mar 2017 19:12:09 +0000 Subject: [PATCH] Updated from global requirements Change-Id: Ie349318c8d62712a63fd7c10bc2b7d86bc2543f8 --- 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 5f6e6b282..8aafd3029 100644 --- a/requirements.txt +++ b/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. -pbr>=1.8 # Apache-2.0 +pbr>=2.0.0 # Apache-2.0 Babel>=2.3.4 # BSD eventlet!=0.18.3,>=0.18.2 # MIT oslo.concurrency>=3.8.0 # Apache-2.0 @@ -11,8 +11,8 @@ oslo.serialization>=1.10.0 # Apache-2.0 oslo.i18n>=2.1.0 # Apache-2.0 oslo.privsep>=1.9.0 # Apache-2.0 oslo.service>=1.10.0 # Apache-2.0 -oslo.utils>=3.18.0 # Apache-2.0 -requests!=2.12.2,>=2.10.0 # Apache-2.0 +oslo.utils>=3.20.0 # Apache-2.0 +requests!=2.12.2,!=2.13.0,>=2.10.0 # Apache-2.0 retrying!=1.3.0,>=1.2.3 # Apache-2.0 six>=1.9.0 # MIT os-win>=1.4.0 # Apache-2.0 diff --git a/setup.py b/setup.py index 782bb21f0..566d84432 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 3f6ebdae8..24dee7466 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -7,7 +7,7 @@ coverage>=4.0 # Apache-2.0 ddt>=1.0.1 # MIT python-subunit>=0.0.18 # Apache-2.0/BSD reno>=1.8.0 # Apache-2.0 -sphinx!=1.3b1,<1.4,>=1.2.1 # BSD +sphinx>=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