Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2017-03-09 03:11:03 +00:00 committed by Gerrit Code Review
commit 0c8912e021
2 changed files with 4 additions and 4 deletions

View File

@ -2,13 +2,13 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
pbr>=1.8 # Apache-2.0
pbr>=2.0.0 # Apache-2.0
Babel>=2.3.4 # BSD
cryptography!=1.3.0,>=1.0 # BSD/Apache-2.0
cryptography>=1.6 # BSD/Apache-2.0
python-barbicanclient>=4.0.0 # Apache-2.0
oslo.config!=3.18.0,>=3.14.0 # Apache-2.0
oslo.context>=2.12.0 # Apache-2.0
oslo.i18n>=2.1.0 # Apache-2.0
oslo.log>=3.11.0 # Apache-2.0
oslo.utils>=3.18.0 # Apache-2.0
oslo.utils>=3.20.0 # Apache-2.0
keystoneauth1>=2.18.0 # Apache-2.0

View File

@ -25,5 +25,5 @@ except ImportError:
pass
setuptools.setup(
setup_requires=['pbr>=1.8'],
setup_requires=['pbr>=2.0.0'],
pbr=True)