From d71f1677963bc5ec3b3e4443544b4bd79c6e80a9 Mon Sep 17 00:00:00 2001 From: Michael Krotscheck Date: Wed, 9 Dec 2015 16:10:57 -0800 Subject: [PATCH] Updated from global requirements Updated with mitaka requirements. This patch performs a manual update of all requirements from the openstack global-requirements repo. Change-Id: Iab34d66b1c12deb53dc5c302db88d8726cabc88c --- requirements.txt | 37 +++++++++++++++++++------------------ setup.py | 2 +- test-requirements.txt | 22 +++++++++++----------- 3 files changed, 31 insertions(+), 30 deletions(-) diff --git a/requirements.txt b/requirements.txt index ecbbdc08..8cf588ca 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,24 +1,25 @@ # 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<2.0,>=1.6 -eventlet>=0.17.4 -keystonemiddleware>=2.0.0 -python-ceilometerclient>=1.0.13 -python-keystoneclient>=1.6.0 -PasteDeploy>=1.5.0 -pecan>=1.0.0 -WSME>=0.7 -oslo.config>=2.3.0 # Apache-2.0 +pbr>=1.6 # Apache-2.0 +eventlet!=0.18.3,>=0.18.2 # MIT +keystonemiddleware!=4.1.0,>=4.0.0 # Apache-2.0 +python-ceilometerclient>=2.2.1 # Apache-2.0 +python-keystoneclient!=1.8.0,!=2.1.0,>=1.6.0 # Apache-2.0 +iso8601>=0.1.9 # MIT +PasteDeploy>=1.5.0 # MIT +pecan>=1.0.0 # BSD +WSME>=0.8 # MIT +oslo.config>=3.7.0 # Apache-2.0 oslo.context>=0.2.0 # Apache-2.0 -oslo.concurrency>=2.3.0 # Apache-2.0 -oslo.db>=2.4.1 # Apache-2.0 -oslo.i18n>=1.5.0 # Apache-2.0 -oslo.log>=1.8.0 # Apache-2.0 -oslo.messaging!=1.17.0,!=1.17.1,>=1.16.0 # Apache-2.0 -oslo.middleware>=2.6.1 # Apache-2.0 +oslo.concurrency>=3.5.0 # Apache-2.0 +oslo.db>=4.1.0 # Apache-2.0 +oslo.i18n>=2.1.0 # Apache-2.0 +oslo.log>=1.14.0 # Apache-2.0 +oslo.messaging>=4.0.0 # Apache-2.0 +oslo.middleware>=3.0.0 # Apache-2.0 oslo.policy>=0.5.0 # Apache-2.0 -oslo.utils>=2.0.0 # Apache-2.0 -SQLAlchemy<1.1.0,>=0.9.7 -six>=1.9.0 +oslo.utils>=3.5.0 # Apache-2.0 +SQLAlchemy<1.1.0,>=1.0.10 # MIT +six>=1.9.0 # MIT stevedore>=1.5.0 # Apache-2.0 diff --git a/setup.py b/setup.py index d8080d05..782bb21f 100644 --- a/setup.py +++ b/setup.py @@ -25,5 +25,5 @@ except ImportError: pass setuptools.setup( - setup_requires=['pbr>=1.3'], + setup_requires=['pbr>=1.8'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index e2443618..b7614330 100644 --- a/test-requirements.txt +++ b/test-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. hacking<0.10,>=0.9.2 -coverage>=3.6 -discover -gabbi>=1.1.4 # Apache-2.0 -mox3>=0.7.0 -testscenarios>=0.4 -testrepository>=0.0.18 -mock>=1.2 -sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 -oslosphinx>=2.5.0 # Apache-2.0 +coverage>=3.6 # Apache-2.0 +discover # BSD +gabbi>=1.11.0 # Apache-2.0 +mox3>=0.7.0 # Apache-2.0 +testscenarios>=0.4 # Apache-2.0/BSD +testrepository>=0.0.18 # Apache-2.0/BSD +mock>=1.2 # 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 -sphinxcontrib-httpdomain -sphinxcontrib-pecanwsme>=0.8 +sphinxcontrib-httpdomain # BSD +sphinxcontrib-pecanwsme>=0.8 # Apache-2.0