From 05c80a08f098bc2385ef68975d2cad4352586a0d Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Sat, 16 Jan 2016 03:33:18 +0000 Subject: [PATCH] Updated from global requirements Change-Id: If695abcf0be858e2a81669bd98440c48cd788d7f --- requirements.txt | 4 ++-- test-requirements.txt | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/requirements.txt b/requirements.txt index c6feb58..3e5c6ae 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>=1.6 -six>=1.9.0 +pbr>=1.6 # Apache-2.0 +six>=1.9.0 # MIT diff --git a/test-requirements.txt b/test-requirements.txt index 61f4ee1..248a12d 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,11 +2,11 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -Pillow>=2.4.0 # MIT -sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 -mock>=1.2 -coverage>=3.6 -testrepository>=0.0.18 -discover +Pillow>=2.4.0 # PIL License +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD +mock>=1.2 # BSD +coverage>=3.6 # Apache-2.0 +testrepository>=0.0.18 # Apache-2.0/BSD +discover # BSD oslotest>=1.10.0 # Apache-2.0 oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0