From b3d8db07ec326b2868a520b365370b3d121c29dd Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Mon, 3 Jul 2017 16:13:59 +0000 Subject: [PATCH] Updated from global requirements Change-Id: I28b0a6d5db8b0646599e1a7352e31dfdd112a82d --- requirements.txt | 24 ++++++++++++------------ setup.py | 2 +- test-requirements.txt | 10 +++++----- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/requirements.txt b/requirements.txt index e397b07..d38ebc0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,28 +2,28 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -pbr!=2.1.0,>=2.0.0 # Apache-2.0 +pbr>=1.8 # Apache-2.0 -SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT +SQLAlchemy<1.1.0,>=1.0.10 # MIT alembic>=0.8.10 # MIT eventlet!=0.18.3,>=0.18.2 # MIT PasteDeploy>=1.5.0 # MIT 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 -WebOb>=1.7.1 # MIT +WebOb>=1.6.0 # MIT httplib2>=0.7.5 # MIT -oslo.config>=3.22.0 # Apache-2.0 +oslo.config!=3.18.0,>=3.14.0 # Apache-2.0 oslo.concurrency>=3.8.0 # Apache-2.0 -oslo.context>=2.12.0 # Apache-2.0 +oslo.context>=2.9.0 # Apache-2.0 oslo.service>=1.10.0 # Apache-2.0 -oslo.utils>=3.20.0 # Apache-2.0 +oslo.utils>=3.18.0 # Apache-2.0 futurist!=0.15.0,>=0.11.0 # Apache-2.0 -keystoneauth1>=2.20.0 # Apache-2.0 +keystoneauth1>=2.18.0 # Apache-2.0 keystonemiddleware>=4.12.0 # Apache-2.0 python-memcached>=1.56 # PSF WSME>=0.8 # MIT PyJWT>=1.0.1 # MIT -cryptography>=1.6 # BSD/Apache-2.0 +cryptography!=1.3.0,>=1.0 # BSD/Apache-2.0 # For paste.util.template used in keystone.common.template Paste # MIT @@ -34,11 +34,11 @@ pyOpenSSL>=0.14 # Apache-2.0 # Required by openstack.common libraries six>=1.9.0 # MIT -oslo.db>=4.19.0 # Apache-2.0 +oslo.db>=4.15.0 # Apache-2.0 oslo.i18n>=2.1.0 # Apache-2.0 -oslo.log>=3.22.0 # Apache-2.0 -oslo.messaging>=5.19.0 # Apache-2.0 -oslo.middleware>=3.10.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.policy>=1.17.0 # Apache-2.0 oslo.serialization>=1.10.0 # Apache-2.0 oslo.versionedobjects>=1.17.0 # Apache-2.0 diff --git a/setup.py b/setup.py index 566d844..782bb21 100644 --- a/setup.py +++ b/setup.py @@ -25,5 +25,5 @@ except ImportError: pass setuptools.setup( - setup_requires=['pbr>=2.0.0'], + setup_requires=['pbr>=1.8'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index 583c5b8..9027071 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -6,21 +6,21 @@ hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0 # For translations processing -Babel!=2.4.0,>=2.3.4 # BSD +Babel>=2.3.4 # BSD # Needed for testing bandit>=1.1.0 # Apache-2.0 -coverage!=4.4,>=4.0 # Apache-2.0 +coverage>=4.0 # Apache-2.0 fixtures>=3.0.0 # Apache-2.0/BSD mox3!=0.19.0,>=0.7.0 # Apache-2.0 mock>=2.0 # BSD -sphinx>=1.5.1 # BSD -requests!=2.12.2,!=2.13.0,>=2.10.0 # Apache-2.0 +sphinx!=1.3b1,<1.4,>=1.2.1 # BSD +requests!=2.12.2,>=2.10.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 -psutil>=3.2.2 # BSD +psutil>=3.0.1 # BSD oslotest>=1.10.0 # Apache-2.0 os-testr>=0.8.0 # Apache-2.0