From c49eb48ce7627b1411e9ebbb0f4fb74bbc43fff3 Mon Sep 17 00:00:00 2001 From: Angus Salkeld Date: Wed, 25 Mar 2015 17:39:29 +1000 Subject: [PATCH] Updated from global requirements There are some incompatible requirements that make installing Heat and Murano impossible. Change-Id: Ic89ef3f67dbdb2075629dcd8a033eabdee82cbb3 --- requirements.txt | 22 +++++++++++----------- test-requirements.txt | 6 +++--- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/requirements.txt b/requirements.txt index 7262dc0e9..ef684780c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,7 +5,7 @@ pbr>=0.6,!=0.7,<1.0 Babel>=1.3 SQLAlchemy>=0.9.7,<=0.9.99 alembic>=0.7.2 -eventlet>=0.16.1 +eventlet>=0.16.1,!=0.17.0 PasteDeploy>=1.5.0 Routes>=1.12.3,!=2.0 WebOb>=1.2.3 @@ -13,25 +13,25 @@ kombu>=2.5.0 lockfile>=0.8 psutil>=1.1.1,<2.0.0 iso8601>=0.1.9 -six>=1.7.0 +six>=1.9.0 netaddr>=0.7.12 PyYAML>=3.1.0 jsonpatch>=1.1 -keystonemiddleware>=1.0.0 +keystonemiddleware>=1.5.0 # For paste.util.template used in keystone.common.template Paste jsonschema>=2.0.0,<3.0.0 python-keystoneclient>=1.1.0 -python-heatclient>=0.2.9 -python-neutronclient>=2.3.6,<3 -oslo.db>=1.1.0 # Apache-2.0 -oslo.config>=1.4.0 # Apache-2.0 -oslo.messaging>=1.4.0,!=1.5.0 -oslo.serialization>=1.0.0 # Apache-2.0 -oslo.utils>=1.1.0 # Apache-2.0 -oslo.i18n>=1.3.0 +python-heatclient>=0.3.0 +python-neutronclient>=2.3.11,<3 +oslo.db>=1.7.0,<1.8.0 # Apache-2.0 +oslo.config>=1.9.3,<1.10.0 # Apache-2.0 +oslo.messaging>=1.8.0,<1.9.0 # Apache-2.0 +oslo.serialization>=1.4.0,<1.5.0 # Apache-2.0 +oslo.utils>=1.4.0,<1.5.0 # Apache-2.0 +oslo.i18n>=1.5.0,<1.6.0 # Apache-2.0 # not listed in global requirements yaql>=0.2.3,<0.3 diff --git a/test-requirements.txt b/test-requirements.txt index 65dbd5bef..4c70d4b08 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -7,10 +7,10 @@ coverage>=3.6 discover fixtures>=0.3.14 mock>=1.0 -oslotest>=1.2.0 # Apache-2.0 +oslotest>=1.5.1,<1.6.0 # Apache-2.0 posix_ipc -sqlalchemy-migrate>=0.9.1,!=0.9.2 -tempest-lib>=0.2.0 +sqlalchemy-migrate>=0.9.5 +tempest-lib>=0.4.0 testrepository>=0.0.18 testresources>=0.2.4 testscenarios>=0.4