From b16542e6a02f61f2c289e2a0a024c2401f36a1cc Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Wed, 10 Feb 2016 21:55:57 +0000 Subject: [PATCH] Updated from global requirements Change-Id: I689f099a656e28ef1ce0f5e8ceec12bdf0f27456 --- requirements.txt | 4 ++-- setup.py | 2 +- test-requirements.txt | 18 +++++++++--------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/requirements.txt b/requirements.txt index 3cb05e9..b2608e4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,5 +2,5 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -pbr<2.0,>=1.3 -Babel>=1.3 +pbr>=1.6 # Apache-2.0 +Babel>=1.3 # BSD diff --git a/setup.py b/setup.py index d8080d0..782bb21 100644 --- a/setup.py +++ b/setup.py @@ -25,5 +25,5 @@ except ImportError: pass setuptools.setup( - setup_requires=['pbr>=1.3'], + setup_requires=['pbr>=1.8'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index 0bc717c..79285a7 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -5,13 +5,13 @@ hacking<0.11,>=0.10.0 http://tarballs.openstack.org/horizon/horizon-master.tar.gz#egg=horizon -coverage>=3.6 -discover -django-nose>=1.2 -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 +django-nose>=1.2 # 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 -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