Updated from global requirements

Two additional changes are needed here:

1. pbr should come first in the requirements file
   since it controls the installs for other projects.

2. pycadf needs to come before Babel because pycadf
   has a capped requirement on pytz but Babel doesn't,
   and pycadf needs to come before oslo.config because
   pycadf has a capped requirement on netaddr but
   oslo.config doesn't.

Change-Id: Id18916953f6e1bae3688216eaf809c2086b4af13
This commit is contained in:
OpenStack Proposal Bot 2015-05-07 15:03:04 +00:00 committed by Matt Riedemann
parent cbcf64fa74
commit dc2d5073ec
2 changed files with 28 additions and 24 deletions

View File

@ -2,15 +2,19 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
Babel>=1.3
iso8601>=0.1.9
oslo.config>=1.4.0 # Apache-2.0
oslo.i18n>=1.0.0 # Apache-2.0
oslo.serialization>=1.0.0 # Apache-2.0
oslo.utils>=1.1.0 # Apache-2.0
pbr>=0.6,!=0.7,<1.0
pycadf>=0.6.0
python-keystoneclient>=0.11.1
requests>=2.2.0,!=2.4.0
six>=1.7.0
WebOb>=1.2.3
# NOTE(mriedem): pycadf needs to come before Babel because of an uncapped
# common dependency on pytz and it needs to come before oslo.config because
# of an uncapped common dependency on netaddr.
pycadf>=0.6.0,<0.7.0 # Apache-2.0
Babel>=1.3,<=1.3
iso8601>=0.1.9,<=0.1.10
oslo.config>=1.4.0,<=1.6.0 # Apache-2.0
oslo.i18n>=1.0.0,<=1.3.1 # Apache-2.0
oslo.serialization>=1.0.0,<=1.2.0 # Apache-2.0
oslo.utils>=1.4.0,<1.5.0 # Apache-2.0
python-keystoneclient>=0.10.0,<1.2.0
requests>=2.1.0,!=2.4.0,<=2.2.1
six>=1.7.0,<=1.9.0
WebOb>=1.2.3,<=1.3.1

View File

@ -2,17 +2,17 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
coverage>=3.6
discover
fixtures>=0.3.14
coverage>=3.6,<=3.7.1
discover<=0.4.0
fixtures>=0.3.14,<=1.0.0
hacking>=0.8.0,<0.9
mock>=1.0
pycrypto>=2.6
oslosphinx>=2.2.0 # Apache-2.0
oslotest>=1.2.0 # Apache-2.0
oslo.messaging>=1.4.0,!=1.5.0
requests-mock>=0.5.1 # Apache-2.0
sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
testrepository>=0.0.18
testresources>=0.2.4
testtools>=0.9.36,!=1.2.0
mock>=1.0,<=1.0.1
pycrypto>=2.6,<=2.6.1
oslosphinx>=2.2.0,<2.5.0 # Apache-2.0
oslotest>=1.1.0,<1.4.0 # Apache-2.0
oslo.messaging>=1.4.0,<1.5.0
requests-mock>=0.4.0 # Apache-2.0
sphinx>=1.1.2,!=1.2.0,<1.3
testrepository>=0.0.18,<=0.0.20
testresources>=0.2.4,<=0.2.7
testtools>=0.9.34,!=1.4.0,<=1.5.0