From 3334f2c6b6c5af233a717bab1db5552328d5a684 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Sat, 16 Jan 2016 03:31:30 +0000 Subject: [PATCH] Updated from global requirements Change-Id: Ie4e04746501a3d9af523ed33295492f448be0e74 --- requirements.txt | 14 +++++++------- test-requirements.txt | 20 ++++++++++---------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/requirements.txt b/requirements.txt index 581071e4..16ec7e9e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,13 +7,13 @@ # adding a new feature to oslo.utils means adding a new dependency, # that is a likely indicator that the feature belongs somewhere else. -pbr>=1.6 -six>=1.9.0 -funcsigs>=0.4;python_version=='2.7' or python_version=='2.6' -iso8601>=0.1.9 +pbr>=1.6 # Apache-2.0 +six>=1.9.0 # MIT +funcsigs>=0.4;python_version=='2.7' or python_version=='2.6' # Apache-2.0 +iso8601>=0.1.9 # MIT oslo.i18n>=1.5.0 # Apache-2.0 monotonic>=0.3 # Apache-2.0 -pytz>=2013.6 -netaddr!=0.7.16,>=0.7.12 -netifaces>=0.10.4 +pytz>=2013.6 # MIT +netaddr!=0.7.16,>=0.7.12 # BSD +netifaces>=0.10.4 # MIT debtcollector>=0.3.0 # Apache-2.0 diff --git a/test-requirements.txt b/test-requirements.txt index e3bc0955..27a32a0e 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,28 +4,28 @@ hacking<0.11,>=0.10.0 -discover -fixtures>=1.3.1 -python-subunit>=0.0.18 -testrepository>=0.0.18 -testscenarios>=0.4 -testtools>=1.4.0 +discover # BSD +fixtures>=1.3.1 # Apache-2.0/BSD +python-subunit>=0.0.18 # Apache-2.0/BSD +testrepository>=0.0.18 # Apache-2.0/BSD +testscenarios>=0.4 # Apache-2.0/BSD +testtools>=1.4.0 # MIT oslotest>=1.10.0 # Apache-2.0 # when we can require tox>= 1.4, this can go into tox.ini: # [testenv:cover] # deps = {[testenv]deps} coverage -coverage>=3.6 +coverage>=3.6 # Apache-2.0 # this is required for the docs build jobs -sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0 # mocking framework -mock>=1.2 +mock>=1.2 # BSD # used for oslotest cross-testing scripts oslo.config>=3.2.0 # Apache-2.0 # Bandit security code scanner -bandit>=0.13.2 +bandit>=0.13.2 # Apache-2.0