Merge "Updated from global requirements"

requirements.txt

@@ -3,11 +3,11 @@
 # process, which may cause wedges in the gate later.
 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)
+Jinja2>=2.10 # BSD License (3 clause)
 six>=1.10.0 # MIT
 oslo.config>=5.1.0 # Apache-2.0
 oslo.utils>=3.33.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
+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,>=21.0.0 # PSF/ZPL
+PyYAML>=3.12 # MIT
 netaddr>=0.7.18 # BSD
 cryptography!=2.0,>=1.9 # BSD/Apache-2.0

test-requirements.txt

@@ -13,9 +13,9 @@ oslo.log>=3.36.0 # Apache-2.0
 oslotest>=3.2.0 # Apache-2.0
 reno>=2.5.0 # Apache-2.0
 PrettyTable<0.8,>=0.7.1 # BSD
-PyYAML>=3.10 # MIT
+PyYAML>=3.12 # MIT
 python-ceilometerclient>=2.5.0 # Apache-2.0
-python-neutronclient>=6.3.0 # Apache-2.0
+python-neutronclient>=6.7.0 # Apache-2.0
 python-openstackclient>=3.12.0 # Apache-2.0
 pytz>=2013.6 # MIT
 sphinx!=1.6.6,>=1.6.2 # BSD