From 6c5490bbd731a98129136e661d87fa018b1769b3 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Mon, 18 Jan 2016 22:44:41 +0000 Subject: [PATCH] Updated from global requirements Change-Id: Id2e6505f69e4d6c07e170899cf2cdae033187466 --- requirements.txt | 12 ++++++------ test-requirements.txt | 14 +++++++------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/requirements.txt b/requirements.txt index 8abb6601d..31add8399 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,15 +2,15 @@ # 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 -eventlet>=0.17.4 +pbr>=1.6 # Apache-2.0 +Babel>=1.3 # BSD +eventlet>=0.17.4 # MIT oslo.concurrency>=2.3.0 # Apache-2.0 oslo.log>=1.14.0 # Apache-2.0 oslo.serialization>=1.10.0 # Apache-2.0 oslo.i18n>=1.5.0 # Apache-2.0 oslo.service>=1.0.0 # Apache-2.0 -oslo.utils>=3.2.0 # Apache-2.0 -requests!=2.9.0,>=2.8.1 +oslo.utils>=3.4.0 # Apache-2.0 +requests!=2.9.0,>=2.8.1 # Apache-2.0 retrying!=1.3.0,>=1.2.3 # Apache-2.0 -six>=1.9.0 +six>=1.9.0 # MIT diff --git a/test-requirements.txt b/test-requirements.txt index d01fcbd33..98d2846f6 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,12 +3,12 @@ # process, which may cause wedges in the gate later. hacking<0.11,>=0.10.0 -coverage>=3.6 -python-subunit>=0.0.18 -sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 +coverage>=3.6 # Apache-2.0 +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 -os-testr>=0.4.1 +testrepository>=0.0.18 # Apache-2.0/BSD +testscenarios>=0.4 # Apache-2.0/BSD +testtools>=1.4.0 # MIT +os-testr>=0.4.1 # Apache-2.0