From c8da76460fb8515a31cf455292ac6bf0c5568004 Mon Sep 17 00:00:00 2001
From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Sat, 15 Jul 2017 20:50:43 +0000
Subject: [PATCH] Updated from global requirements

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

diff --git a/requirements.txt b/requirements.txt
index 0f1c3fc98..06b5e48b9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -52,11 +52,11 @@ python-zaqarclient>=1.0.0 # Apache-2.0
 PyYAML>=3.10.0 # MIT
 requests>=2.14.2 # Apache-2.0
 tenacity>=3.2.1 # 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,>=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,>=16.0 # PSF/ZPL
 six>=1.9.0 # MIT
 SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 # MIT
 stevedore>=1.20.0 # Apache-2.0
 WSME>=0.8 # MIT
 yaql>=1.1.0 # Apache 2.0 License
-tooz>=1.47.0 # Apache-2.0
+tooz!=1.57.4,>=1.47.0 # Apache-2.0
 zake>=0.1.6 # Apache-2.0
diff --git a/test-requirements.txt b/test-requirements.txt
index 38c3cac22..d3fc718bb 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -25,7 +25,7 @@ sphinx>=1.6.2 # BSD
 sphinxcontrib-httpdomain # BSD
 sphinxcontrib-pecanwsme>=0.8 # Apache-2.0
 openstackdocstheme>=1.11.0 # Apache-2.0
-tooz>=1.47.0 # Apache-2.0
+tooz!=1.57.4,>=1.47.0 # Apache-2.0
 tempest>=16.1.0 # Apache-2.0
 testrepository>=0.0.18 # Apache-2.0/BSD
 testtools>=1.4.0 # MIT