From d65e814033019954dc4c42c736d4ded5019503bd Mon Sep 17 00:00:00 2001 From: Graham Hayes Date: Mon, 4 Jan 2016 16:05:18 +0000 Subject: [PATCH] Updated from global requirements Change-Id: I9f54cef06504092da345be66f14e1baa04989441 --- requirements.txt | 18 ++++++++++++++---- test-requirements.txt | 14 +++++++------- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/requirements.txt b/requirements.txt index 865ea11..4568208 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,13 +2,23 @@ # 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 +pbr>=1.6 # Apache-2.0 +Babel>=1.3 # BSD -alembic>=0.8.0 +alembic>=0.8.0 # MIT oslo.config>=3.2.0 # Apache-2.0 oslo.db>=4.1.0 # Apache-2.0 +oslo.versionedobjects>=0.13.0 # Apache-2.0 oslo.i18n>=1.5.0 # Apache-2.0 oslo.log>=1.14.0 # Apache-2.0 +oslo.context>=0.2.0 # Apache-2.0 +oslo.policy>=0.5.0 # Apache-2.0 +oslo.concurrency>=2.3.0 # Apache-2.0 oslo.messaging!=2.8.0,!=3.1.0,>2.6.1 # Apache-2.0 -oslo.utils>=3.2.0 # Apache-2.0 +oslo.middleware>=3.0.0 # Apache-2.0 +oslo.reports>=0.6.0 # Apache-2.0 +oslo.rootwrap>=2.0.0 # Apache-2.0 +oslo.serialization>=1.10.0 # Apache-2.0 +oslo.service>=1.0.0 # Apache-2.0 +oslo.utils>=3.4.0 # Apache-2.0 +keystonemiddleware>=4.0.0 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index a139bf8..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.2.0,!=1.3b1,<1.3,>=1.1.2 +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 -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