From 0f7362083f180ab3f25ea84e3713a6169e6b172b Mon Sep 17 00:00:00 2001 From: Lingxian Kong Date: Tue, 4 Jul 2017 15:00:21 +1200 Subject: [PATCH] Updated from global requirements Change-Id: Ib75da5b56ce71f33f433906df175e21f58cc947d --- requirements.txt | 22 +++++++++++----------- setup.py | 2 +- test-requirements.txt | 12 ++++++------ 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/requirements.txt b/requirements.txt index 898ab3d0..abe13ef5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,16 +2,16 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -pbr>=2.0 # Apache-2.0 +pbr!=2.1.0,>=2.0.0 # Apache-2.0 Babel!=2.4.0,>=2.3.4 # BSD -eventlet!=0.18.3,>=0.18.2 # MIT -keystoneauth1>=2.20.0 # Apache-2.0 +eventlet!=0.18.3,!=0.20.1,<0.21.0,>=0.18.2 # MIT +keystoneauth1>=2.21.0 # Apache-2.0 keystonemiddleware>=4.12.0 # Apache-2.0 oslo.concurrency>=3.8.0 # Apache-2.0 -oslo.config>=3.22.0 # Apache-2.0 -oslo.db>=4.19.0 # Apache-2.0 -oslo.messaging>=5.19.0 # Apache-2.0 -oslo.policy>=1.17.0 # Apache-2.0 +oslo.config!=4.3.0,!=4.4.0,>=4.0.0 # Apache-2.0 +oslo.db>=4.23.0 # Apache-2.0 +oslo.messaging!=5.25.0,>=5.24.2 # Apache-2.0 +oslo.policy>=1.23.0 # Apache-2.0 oslo.utils>=3.20.0 # Apache-2.0 oslo.log>=3.22.0 # Apache-2.0 oslo.serialization>=1.10.0 # Apache-2.0 @@ -19,10 +19,10 @@ oslo.service>=1.10.0 # Apache-2.0 pecan!=1.0.2,!=1.0.3,!=1.0.4,!=1.2,>=1.0.0 # BSD setuptools!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,!=34.3.1,!=34.3.2,>=16.0 # PSF/ZPL six>=1.9.0 # MIT -SQLAlchemy>=1.0.10,!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8 # MIT -sqlalchemy-migrate>=0.9.6 # Apache-2.0 +SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT +sqlalchemy-migrate>=0.11.0 # Apache-2.0 stevedore>=1.20.0 # Apache-2.0 WSME>=0.8 # MIT -kubernetes>=1.0.0b1 # Apache-2.0 +kubernetes>=1.0.0b1 # Apache-2.0 PyYAML>=3.10.0 # MIT -python-swiftclient>=3.2.0 # Apache-2.0 +python-swiftclient>=3.2.0 # Apache-2.0 diff --git a/setup.py b/setup.py index 3887303f..566d8443 100644 --- a/setup.py +++ b/setup.py @@ -25,5 +25,5 @@ except ImportError: pass setuptools.setup( - setup_requires=['pbr>=2.0'], + setup_requires=['pbr>=2.0.0'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index 78affe49..179c0fb0 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.12.0,<0.13 # Apache-2.0 -coverage>=4.0 # Apache-2.0 +hacking<0.13,>=0.12.0 # Apache-2.0 +coverage!=4.4,>=4.0 # Apache-2.0 python-subunit>=0.0.18 # Apache-2.0/BSD -sphinx>=1.5.1 # BSD +sphinx>=1.6.2 # BSD oslosphinx>=4.7.0 # Apache-2.0 oslotest>=1.10.0 # Apache-2.0 -testrepository>=0.0.18 # Apache-2.0/BSD -testscenarios>=0.4 # Apache-2.0/BSD +testrepository>=0.0.18 # Apache-2.0/BSD +testscenarios>=0.4 # Apache-2.0/BSD testtools>=1.4.0 # MIT # releasenotes -reno>=1.8.0 # Apache-2.0 +reno!=2.3.1,>=1.8.0 # Apache-2.0