Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2014-09-17 12:55:09 +00:00 committed by Gerrit Code Review
commit 73d6b210f3
4 changed files with 8 additions and 8 deletions

View File

@ -2,8 +2,8 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
oslo.config>=1.2.1
oslo.utils>=0.2.0
oslo.config>=1.4.0.0a3
oslo.utils>=0.3.0 # Apache-2.0
stevedore>=0.14
# for jsonutils

View File

@ -3,7 +3,7 @@
# process, which may cause wedges in the gate later.
oslo.config>=1.4.0.0a3
oslo.utils>=0.2.0
oslo.utils>=0.3.0 # Apache-2.0
stevedore>=0.14
# for jsonutils
@ -12,7 +12,7 @@ six>=1.7.0
# FIXME(markmc): remove this when the drivers no longer
# import eventlet
eventlet>=0.13.0
eventlet>=0.15.1
# used by openstack/common/gettextutils.py
Babel>=1.3

View File

@ -13,7 +13,7 @@ python-subunit>=0.0.18
testrepository>=0.0.18
testscenarios>=0.4
testtools>=0.9.34
oslotest
oslotest>=1.1.0.0a2
# when we can require tox>= 1.4, this can go into tox.ini:
# [testenv:cover]
@ -22,4 +22,4 @@ coverage>=3.6
# this is required for the docs build jobs
sphinx>=1.1.2,!=1.2.0,<1.3
oslosphinx
oslosphinx>=2.2.0.0a2

View File

@ -13,7 +13,7 @@ python-subunit>=0.0.18
testrepository>=0.0.18
testscenarios>=0.4
testtools>=0.9.34
oslotest
oslotest>=1.1.0.0a2
# for test_qpid
qpid-python
@ -25,4 +25,4 @@ coverage>=3.6
# this is required for the docs build jobs
sphinx>=1.1.2,!=1.2.0,<1.3
oslosphinx
oslosphinx>=2.2.0.0a2