Updated from global requirements

There are some incompatible requirements that make installing
Heat and Murano impossible.

Change-Id: Ic89ef3f67dbdb2075629dcd8a033eabdee82cbb3
This commit is contained in:
Angus Salkeld 2015-03-25 17:39:29 +10:00
parent 4e54b4ef4c
commit c49eb48ce7
2 changed files with 14 additions and 14 deletions

View File

@ -5,7 +5,7 @@ pbr>=0.6,!=0.7,<1.0
Babel>=1.3 Babel>=1.3
SQLAlchemy>=0.9.7,<=0.9.99 SQLAlchemy>=0.9.7,<=0.9.99
alembic>=0.7.2 alembic>=0.7.2
eventlet>=0.16.1 eventlet>=0.16.1,!=0.17.0
PasteDeploy>=1.5.0 PasteDeploy>=1.5.0
Routes>=1.12.3,!=2.0 Routes>=1.12.3,!=2.0
WebOb>=1.2.3 WebOb>=1.2.3
@ -13,25 +13,25 @@ kombu>=2.5.0
lockfile>=0.8 lockfile>=0.8
psutil>=1.1.1,<2.0.0 psutil>=1.1.1,<2.0.0
iso8601>=0.1.9 iso8601>=0.1.9
six>=1.7.0 six>=1.9.0
netaddr>=0.7.12 netaddr>=0.7.12
PyYAML>=3.1.0 PyYAML>=3.1.0
jsonpatch>=1.1 jsonpatch>=1.1
keystonemiddleware>=1.0.0 keystonemiddleware>=1.5.0
# For paste.util.template used in keystone.common.template # For paste.util.template used in keystone.common.template
Paste Paste
jsonschema>=2.0.0,<3.0.0 jsonschema>=2.0.0,<3.0.0
python-keystoneclient>=1.1.0 python-keystoneclient>=1.1.0
python-heatclient>=0.2.9 python-heatclient>=0.3.0
python-neutronclient>=2.3.6,<3 python-neutronclient>=2.3.11,<3
oslo.db>=1.1.0 # Apache-2.0 oslo.db>=1.7.0,<1.8.0 # Apache-2.0
oslo.config>=1.4.0 # Apache-2.0 oslo.config>=1.9.3,<1.10.0 # Apache-2.0
oslo.messaging>=1.4.0,!=1.5.0 oslo.messaging>=1.8.0,<1.9.0 # Apache-2.0
oslo.serialization>=1.0.0 # Apache-2.0 oslo.serialization>=1.4.0,<1.5.0 # Apache-2.0
oslo.utils>=1.1.0 # Apache-2.0 oslo.utils>=1.4.0,<1.5.0 # Apache-2.0
oslo.i18n>=1.3.0 oslo.i18n>=1.5.0,<1.6.0 # Apache-2.0
# not listed in global requirements # not listed in global requirements
yaql>=0.2.3,<0.3 yaql>=0.2.3,<0.3

View File

@ -7,10 +7,10 @@ coverage>=3.6
discover discover
fixtures>=0.3.14 fixtures>=0.3.14
mock>=1.0 mock>=1.0
oslotest>=1.2.0 # Apache-2.0 oslotest>=1.5.1,<1.6.0 # Apache-2.0
posix_ipc posix_ipc
sqlalchemy-migrate>=0.9.1,!=0.9.2 sqlalchemy-migrate>=0.9.5
tempest-lib>=0.2.0 tempest-lib>=0.4.0
testrepository>=0.0.18 testrepository>=0.0.18
testresources>=0.2.4 testresources>=0.2.4
testscenarios>=0.4 testscenarios>=0.4