From 3ca4acb49427a60ad9f6185dc1edb7c0aa0d9ed1 Mon Sep 17 00:00:00 2001
From: Jamie Lennox <jamielennox@redhat.com>
Date: Fri, 1 Aug 2014 14:08:04 +1000
Subject: [PATCH] Fix tests running for zuul

- Add Sphinx to test-requirements
- Add a venv environment to tox for zuul runner.
- Fix pep8 issue in tests.

Change-Id: I742802381e588790a86d00371829dc88d21c9e64
---
 requests_mock/tests/test_matcher.py | 2 --
 test-requirements.txt               | 1 +
 tox.ini                             | 3 +++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/requests_mock/tests/test_matcher.py b/requests_mock/tests/test_matcher.py
index ba1081d..03227e3 100644
--- a/requests_mock/tests/test_matcher.py
+++ b/requests_mock/tests/test_matcher.py
@@ -12,8 +12,6 @@
 
 import re
 
-import requests
-
 from requests_mock import adapter
 from requests_mock.tests import base
 
diff --git a/test-requirements.txt b/test-requirements.txt
index 6662ca7..81d9c58 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,5 +1,6 @@
 discover
 fixtures
 mock
+sphinx>=1.1.2,!=1.2.0,<1.3
 testrepository>=0.0.18
 testtools
diff --git a/tox.ini b/tox.ini
index 5ad8521..8dd218f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -15,6 +15,9 @@ deps =
     flake8
     {[testenv]deps}
 
+[testenv:venv]
+commands = {posargs}
+
 [testenv:coverage]
 commands =
     coverage erase