From 6dac71878be1dd8d1594e8bbced2d991558610fc Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Tue, 19 Jan 2016 13:53:00 +0000 Subject: [PATCH] Updated from global requirements Change-Id: I42bc131bdd7098e7e04bc74fb635d1e898083619 --- requirements.txt | 16 ++++++++-------- test-requirements.txt | 18 +++++++++--------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/requirements.txt b/requirements.txt index 6a34ed4..af5d2ea 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,13 +1,13 @@ # 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. -pbr>=1.6 -Babel>=1.3 +pbr>=1.6 # Apache-2.0 +Babel>=1.3 # BSD oslo.config>=3.2.0 # Apache-2.0 -httplib2>=0.7.5 -iso8601>=0.1.9 -requests!=2.9.0,>=2.8.1 -python-keystoneclient!=1.8.0,>=1.6.0 -PyYAML>=3.1.0 +httplib2>=0.7.5 # MIT +iso8601>=0.1.9 # MIT +requests!=2.9.0,>=2.8.1 # Apache-2.0 +python-keystoneclient!=1.8.0,!=2.1.0,>=1.6.0 # Apache-2.0 +PyYAML>=3.1.0 # MIT stevedore>=1.5.0 # Apache-2.0 -six>=1.9.0 +six>=1.9.0 # MIT diff --git a/test-requirements.txt b/test-requirements.txt index 3afd43f..8c462c4 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,14 +3,14 @@ # process, which may cause wedges in the gate later. hacking<0.10,>=0.9.2 -coverage>=3.6 -discover -fixtures>=1.3.1 -python-subunit>=0.0.18 -sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 +coverage>=3.6 # Apache-2.0 +discover # BSD +fixtures>=1.3.1 # Apache-2.0/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 -mock>=1.2 +testrepository>=0.0.18 # Apache-2.0/BSD +testscenarios>=0.4 # Apache-2.0/BSD +testtools>=1.4.0 # MIT +mock>=1.2 # BSD