From 9578e9743db4f3ce414387a5937071f72cef7684 Mon Sep 17 00:00:00 2001
From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Sun, 4 Mar 2018 09:59:28 +0000
Subject: [PATCH] Updated from global requirements

Change-Id: Ifc42bb9014967b0233541e8479fe253a906123c7
---
 requirements.txt      | 2 +-
 test-requirements.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 22a46e45b..8051bf8e5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,4 +5,4 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0
 oslo.config>=5.1.0 # Apache-2.0
 oslo.log>=3.36.0 # Apache-2.0
 paramiko>=2.0.0 # LGPLv2.1+
-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
+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
diff --git a/test-requirements.txt b/test-requirements.txt
index 3071177cd..fbe1ae99b 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -13,5 +13,5 @@ oslotest>=3.2.0 # Apache-2.0
 testrepository>=0.0.18 # Apache-2.0/BSD
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
-PyYAML>=3.10 # MIT
+PyYAML>=3.12 # MIT
 mock>=2.0.0 # BSD