From defc679a0fac6581ea668eb6c71fd3a27c54d74b Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Thu, 7 Jan 2016 18:34:05 +0000 Subject: [PATCH] Updated from global requirements Change-Id: Iec568b7bf0a2b7a30c15f6a7ed0a33c1d4e6cb50 --- requirements.txt | 49 ++++++++++++++++++++++--------------------- setup.py | 3 +-- test-requirements.txt | 20 +++++++++--------- 3 files changed, 36 insertions(+), 36 deletions(-) diff --git a/requirements.txt b/requirements.txt index 424753d7..bf2c1eb6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,46 +2,47 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -pbr>=0.11,<2.0 +pbr>=1.6 # The greenlet package must be compiled with gcc and needs # the Python.h headers. Make sure you install the python-dev # package to get the right headers... greenlet>=0.3.2 -eventlet>=0.17.3 +eventlet>=0.17.4 PasteDeploy>=1.5.0 -Routes>=1.12.3,!=2.0 +Routes!=2.0,!=2.1,>=1.12.3;python_version=='2.7' +Routes!=2.0,>=1.12.3;python_version!='2.7' WebOb>=1.2.3 -oslo.config>=1.11.0 # Apache-2.0 -oslo.concurrency>=1.8.0 # Apache-2.0 -oslo.context>=0.2.0 # Apache-2.0 -oslo.middleware>=2.8.0 # Apache-2.0 -oslo.service>=0.1.0 # Apache-2.0 -oslo.utils>=1.6.0 # Apache-2.0 -stevedore>=1.3.0 # Apache-2.0 -keystonemiddleware>=1.5.0 -WSME>=0.6 +oslo.config>=3.2.0 # Apache-2.0 +oslo.concurrency>=2.3.0 # Apache-2.0 +oslo.context>=0.2.0 # Apache-2.0 +oslo.middleware>=3.0.0 # Apache-2.0 +oslo.service>=1.0.0 # Apache-2.0 +oslo.utils>=3.2.0 # Apache-2.0 +stevedore>=1.5.0 # Apache-2.0 +keystonemiddleware>=4.0.0 +WSME>=0.8 # For paste.util.template used in keystone.common.template Paste -python-keystoneclient>=1.3.0 -pyOpenSSL>=0.11 +python-keystoneclient!=1.8.0,>=1.6.0 +pyOpenSSL>=0.14 # Required by openstack.common libraries six>=1.9.0 -oslo.i18n>=1.5.0 # Apache-2.0 -oslo.log>=1.0.0 # Apache-2.0 -oslo.messaging>=1.8.0 # Apache-2.0 -oslo.policy>=0.3.1 # Apache-2.0 -oslo.serialization>=1.4.0 # Apache-2.0 +oslo.i18n>=1.5.0 # Apache-2.0 +oslo.log>=1.14.0 # Apache-2.0 +oslo.messaging!=2.8.0,!=3.1.0,>2.6.1 # Apache-2.0 +oslo.policy>=0.5.0 # Apache-2.0 +oslo.serialization>=1.10.0 # Apache-2.0 -osprofiler>=0.3.0 # Apache-2.0 +osprofiler>=0.3.1 # Apache-2.0 -elasticsearch>=1.3.0,<2.0 +elasticsearch<2.0,>=1.3.0 # Clients required for indexing plugins -python-designateclient>=1.0.0 -python-glanceclient>=0.18 -python-novaclient>=2.26.0 +python-designateclient>=1.5.0 +python-glanceclient>=1.2.0 +python-novaclient!=2.33.0,>=2.29.0 diff --git a/setup.py b/setup.py index 73637574..782bb21f 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,3 @@ -#!/usr/bin/env python # Copyright (c) 2013 Hewlett-Packard Development Company, L.P. # # Licensed under the Apache License, Version 2.0 (the "License"); @@ -26,5 +25,5 @@ except ImportError: pass setuptools.setup( - setup_requires=['pbr'], + setup_requires=['pbr>=1.8'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index b8ce9678..20c5b382 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -3,7 +3,7 @@ # process, which may cause wedges in the gate later. # Hacking already pins down pep8, pyflakes and flake8 -hacking>=0.10.0,<0.11 +hacking<0.11,>=0.10.0 # For translations processing Babel>=1.3 @@ -11,18 +11,18 @@ Babel>=1.3 # Needed for testing coverage>=3.6 discover -fixtures>=0.3.14 +fixtures>=1.3.1 mox3>=0.7.0 -mock>=1.0 -sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 -requests>=2.5.2 +mock>=1.2 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 +requests!=2.9.0,>=2.8.1 testrepository>=0.0.18 -testtools>=0.9.36,!=1.2.0 -psutil>=1.1.1,<2.0.0 -oslotest>=1.5.1 # Apache-2.0 -reno>=0.1.1 # Apache2 +testtools>=1.4.0 +psutil<2.0.0,>=1.1.1 +oslotest>=1.10.0 # Apache-2.0 +reno>=0.1.1 # Apache2 simplejson>=2.2.0 httplib2>=0.7.5 # Documentation -oslosphinx>=2.5.0 # Apache-2.0 +oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0