From 0c911cd7e0985edd9c303825626d24ef943b129e Mon Sep 17 00:00:00 2001 From: Pierre Riteau Date: Tue, 21 Mar 2017 06:32:04 -0500 Subject: [PATCH] Updated from global requirements The kombu update is required to fix conflicts with other projects installing version 4.0.1. Change-Id: I38462381f24721197ddbb3a6455439aa23747d5e --- requirements.txt | 24 ++++++++++++------------ setup.py | 2 +- test-requirements.txt | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/requirements.txt b/requirements.txt index 22e7c703..ced1577e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,35 +1,35 @@ # 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.8 # Apache-2.0 +pbr>=2.0.0 # Apache-2.0 -alembic>=0.8.4 # MIT +alembic>=0.8.10 # MIT Babel>=2.3.4 # BSD eventlet!=0.18.3,>=0.18.2 # MIT Flask!=0.11,<1.0,>=0.10 # BSD iso8601>=0.1.11 # MIT -keystonemiddleware!=4.5.0,>=4.2.0 # Apache-2.0 -kombu!=4.0.0,!=4.0.1,>=3.0.25 # BSD +keystonemiddleware>=4.12.0 # Apache-2.0 +kombu!=4.0.2,>=4.0.0 # BSD oslo.concurrency>=3.8.0 # Apache-2.0 -oslo.config!=3.18.0,>=3.14.0 # Apache-2.0 -oslo.db>=4.15.0 # Apache-2.0 +oslo.config>=3.22.0 # Apache-2.0 +oslo.db>=4.15.0 # Apache-2.0 oslo.i18n>=2.1.0 # Apache-2.0 oslo.log>=3.11.0 # Apache-2.0 -oslo.messaging>=5.14.0 # Apache-2.0 -oslo.middleware>=3.0.0 # Apache-2.0 +oslo.messaging>=5.19.0 # Apache-2.0 +oslo.middleware>=3.10.0 # Apache-2.0 oslo.policy>=1.17.0 # Apache-2.0 oslo.serialization>=1.10.0 # Apache-2.0 oslo.service>=1.10.0 # Apache-2.0 -oslo.utils>=3.18.0 # Apache-2.0 -python-novaclient!=2.33.0,>=2.29.0 # Apache-2.0 +oslo.utils>=3.20.0 # Apache-2.0 +python-novaclient>=7.1.0 # Apache-2.0 netaddr!=0.7.16,>=0.7.13 # BSD python-keystoneclient>=3.8.0 # Apache-2.0 pecan!=1.0.2,!=1.0.3,!=1.0.4,!=1.2,>=1.0.0 # BSD sqlalchemy-migrate>=0.9.6 # Apache-2.0 Routes!=2.0,!=2.1,!=2.3.0,>=1.12.3;python_version=='2.7' # MIT Routes!=2.0,!=2.3.0,>=1.12.3;python_version!='2.7' # MIT -SQLAlchemy<1.1.0,>=1.0.10 # MIT -stevedore>=1.17.1 # Apache-2.0 +SQLAlchemy>=1.0.10 # MIT +stevedore>=1.20.0 # Apache-2.0 WebOb>=1.6.0 # MIT WSME>=0.8 # MIT sphinx>=1.5.1 # BSD diff --git a/setup.py b/setup.py index 782bb21f..566d8443 100644 --- a/setup.py +++ b/setup.py @@ -25,5 +25,5 @@ except ImportError: pass setuptools.setup( - setup_requires=['pbr>=1.8'], + setup_requires=['pbr>=2.0.0'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index 0fb3517e..401aa5b3 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -15,7 +15,7 @@ testtools>=1.4.0 # MIT coverage>=4.0 # Apache-2.0 pylint==1.4.5 # GPLv2 oslotest>=1.10.0 # Apache-2.0 -oslo.context>=2.12.0 # Apache-2.0 +oslo.context>=2.12.0 # Apache-2.0 # Documentation reno>=1.8.0 # Apache-2.0