From dd84cf8eca4442e5ecc4c15344cbbe0d077a560c Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Sat, 16 Jan 2016 03:33:14 +0000 Subject: [PATCH] Updated from global requirements Change-Id: I5c3c423d36a17d6713f2af84df145e43df516dfa --- requirements.txt | 34 +++++++++++++++++----------------- test-requirements.txt | 26 +++++++++++++------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/requirements.txt b/requirements.txt index 22f317137..1e2ef1065 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,12 +2,12 @@ # 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 -cryptography>=1.0 # Apache-2.0 -eventlet>=0.17.4 -keystonemiddleware>=4.0.0 -openstacksdk +pbr>=1.6 # Apache-2.0 +Babel>=1.3 # BSD +cryptography>=1.0 # BSD/Apache-2.0 +eventlet>=0.17.4 # MIT +keystonemiddleware>=4.0.0 # Apache-2.0 +openstacksdk # Apache-2.0 oslo.config>=3.2.0 # Apache-2.0 oslo.context>=0.2.0 # Apache-2.0 oslo.db>=4.1.0 # Apache-2.0 @@ -19,15 +19,15 @@ oslo.policy>=0.5.0 # Apache-2.0 oslo.serialization>=1.10.0 # Apache-2.0 oslo.service>=1.0.0 # Apache-2.0 oslo.utils>=3.2.0 # Apache-2.0 -PasteDeploy>=1.5.0 -pytz>=2013.6 -PyYAML>=3.1.0 -qpid-python;python_version=='2.7' -requests!=2.9.0,>=2.8.1 -Routes!=2.0,!=2.1,>=1.12.3;python_version=='2.7' -Routes!=2.0,>=1.12.3;python_version!='2.7' -six>=1.9.0 -SQLAlchemy<1.1.0,>=1.0.10 -sqlalchemy-migrate>=0.9.6 +PasteDeploy>=1.5.0 # MIT +pytz>=2013.6 # MIT +PyYAML>=3.1.0 # MIT +qpid-python;python_version=='2.7' # Apache-2.0 +requests!=2.9.0,>=2.8.1 # Apache-2.0 +Routes!=2.0,!=2.1,>=1.12.3;python_version=='2.7' # MIT +Routes!=2.0,>=1.12.3;python_version!='2.7' # MIT +six>=1.9.0 # MIT +SQLAlchemy<1.1.0,>=1.0.10 # MIT +sqlalchemy-migrate>=0.9.6 # Apache-2.0 stevedore>=1.5.0 # Apache-2.0 -WebOb>=1.2.3 +WebOb>=1.2.3 # MIT diff --git a/test-requirements.txt b/test-requirements.txt index 1691f67ce..f27df3c09 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,23 +3,23 @@ # process, which may cause wedges in the gate later. # Hacking already pins down pep8, pyflakes and flake8 -coverage>=3.6 -discover -flake8<=2.4.1,>=2.2.4 +coverage>=3.6 # Apache-2.0 +discover # BSD +flake8<=2.4.1,>=2.2.4 # MIT hacking<0.11,>=0.10.2 -mock>=1.2 -mox>=0.5.3 -mox3>=0.7.0 -openstackdocstheme>=1.0.3 +mock>=1.2 # BSD +mox>=0.5.3 # Apache-2.0 +mox3>=0.7.0 # Apache-2.0 +openstackdocstheme>=1.0.3 # Apache-2.0 oslotest>=1.10.0 # Apache-2.0 -os-testr>=0.4.1 -paramiko>=1.13.0 +os-testr>=0.4.1 # Apache-2.0 +paramiko>=1.13.0 # LGPL PyMySQL>=0.6.2 # MIT License -testrepository>=0.0.18 -testscenarios>=0.4 -testtools>=1.4.0 +testrepository>=0.0.18 # Apache-2.0/BSD +testscenarios>=0.4 # Apache-2.0/BSD +testtools>=1.4.0 # MIT # Documentation 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