From a2690b09dabf5eeaefc41e76b672a1f443c9fdc0 Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Mon, 10 Oct 2016 12:31:21 +0000 Subject: [PATCH] Updated from global requirements Change-Id: Id36e9e19d649a09983f11971600b2b65b16a5d00 --- requirements.txt | 53 +++++++++++++++++++++++-------------------- setup.py | 3 +-- test-requirements.txt | 25 +++++++++++--------- 3 files changed, 43 insertions(+), 38 deletions(-) diff --git a/requirements.txt b/requirements.txt index fd68003..428ffd2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,26 +1,29 @@ -Babel>=2.3.4 # BSD -eventlet!=0.18.3,>=0.18.2 # MIT -greenlet>=0.3.2 # MIT -oslo.config>=3.14.0 # Apache-2.0 -oslo.concurrency>=3.8.0 # Apache-2.0 -oslo.context>=2.9.0 # Apache-2.0 -oslo.db>=4.10.0,!=4.13.1,!=4.13.2 # Apache-2.0 -oslo.log>=3.11.0 # Apache-2.0 -oslo.utils>=3.16.0 # Apache-2.0 -oslo.serialization>=1.10.0 # Apache-2.0 -oslo.service>=1.10.0 # Apache-2.0 +# 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. +Babel>=2.3.4 # BSD +eventlet!=0.18.3,>=0.18.2 # MIT +greenlet>=0.3.2 # MIT +oslo.config>=3.14.0 # Apache-2.0 +oslo.concurrency>=3.8.0 # Apache-2.0 +oslo.context>=2.9.0 # Apache-2.0 +oslo.db!=4.13.1,!=4.13.2,>=4.10.0 # Apache-2.0 +oslo.log>=3.11.0 # Apache-2.0 +oslo.utils>=3.16.0 # Apache-2.0 +oslo.serialization>=1.10.0 # Apache-2.0 +oslo.service>=1.10.0 # Apache-2.0 paramiko>=2.0 # LGPLv2.1+ -Paste # MIT -PasteDeploy>=1.5.0 # MIT -pbr>=1.6 # Apache-2.0 -python-cinderclient>=1.6.0,!=1.7.0,!=1.7.1 # Apache-2.0 -python-glanceclient>=2.5.0 # Apache-2.0 -python-keystoneclient>=2.0.0,!=2.1.0 # Apache-2.0 -python-neutronclient>=5.1.0 # Apache-2.0 -python-novaclient>=2.29.0,!=2.33.0 # Apache-2.0 -Routes>=1.12.3,!=2.0,!=2.1,!=2.3.0;python_version=='2.7' # MIT -Routes>=1.12.3,!=2.0,!=2.3.0;python_version!='2.7' # MIT -six>=1.9.0 # MIT -SQLAlchemy>=1.0.10,<1.1.0 # MIT -sqlalchemy-migrate>=0.9.6 # Apache-2.0 -WebOb>=1.2.3 # MIT +Paste # MIT +PasteDeploy>=1.5.0 # MIT +pbr>=1.6 # Apache-2.0 +python-cinderclient!=1.7.0,!=1.7.1,>=1.6.0 # Apache-2.0 +python-glanceclient>=2.5.0 # Apache-2.0 +python-keystoneclient!=2.1.0,>=2.0.0 # Apache-2.0 +python-neutronclient>=5.1.0 # Apache-2.0 +python-novaclient!=2.33.0,>=2.29.0 # 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 +six>=1.9.0 # MIT +SQLAlchemy<1.1.0,>=1.0.10 # MIT +sqlalchemy-migrate>=0.9.6 # Apache-2.0 +WebOb>=1.2.3 # MIT diff --git a/setup.py b/setup.py index 7363757..782bb21 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 cb9ca6b..c9fea56 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,11 +1,14 @@ -coverage>=3.6 # Apache-2.0 -fixtures>=3.0.0 # Apache-2.0/BSD -hacking>=0.11.0,<0.12 # Apache-2.0 -mox>=0.5.3 # Apache-2.0 -mock>=2.0 # BSD -oslotest>=1.10.0 # Apache-2.0 -pylint==1.4.5 # GPLv2 -python-subunit>=0.0.18 # Apache-2.0/BSD -sphinx>=1.2.1,!=1.3b1,<1.4 # BSD -testrepository>=0.0.18 # Apache-2.0/BSD -testtools>=1.4.0 # MIT +# 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. +coverage>=3.6 # Apache-2.0 +fixtures>=3.0.0 # Apache-2.0/BSD +hacking<0.12,>=0.11.0 # Apache-2.0 +mox>=0.5.3 # Apache-2.0 +mock>=2.0 # BSD +oslotest>=1.10.0 # Apache-2.0 +pylint==1.4.5 # GPLv2 +python-subunit>=0.0.18 # Apache-2.0/BSD +sphinx!=1.3b1,<1.4,>=1.2.1 # BSD +testrepository>=0.0.18 # Apache-2.0/BSD +testtools>=1.4.0 # MIT