Merge "Updated from global requirements" into stable/kilo
This commit is contained in:
commit
4f0c41df05
|
@ -2,7 +2,7 @@
|
||||||
# of appearance. Changing the order has an impact on the overall integration
|
# of appearance. Changing the order has an impact on the overall integration
|
||||||
# process, which may cause wedges in the gate later.
|
# process, which may cause wedges in the gate later.
|
||||||
|
|
||||||
pbr>=0.6,!=0.7,<1.0
|
pbr!=0.7,<1.0,>=0.6
|
||||||
#
|
#
|
||||||
# The greenlet package must be compiled with gcc and needs
|
# The greenlet package must be compiled with gcc and needs
|
||||||
# the Python.h headers. Make sure you install the python-dev
|
# the Python.h headers. Make sure you install the python-dev
|
||||||
|
@ -10,55 +10,55 @@ pbr>=0.6,!=0.7,<1.0
|
||||||
greenlet>=0.3.2
|
greenlet>=0.3.2
|
||||||
|
|
||||||
# < 0.8.0/0.8 does not work, see https://bugs.launchpad.net/bugs/1153983
|
# < 0.8.0/0.8 does not work, see https://bugs.launchpad.net/bugs/1153983
|
||||||
SQLAlchemy>=0.9.7,<=0.9.99
|
SQLAlchemy<=0.9.99,>=0.9.7
|
||||||
anyjson>=0.3.3
|
anyjson>=0.3.3
|
||||||
eventlet>=0.16.1,!=0.17.0
|
eventlet!=0.17.0,>=0.16.1
|
||||||
PasteDeploy>=1.5.0
|
PasteDeploy>=1.5.0
|
||||||
Routes>=1.12.3,!=2.0
|
Routes!=2.0,>=1.12.3
|
||||||
WebOb>=1.2.3
|
WebOb>=1.2.3
|
||||||
sqlalchemy-migrate>=0.9.5
|
sqlalchemy-migrate>=0.9.5
|
||||||
httplib2>=0.7.5
|
httplib2>=0.7.5
|
||||||
kombu>=2.5.0
|
kombu>=2.5.0
|
||||||
pycrypto>=2.6
|
pycrypto>=2.6
|
||||||
iso8601>=0.1.9
|
iso8601>=0.1.9
|
||||||
oslo.config>=1.9.3,<1.10.0 # Apache-2.0
|
oslo.config<1.10.0,>=1.9.3 # Apache-2.0
|
||||||
oslo.concurrency>=1.8.0,<1.9.0 # Apache-2.0
|
oslo.concurrency<1.9.0,>=1.8.0 # Apache-2.0
|
||||||
oslo.context>=0.2.0,<0.3.0 # Apache-2.0
|
oslo.context<0.3.0,>=0.2.0 # Apache-2.0
|
||||||
oslo.utils>=1.4.0,<1.5.0 # Apache-2.0
|
oslo.utils<1.5.0,>=1.4.0 # Apache-2.0
|
||||||
stevedore>=1.3.0,<1.4.0 # Apache-2.0
|
stevedore<1.4.0,>=1.3.0 # Apache-2.0
|
||||||
taskflow>=0.7.1,<0.8.0
|
taskflow<0.8.0,>=0.7.1
|
||||||
keystonemiddleware>=1.5.0,<1.6.0
|
keystonemiddleware<1.6.0,>=1.5.0
|
||||||
WSME>=0.6,<0.7
|
WSME<0.7,>=0.6
|
||||||
# For openstack/common/lockutils
|
# For openstack/common/lockutils
|
||||||
posix_ipc
|
posix-ipc
|
||||||
|
|
||||||
# For Swift storage backend.
|
# For Swift storage backend.
|
||||||
python-swiftclient>=2.2.0,<2.5.0
|
python-swiftclient<2.5.0,>=2.2.0
|
||||||
|
|
||||||
# For VMware storage backed.
|
# For VMware storage backed.
|
||||||
oslo.vmware>=0.11.1,<0.12.0 # Apache-2.0
|
oslo.vmware<0.12.0,>=0.11.1 # Apache-2.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<3.0.0,>=2.0.0
|
||||||
python-keystoneclient>=1.1.0,<1.4.0
|
python-keystoneclient<1.4.0,>=1.2.0
|
||||||
pyOpenSSL>=0.11
|
pyOpenSSL>=0.11
|
||||||
# Required by openstack.common libraries
|
# Required by openstack.common libraries
|
||||||
six>=1.9.0
|
six>=1.9.0
|
||||||
|
|
||||||
oslo.db>=1.7.0,<1.8.0 # Apache-2.0
|
oslo.db<1.8.0,>=1.7.0 # Apache-2.0
|
||||||
oslo.i18n>=1.5.0,<1.6.0 # Apache-2.0
|
oslo.i18n<1.6.0,>=1.5.0 # Apache-2.0
|
||||||
oslo.log>=1.0.0,<1.1.0 # Apache-2.0
|
oslo.log<1.1.0,>=1.0.0 # Apache-2.0
|
||||||
oslo.messaging>=1.8.0,<1.9.0 # Apache-2.0
|
oslo.messaging<1.9.0,>=1.8.0 # Apache-2.0
|
||||||
oslo.policy>=0.3.1,<0.4.0 # Apache-2.0
|
oslo.policy<0.4.0,>=0.3.1 # Apache-2.0
|
||||||
oslo.serialization>=1.4.0,<1.5.0 # Apache-2.0
|
oslo.serialization<1.5.0,>=1.4.0 # Apache-2.0
|
||||||
|
|
||||||
retrying>=1.2.3,!=1.3.0 # Apache-2.0
|
retrying!=1.3.0,>=1.2.3 # Apache-2.0
|
||||||
osprofiler>=0.3.0 # Apache-2.0
|
osprofiler>=0.3.0 # Apache-2.0
|
||||||
|
|
||||||
# Glance Store
|
# Glance Store
|
||||||
glance_store>=0.3.0,<0.5.0 # Apache-2.0
|
glance-store<0.5.0,>=0.3.0 # Apache-2.0
|
||||||
|
|
||||||
# Artifact repository
|
# Artifact repository
|
||||||
semantic_version>=2.3.1
|
semantic-version>=2.3.1
|
||||||
|
|
1
setup.py
1
setup.py
|
@ -1,4 +1,3 @@
|
||||||
#!/usr/bin/env python
|
|
||||||
# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
|
# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
|
||||||
#
|
#
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
# process, which may cause wedges in the gate later.
|
# process, which may cause wedges in the gate later.
|
||||||
|
|
||||||
# Hacking already pins down pep8, pyflakes and flake8
|
# Hacking already pins down pep8, pyflakes and flake8
|
||||||
hacking>=0.10.0,<0.11
|
hacking<0.11,>=0.10.0
|
||||||
|
|
||||||
# For translations processing
|
# For translations processing
|
||||||
Babel>=1.3
|
Babel>=1.3
|
||||||
|
@ -13,13 +13,13 @@ coverage>=3.6
|
||||||
discover
|
discover
|
||||||
fixtures>=0.3.14
|
fixtures>=0.3.14
|
||||||
mox3>=0.7.0
|
mox3>=0.7.0
|
||||||
mock>=1.0
|
mock<1.1.0,>=1.0
|
||||||
sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
|
sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
|
||||||
requests>=2.2.0,!=2.4.0
|
requests!=2.4.0,>=2.2.0
|
||||||
testrepository>=0.0.18
|
testrepository>=0.0.18
|
||||||
testtools>=0.9.36,!=1.2.0
|
testtools!=1.2.0,>=0.9.36
|
||||||
psutil>=1.1.1,<2.0.0
|
psutil<2.0.0,>=1.1.1
|
||||||
oslotest>=1.5.1,<1.6.0 # Apache-2.0
|
oslotest<1.6.0,>=1.5.1 # Apache-2.0
|
||||||
# Optional packages that should be installed when testing
|
# Optional packages that should be installed when testing
|
||||||
MySQL-python
|
MySQL-python
|
||||||
psycopg2
|
psycopg2
|
||||||
|
@ -28,7 +28,7 @@ qpid-python
|
||||||
xattr>=0.4
|
xattr>=0.4
|
||||||
|
|
||||||
# Documentation
|
# Documentation
|
||||||
oslosphinx>=2.5.0,<2.6.0 # Apache-2.0
|
oslosphinx<2.6.0,>=2.5.0 # Apache-2.0
|
||||||
|
|
||||||
# Glance catalog index
|
# Glance catalog index
|
||||||
elasticsearch>=1.3.0
|
elasticsearch>=1.3.0
|
||||||
|
|
Loading…
Reference in New Issue