Merge "Updated from global requirements"

This commit is contained in:
Jenkins 2017-09-12 17:13:20 +00:00 committed by Gerrit Code Review
commit 26c8137cac
2 changed files with 6 additions and 6 deletions

View File

@ -5,9 +5,9 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0
docker>=2.4.2 # Apache-2.0
Jinja2!=2.9.0,!=2.9.1,!=2.9.2,!=2.9.3,!=2.9.4,>=2.8 # BSD License (3 clause)
six>=1.9.0 # MIT
oslo.config!=4.3.0,!=4.4.0,>=4.0.0 # Apache-2.0
oslo.utils>=3.20.0 # Apache-2.0
oslo.config>=4.6.0 # Apache-2.0
oslo.utils>=3.28.0 # Apache-2.0
setuptools!=24.0.0,!=34.0.0,!=34.0.1,!=34.0.2,!=34.0.3,!=34.1.0,!=34.1.1,!=34.2.0,!=34.3.0,!=34.3.1,!=34.3.2,!=36.2.0,>=16.0 # PSF/ZPL
PyYAML>=3.10 # MIT
netaddr!=0.7.16,>=0.7.13 # BSD
cryptography!=2.0,>=1.6 # BSD/Apache-2.0
netaddr>=0.7.18 # BSD
cryptography!=2.0,>=1.9 # BSD/Apache-2.0

View File

@ -2,7 +2,7 @@
# of appearance. Changing the order has an impact on the overall integration
# process, which may cause wedges in the gate later.
bandit>=1.1.0 # Apache-2.0
bashate>=0.2 # Apache-2.0
bashate>=0.5.1 # Apache-2.0
beautifulsoup4>=4.6.0 # MIT
coverage!=4.4,>=4.0 # Apache-2.0
doc8 # Apache-2.0
@ -16,7 +16,7 @@ PrettyTable<0.8,>=0.7.1 # BSD
PyYAML>=3.10 # MIT
python-ceilometerclient>=2.5.0 # Apache-2.0
python-neutronclient>=6.3.0 # Apache-2.0
python-openstackclient!=3.10.0,>=3.3.0 # Apache-2.0
python-openstackclient>=3.12.0 # Apache-2.0
pytz>=2013.6 # MIT
sphinx>=1.6.2 # BSD
testrepository>=0.0.18 # Apache-2.0/BSD