diff --git a/requirements.txt b/requirements.txt index 734e924e9..243cf39b3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,28 +1,32 @@ -pbr>=0.6,!=0.7,<1.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. +pbr>=1.6 Paste 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' anyjson>=0.3.3 argparse Babel>=1.3 -eventlet>=0.16.1,!=0.17.0 +eventlet>=0.17.4 greenlet>=0.3.2 httplib2>=0.7.5 -requests>=2.2.0,!=2.4.0 +requests!=2.8.0,>=2.5.2 iso8601>=0.1.9 -kombu>=2.5.0 -netaddr>=0.7.12 -SQLAlchemy<1.1.0,>=0.9.7 +kombu>=3.0.7 +netaddr!=0.7.16,>=0.7.12 +SQLAlchemy<1.1.0,>=0.9.9 WebOb>=1.2.3 -python-heatclient>=0.3.0 -python-keystoneclient>=1.1.0 -alembic>=0.7.2 +python-heatclient>=0.6.0 +python-keystoneclient!=1.8.0,>=1.6.0 +alembic>=0.8.0 six>=1.9.0 stevedore>=1.5.0 # Apache-2.0 -oslo.config>=1.11.0 # Apache-2.0 -oslo.messaging!=1.17.0,!=1.17.1,>=1.16.0 # Apache-2.0 +oslo.config>=2.7.0 # Apache-2.0 +oslo.messaging!=2.8.0,>2.6.1 # Apache-2.0 oslo.rootwrap>=2.0.0 # Apache-2.0 -oslosphinx>=2.5.0,<2.6.0 # Apache-2.0 -python-novaclient>=2.22.0 +oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0 +python-novaclient!=2.33.0,>=2.29.0 tosca-parser>=0.1.0 diff --git a/setup.py b/setup.py index 736375744..782bb21f0 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 c322b4cc2..7f1b41481 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -5,18 +5,18 @@ # Despite above warning added by global sync process, please use # ascii betical order. -cliff>=1.10.0,<1.11.0 # Apache-2.0 +cliff>=1.14.0 # Apache-2.0 coverage>=3.6 discover doc8 # Apache-2.0 -fixtures>=0.3.14 -hacking>=0.9.2,<0.10 -mock>=1.0 +fixtures>=1.3.1 +hacking<0.10,>=0.9.2 +mock>=1.2 python-subunit>=0.0.18 ordereddict -sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 -oslotest>=1.10.0 -tempest-lib>=0.6.1 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 +oslotest>=1.10.0 # Apache-2.0 +tempest-lib>=0.10.0 testrepository>=0.0.18 -testtools>=0.9.36,!=1.2.0 +testtools>=1.4.0 WebTest>=2.0