From fdc3ea98c11871709e8cb0b280e96e1ec11f890e Mon Sep 17 00:00:00 2001
From: Brian Curtin <brian.curtin@rackspace.com>
Date: Mon, 23 Mar 2015 11:57:53 -0500
Subject: [PATCH] Adjust httpretty inclusion

Although we're removing httpretty, it seems like Gerrit is no longer
honoring our fixgates.txt file, so I've included httpretty back in
test-requirements now that the versions we need to skip are skipped
there.

Change-Id: I246fcbc40570331cce1bff8dc5717fe3bacb5e40
---
 fixgates.txt          | 1 -
 test-requirements.txt | 1 +
 tox.ini               | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 fixgates.txt

diff --git a/fixgates.txt b/fixgates.txt
deleted file mode 100644
index 2fb4feaf..00000000
--- a/fixgates.txt
+++ /dev/null
@@ -1 +0,0 @@
-httpretty>=0.8.0,!=0.8.1,!=0.8.2,!=0.8.3,!=0.8.7,!=0.8.8
diff --git a/test-requirements.txt b/test-requirements.txt
index f004f1a5..d253ec9b 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -5,6 +5,7 @@ hacking>=0.9.2,<0.10
 
 coverage>=3.6
 discover
+httpretty>=0.8.4,!=0.8.7,!=0.8.8
 fixtures>=0.3.14
 mock>=1.0
 python-subunit>=0.0.18
diff --git a/tox.ini b/tox.ini
index e6e2763a..f3052592 100644
--- a/tox.ini
+++ b/tox.ini
@@ -10,7 +10,6 @@ setenv =
    VIRTUAL_ENV={envdir}
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
-       -r{toxinidir}/fixgates.txt
 commands = python setup.py testr --slowest --testr-args='{posargs}'
 
 [testenv:pep8]