From 1069659fbe0cbd55790b05e879dc02dd48d0d931 Mon Sep 17 00:00:00 2001
From: Tim Burke <tim.burke@gmail.com>
Date: Thu, 16 Mar 2017 17:46:41 +0000
Subject: [PATCH] Prohibit certain versions of requests in
 test-requirements.txt

This prevents version conflicts when Keystone drags in a too-new
oslo.policy, which blackballs latest requests (but Sphinx would try to
pull it in anyway).

Change-Id: I3b2196fdef9936f1c7d468f9c7c9b9246d3d26fd
---
 test-requirements.txt | 1 +
 tox.ini               | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/test-requirements.txt b/test-requirements.txt
index 84507a0a..7b7ba6ac 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,6 +7,7 @@ mock
 pylint
 python-openstackclient
 boto
+requests!=2.12.2,!=2.13.0
 requests-mock>=0.7.0 # Apache-2.0
 fixtures<2.0,>=1.3.1 # Apache-2.0/BSD
 keystonemiddleware
diff --git a/tox.ini b/tox.ini
index f1ad2c82..c9f8f751 100644
--- a/tox.ini
+++ b/tox.ini
@@ -68,8 +68,7 @@ setenv = AUTH=keystone
          CEPH_TESTS=1
          LOG_DEST={envdir}/log
 deps =
-  {[testenv]deps}
-  http://tarballs.openstack.org/keystone/keystone-9.0.0.tar.gz
+  {[testenv:keystone]deps}
 
 [testenv:pylint]
 # Avoid to fail by checking members at lxml dynamically loaded module