From ddb96da893765bc68c6e3de1639e095db8317700 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Wed, 1 Jun 2016 14:17:09 +0000 Subject: [PATCH] Updated from global requirements Change-Id: If277e5171ac2e098113d431796124b3eeb2c3045 --- requirements.txt | 8 ++++---- setup.py | 2 +- test-requirements.txt | 18 +++++++++--------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/requirements.txt b/requirements.txt index 94eefd3..712a554 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.6 # Apache-2.0 -Babel>=2.3.4 # BSD -retrying>=1.2.3,!=1.3.0 # Apache-2.0 -six>=1.9.0 # MIT +pbr>=1.6 # Apache-2.0 +Babel>=2.3.4 # BSD +retrying!=1.3.0,>=1.2.3 # Apache-2.0 +six>=1.9.0 # MIT diff --git a/setup.py b/setup.py index 056c16c..782bb21 100644 --- a/setup.py +++ b/setup.py @@ -25,5 +25,5 @@ except ImportError: pass setuptools.setup( - setup_requires=['pbr'], + setup_requires=['pbr>=1.8'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index 8592bde..8bd244e 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,12 +4,12 @@ hacking<0.11,>=0.10.0 -coverage>=3.6 -discover -python-subunit>=0.0.18 -sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 -oslosphinx>=2.2.0 # Apache-2.0 -oslotest>=1.2.0 # Apache-2.0 -testrepository>=0.0.18 -testscenarios>=0.4 -testtools>=0.9.36,!=1.2.0 +coverage>=3.6 # Apache-2.0 +discover # BSD +python-subunit>=0.0.18 # Apache-2.0/BSD +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD +oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0 +oslotest>=1.10.0 # Apache-2.0 +testrepository>=0.0.18 # Apache-2.0/BSD +testscenarios>=0.4 # Apache-2.0/BSD +testtools>=1.4.0 # MIT