From b58f864315137e75ff51c76fc6b02953926d7a21 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Sat, 16 Jan 2016 03:31:33 +0000 Subject: [PATCH] Updated from global requirements Change-Id: I8b56ce0767399dfccaddb48965a3b2b5a2a9df1b --- requirements.txt | 10 +++++----- setup.cfg | 4 ++-- test-requirements.txt | 6 +++--- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/requirements.txt b/requirements.txt index 671dce3..2930afc 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. -six>=1.9.0 -Babel>=1.3 +six>=1.9.0 # MIT +Babel>=1.3 # BSD oslo.concurrency>=2.3.0 # Apache-2.0 oslo.config>=3.2.0 # Apache-2.0 oslo.context>=0.2.0 # Apache-2.0 oslo.messaging!=2.8.0,!=3.1.0,>2.6.1 # Apache-2.0 oslo.serialization>=1.10.0 # Apache-2.0 oslo.utils>=3.2.0 # Apache-2.0 -iso8601>=0.1.9 +iso8601>=0.1.9 # MIT oslo.log>=1.14.0 # Apache-2.0 oslo.i18n>=1.5.0 # Apache-2.0 -WebOb>=1.2.3 -netaddr!=0.7.16,>=0.7.12 +WebOb>=1.2.3 # MIT +netaddr!=0.7.16,>=0.7.12 # BSD diff --git a/setup.cfg b/setup.cfg index f1c6c48..0962dab 100644 --- a/setup.cfg +++ b/setup.cfg @@ -28,8 +28,8 @@ oslo.config.opts = [extras] fixtures = - mock>=1.2 - fixtures>=1.3.1 + mock>=1.2 # BSD + fixtures>=1.3.1 # Apache-2.0/BSD [pbr] warnerrors = true diff --git a/test-requirements.txt b/test-requirements.txt index 03e272e..64d87df 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,9 +3,9 @@ # process, which may cause wedges in the gate later. hacking<0.11,>=0.10.0 oslotest>=1.10.0 # Apache-2.0 -testtools>=1.4.0 +testtools>=1.4.0 # MIT # These are needed for docs generation oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0 -sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD -coverage>=3.6 +coverage>=3.6 # Apache-2.0