From c3d54ff82332b4ee47c2eb06055ce26f5155e684 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Mon, 6 Mar 2017 01:16:53 +0000 Subject: [PATCH] Updated from global requirements Change-Id: I13724b3cb5733013516e7f16a3c28ec9f669acc0 --- requirements.txt | 6 +++--- setup.py | 2 +- test-requirements.txt | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/requirements.txt b/requirements.txt index c497d3a..61a6d7f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,16 +1,16 @@ # 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>=1.8 # Apache-2.0 +pbr>=2.0.0 # Apache-2.0 anyjson>=0.3.3 # BSD eventlet!=0.18.3,>=0.18.2 # MIT python-keystoneclient>=3.8.0 # Apache-2.0 python-heatclient>=1.6.1 # Apache-2.0 python-zaqarclient>=1.0.0 # Apache-2.0 -requests!=2.12.2,>=2.10.0 # Apache-2.0 +requests!=2.12.2,!=2.13.0,>=2.10.0 # Apache-2.0 iso8601>=0.1.11 # MIT -lxml>=2.3 # BSD +lxml!=3.7.0,>=2.3 # BSD oslo.config!=3.18.0,>=3.14.0 # Apache-2.0 oslo.log>=3.11.0 # Apache-2.0 six>=1.9.0 # MIT diff --git a/setup.py b/setup.py index 782bb21..566d844 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 cdbf637..34c7d94 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,13 +1,13 @@ # 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. -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 fixtures>=3.0.0 # Apache-2.0/BSD mock>=2.0 # BSD python-subunit>=0.0.18 # Apache-2.0/BSD -sphinx!=1.3b1,<1.4,>=1.2.1 # BSD +sphinx>=1.5.1 # BSD testrepository>=0.0.18 # Apache-2.0/BSD testscenarios>=0.4 # Apache-2.0/BSD testtools>=1.4.0 # MIT