From a5434d0ae87fd7f264ae60bc35cd6e2e9acd3f19 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Sat, 16 Jan 2016 03:27:53 +0000 Subject: [PATCH] Updated from global requirements Change-Id: Id87c8cc2683cc95fd5f8013b49a1848a85549e6d --- requirements.txt | 20 ++++++++++---------- test-requirements.txt | 14 +++++++------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/requirements.txt b/requirements.txt index afb91aef..b0ce7f2b 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,19 +1,19 @@ # 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 -anyjson>=0.3.3 -Babel>=1.3 -eventlet>=0.17.4 +pbr>=1.6 # Apache-2.0 +anyjson>=0.3.3 # BSD +Babel>=1.3 # BSD +eventlet>=0.17.4 # MIT GitPython>=1.0.1 # BSD License (3 clause) -iso8601>=0.1.9 -kombu>=3.0.7 +iso8601>=0.1.9 # MIT +kombu>=3.0.7 # BSD oslo.config>=3.2.0 # Apache-2.0 oslo.log>=1.14.0 # Apache-2.0 oslo.service>=1.0.0 # Apache-2.0 oslo.utils>=3.2.0 # Apache-2.0 -PyYAML>=3.1.0 -six>=1.9.0 +PyYAML>=3.1.0 # MIT +six>=1.9.0 # MIT stevedore>=1.5.0 # Apache-2.0 -semantic-version>=2.3.1 -requests!=2.9.0,>=2.8.1 +semantic-version>=2.3.1 # BSD +requests!=2.9.0,>=2.8.1 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index 951ac520..0e0c23ab 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -2,14 +2,14 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. hacking<0.11,>=0.10.0 -unittest2 -coverage>=3.6 -discover -mock>=1.2 -testtools>=1.4.0 -testrepository>=0.0.18 +unittest2 # BSD +coverage>=3.6 # Apache-2.0 +discover # BSD +mock>=1.2 # BSD +testtools>=1.4.0 # MIT +testrepository>=0.0.18 # Apache-2.0/BSD # doc build requirements oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0 -sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD reno>=0.1.1 # Apache2