Fix requirements to fit for gate test

The requirements project has updated
https://github.com/openstack/requirements/blob/master/global-requirements.txt

which can cause failure for gate job

http://logs.openstack.org/74/173374/3/gate/gate-magnum-python27/a382639/console.html

So we need to update local requirements before integrate
to requirements project.

Closes-Bug: #1444230

Change-Id: I74e4bf0cf3e4451bc87abd5e4c19e9901d16e05a
This commit is contained in:
Kennan 2015-04-15 09:54:23 +08:00
parent fd6aee2844
commit 6a07d7c7dc
2 changed files with 36 additions and 36 deletions

View File

@ -2,28 +2,28 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
pbr>=0.6,!=0.7,<1.0 # Apache-2.0
Babel>=1.3 # MIT
requests>=2.2.0,!=2.4.0 # Apache-2.0
pbr>=0.6,!=0.7,<1.0
Babel>=1.3
requests>=2.2.0,!=2.4.0
oslo.concurrency>=1.4.1 # Apache-2.0
oslo.config>=1.6.0 # Apache-2.0
oslo.context>=0.1.0 # Apache-2.0
oslo.db>=1.4.1 # Apache-2.0
oslo.messaging>=1.6.0 # Apache-2.0
oslo.serialization>=1.2.0 # Apache-2.0
oslo.utils>=1.2.0 # Apache-2.0
paramiko>=1.13.0 # LGPL
pecan>=0.8.0 # BSD
keystonemiddleware>=1.0.0 # Apache-2.0
oslo.i18n>=1.3.0 # Apache-2.0
python-heatclient>=0.2.9 # Apache-2.0
python-keystoneclient>=1.1.0 # Apache-2.0
python-glanceclient>=0.15.0 # Apache-2.0
python-kubernetes>=0.2 # Apache-2.0
six>=1.7.0 # MIT
SQLAlchemy>=0.9.7,<=0.9.99 # MIT
taskflow>=0.6 # Apache-2.0
WSME>=0.6 # MIT
docker-py>=0.5.1 # Apache-2.0
jsonpatch>=1.1 # Modified BSD http://tinyurl.com/kghfvjw
oslo.concurrency>=1.8.0,<1.9.0 # Apache-2.0
oslo.config>=1.9.3,<1.10.0 # Apache-2.0
oslo.context>=0.2.0,<0.3.0 # Apache-2.0
oslo.db>=1.7.0,<1.8.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
paramiko>=1.13.0
pecan>=0.8.0
keystonemiddleware>=1.5.0
oslo.i18n>=1.5.0,<1.6.0 # Apache-2.0
python-heatclient>=0.3.0
python-keystoneclient>=1.1.0
python-glanceclient>=0.15.0
python-kubernetes>=0.2
six>=1.9.0
SQLAlchemy>=0.9.7,<=0.9.99
taskflow>=0.7.1,<0.8.0
WSME>=0.6
docker-py>=0.5.1
jsonpatch>=1.1

View File

@ -4,15 +4,15 @@
hacking<0.11,>=0.10.0 # Apache-2.0
coverage>=3.6 # BSD
discover # BSD
fixtures>=0.3.14 # Apache-2.0
mock>=1.0 # BSD
nose # LGPL
python-subunit>=0.0.18 # Apache-2.0 or BSD 3-clause
sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3 # BSD
oslosphinx>=2.2.0 # Apache-2.0
oslotest>=1.2.0 # Apache-2.0
testrepository>=0.0.18 # Apache-2.0
testscenarios>=0.4 # Apache-2.0 or BSD 3-clause
testtools>=0.9.36,!=1.2.0 # MIT
coverage>=3.6
discover
fixtures>=0.3.14
mock>=1.0
nose
python-subunit>=0.0.18
sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
oslosphinx>=2.5.0,<2.6.0 # Apache-2.0
oslotest>=1.5.1,<1.6.0 # Apache-2.0
testrepository>=0.0.18
testscenarios>=0.4
testtools>=0.9.36,!=1.2.0