From 6ebfd525f67181ed48454cea99491eb4303a20eb Mon Sep 17 00:00:00 2001 From: OpenStack Proposal Bot Date: Fri, 13 Nov 2015 17:11:37 +0000 Subject: [PATCH] Updated from global requirements Change-Id: Ibe06fcece3a098781f8b55437727617b2727509f --- requirements.txt | 9 ++++++--- setup.py | 2 +- test-requirements.txt | 27 +++++++++++++++------------ 3 files changed, 22 insertions(+), 16 deletions(-) mode change 100755 => 100644 requirements.txt diff --git a/requirements.txt b/requirements.txt old mode 100755 new mode 100644 index 450c7b147e..faa1f2e347 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,8 @@ -pbr<2.0,>=1.6 -docker-py>=1.1.0 # Apache-2.0 -Jinja2>=2.6 # BSD License (3 clause) +# 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.6 +docker-py>=1.4.0 # Apache-2.0 +Jinja2>=2.6 # BSD License (3 clause) gitdb>=0.6.4 # BSD License (3 clause) GitPython>=1.0.1 # BSD License (3 clause) diff --git a/setup.py b/setup.py index d8080d05c8..782bb21f06 100644 --- a/setup.py +++ b/setup.py @@ -25,5 +25,5 @@ except ImportError: pass setuptools.setup( - setup_requires=['pbr>=1.3'], + setup_requires=['pbr>=1.8'], pbr=True) diff --git a/test-requirements.txt b/test-requirements.txt index e42b9d352c..6a0320b4c1 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -1,18 +1,21 @@ +# 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. hacking>=0.10.0 -oslo.log>=1.0.0 # Apache-2.0 -oslotest>=1.5.1 # Apache-2.0 +oslo.log>=1.12.0 # Apache-2.0 +oslotest>=1.10.0 # Apache-2.0 oslosphinx>=2.5.0 # Apache-2.0 -PyYAML -python-barbicanclient>=3.0.1 -python-ceilometerclient>=1.0.6 -python-cinderclient>=1.1.0 -python-glanceclient>=0.15.0 -python-heatclient>=0.3.0 -python-keystoneclient>=1.1.0 -python-neutronclient>=2.3.11,<3 -python-novaclient>=2.18.0,!=2.21.0 +PyYAML>=3.1.0 +python-barbicanclient>=3.3.0 +python-ceilometerclient>=1.5.0 +python-cinderclient>=1.3.1 +python-glanceclient>=0.18.0 +python-heatclient>=0.6.0 +python-keystoneclient!=1.8.0,>=1.6.0 +python-neutronclient>=2.6.0 +python-novaclient!=2.33.0,>=2.29.0 python-swiftclient>=2.2.0 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 testrepository>=0.0.18 testscenarios>=0.4 -testtools>=0.9.36,!=1.2.0 +testtools>=1.4.0