From ca6cb41158a9a82f290628611baddbe9f683321e Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Sat, 16 Jan 2016 03:33:03 +0000 Subject: [PATCH] Updated from global requirements Change-Id: I24a1a54389259ed58aff00cf3490b9e76caea6f0 --- requirements.txt | 40 ++++++++++++++++++++-------------------- test-requirements.txt | 28 ++++++++++++++-------------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/requirements.txt b/requirements.txt index 5eec2fb787..f94f8bef1a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,17 +2,17 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -pbr>=1.6 +pbr>=1.6 # Apache-2.0 -alembic>=0.8.0 -Babel>=1.3 +alembic>=0.8.0 # MIT +Babel>=1.3 # BSD castellan>=0.3.1 # Apache-2.0 -eventlet>=0.17.4 -Flask<1.0,>=0.10 -iso8601>=0.1.9 +eventlet>=0.17.4 # MIT +Flask<1.0,>=0.10 # BSD +iso8601>=0.1.9 # MIT Jinja2>=2.8 # BSD License (3 clause) -jsonschema!=2.5.0,<3.0.0,>=2.0.0 -keystonemiddleware>=4.0.0 +jsonschema!=2.5.0,<3.0.0,>=2.0.0 # MIT +keystonemiddleware>=4.0.0 # Apache-2.0 oslo.config>=3.2.0 # Apache-2.0 oslo.concurrency>=2.3.0 # Apache-2.0 oslo.context>=0.2.0 # Apache-2.0 @@ -26,16 +26,16 @@ oslo.rootwrap>=2.0.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 -paramiko>=1.13.0 -requests!=2.9.0,>=2.8.1 -python-cinderclient>=1.3.1 -python-keystoneclient!=1.8.0,>=1.6.0 -python-manilaclient>=1.3.0 -python-novaclient!=2.33.0,>=2.29.0 -python-swiftclient>=2.2.0 -python-neutronclient>=2.6.0 -python-heatclient>=0.6.0 -six>=1.9.0 +paramiko>=1.13.0 # LGPL +requests!=2.9.0,>=2.8.1 # Apache-2.0 +python-cinderclient>=1.3.1 # Apache-2.0 +python-keystoneclient!=1.8.0,>=1.6.0 # Apache-2.0 +python-manilaclient>=1.3.0 # Apache-2.0 +python-novaclient!=2.33.0,>=2.29.0 # Apache-2.0 +python-swiftclient>=2.2.0 # Apache-2.0 +python-neutronclient>=2.6.0 # Apache-2.0 +python-heatclient>=0.6.0 # Apache-2.0 +six>=1.9.0 # MIT stevedore>=1.5.0 # Apache-2.0 -SQLAlchemy<1.1.0,>=1.0.10 -WebOb>=1.2.3 +SQLAlchemy<1.1.0,>=1.0.10 # MIT +WebOb>=1.2.3 # MIT diff --git a/test-requirements.txt b/test-requirements.txt index c4930a07bc..fc0f18cbed 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -4,26 +4,26 @@ hacking<0.11,>=0.10.0 -Mako>=0.4.0 -PrettyTable<0.8,>=0.7 +Mako>=0.4.0 # MIT +PrettyTable<0.8,>=0.7 # BSD PyMySQL>=0.6.2 # MIT License bashate>=0.2 # Apache-2.0 -coverage>=3.6 +coverage>=3.6 # Apache-2.0 doc8 # Apache-2.0 -fixtures>=1.3.1 -mock>=1.2 +fixtures>=1.3.1 # Apache-2.0/BSD +mock>=1.2 # BSD oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0 oslotest>=1.10.0 # Apache-2.0 -psycopg2>=2.5 +psycopg2>=2.5 # LGPL/ZPL pylint==1.4.5 # GNU GPL v2 reno>=0.1.1 # Apache2 rfc3986>=0.2.0 # Apache-2.0 -sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 -sphinxcontrib-httpdomain -tempest-lib>=0.13.0 -testrepository>=0.0.18 -testresources>=0.2.4 -testscenarios>=0.4 -testtools>=1.4.0 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD +sphinxcontrib-httpdomain # BSD +tempest-lib>=0.13.0 # Apache-2.0 +testrepository>=0.0.18 # Apache-2.0/BSD +testresources>=0.2.4 # Apache-2.0/BSD +testscenarios>=0.4 # Apache-2.0/BSD +testtools>=1.4.0 # MIT -python-saharaclient>=0.10.0 +python-saharaclient>=0.10.0 # Apache-2.0