From bced14922195328f42f4bacefbb0832ff6e3e94c Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Sat, 9 Jul 2016 19:27:30 +0000 Subject: [PATCH] Updated from global requirements Change-Id: I2208ffa743a2f9eecd056f05fed449aaedbc1227 --- requirements.txt | 10 +++++----- setup.py | 2 +- test-requirements.txt | 16 ++++++++-------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/requirements.txt b/requirements.txt index 1639c2c..f7f9eb6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,8 +2,8 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -pbr>=1.6 -Babel>=1.3 -cliff>1.16.0 -oslo.utils>=2.0.0 -keystoneauth1>=1.0.0 \ No newline at end of file +pbr>=1.6 # Apache-2.0 +Babel>=2.3.4 # BSD +cliff!=1.16.0,!=1.17.0,>=1.15.0 # Apache-2.0 +oslo.utils>=3.15.0 # Apache-2.0 +keystoneauth1>=2.7.0 # Apache-2.0 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 0c885d3..bee6cac 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.2.0,!=1.3b1,<1.3,>=1.1.2 -oslosphinx>=2.5.0 # Apache-2.0 +coverage>=3.6 # Apache-2.0 +discover # BSD +python-subunit>=0.0.18 # Apache-2.0/BSD +sphinx!=1.3b1,<1.3,>=1.2.1 # BSD +oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0 oslotest>=1.10.0 # Apache-2.0 -testrepository>=0.0.18 -testscenarios>=0.4 -testtools>=1.4.0 +testrepository>=0.0.18 # Apache-2.0/BSD +testscenarios>=0.4 # Apache-2.0/BSD +testtools>=1.4.0 # MIT