From 659bb695e339420b5f0d4af25df854bd44315a55 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Sat, 16 Jan 2016 03:32:27 +0000 Subject: [PATCH] Updated from global requirements Change-Id: If36a7066c70dc9a8b2cb6d2e13c6540c7bb4337e --- requirements.txt | 8 ++++---- test-requirements.txt | 24 ++++++++++++------------ 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/requirements.txt b/requirements.txt index d5f5ffd71..57570dfe2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,9 @@ # 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 -six>=1.9.0 +pbr>=1.6 # Apache-2.0 +six>=1.9.0 # MIT stevedore>=1.5.0 # Apache-2.0 oslo.utils>=3.2.0 # Apache-2.0 -os-client-config>=1.13.1 -keystoneauth1>=2.1.0 +os-client-config>=1.13.1 # Apache-2.0 +keystoneauth1>=2.1.0 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index be3976e5e..7ebd60b34 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,16 +3,16 @@ # process, which may cause wedges in the gate later. hacking<0.11,>=0.10.0 -coverage>=3.6 -discover -fixtures>=1.3.1 -mock>=1.2 -python-subunit>=0.0.18 -openstackdocstheme>=1.0.3 -os-testr>=0.4.1 -requests!=2.9.0,>=2.8.1 +coverage>=3.6 # Apache-2.0 +discover # BSD +fixtures>=1.3.1 # Apache-2.0/BSD +mock>=1.2 # BSD +python-subunit>=0.0.18 # Apache-2.0/BSD +openstackdocstheme>=1.0.3 # Apache-2.0 +os-testr>=0.4.1 # Apache-2.0 +requests!=2.9.0,>=2.8.1 # Apache-2.0 requests-mock>=0.7.0 # Apache-2.0 -sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 -testrepository>=0.0.18 -testscenarios>=0.4 -testtools>=1.4.0 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD +testrepository>=0.0.18 # Apache-2.0/BSD +testscenarios>=0.4 # Apache-2.0/BSD +testtools>=1.4.0 # MIT