Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2017-05-04 14:13:23 +00:00 committed by Gerrit Code Review
commit 3af36d85ad
2 changed files with 5 additions and 5 deletions

View File

@ -1,7 +1,7 @@
# The order of packages is significant, because pip processes them in the order
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
oslo.log>=3.11.0 # Apache-2.0
pbr>=2.0.0 # Apache-2.0
Babel>=2.3.4 # BSD
oslo.log>=3.22.0 # Apache-2.0
pbr!=2.1.0,>=2.0.0 # Apache-2.0
Babel!=2.4.0,>=2.3.4 # BSD
python-designateclient>=1.5.0 # Apache-2.0

View File

@ -7,7 +7,7 @@ coverage>=4.0 # Apache-2.0
mock>=2.0 # BSD
mox>=0.5.3 # Apache-2.0
mox3!=0.19.0,>=0.7.0 # Apache-2.0
oslo.config!=3.18.0,>=3.14.0 # Apache-2.0
oslo.config>=3.22.0 # Apache-2.0
pylint==1.4.5 # GPLv2
testrepository>=0.0.18 # Apache-2.0/BSD
testtools>=1.4.0 # MIT
@ -22,6 +22,6 @@ django-nose>=1.4.4 # BSD
nosexcover # BSD
# Horizon requirements
Django<1.9,>=1.8 # BSD
Django<1.10,>=1.8 # BSD
django-compressor>=2.0 # MIT
django-openstack-auth>=3.1.0 # Apache-2.0