From da28e4c904c27b436b3ea117f21b04d812f90da0 Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@gmail.com>
Date: Wed, 15 Jul 2015 22:58:44 -0700
Subject: [PATCH] Move doc8 to being a normal test requirement in
 test-requirements.txt

Change-Id: I6d81cc86d422be359f1b2339943bdfe6067ee5da
---
 test-requirements.txt |  3 +++
 tox.ini               | 12 ++----------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/test-requirements.txt b/test-requirements.txt
index 6a4f6ae2..155fe752 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -12,6 +12,9 @@ testscenarios>=0.4
 # Used for testing the WBE engine.
 kombu>=3.0.7
 
+# Used for doc style checking
+doc8 # Apache-2.0
+
 # Used for testing zookeeper & backends.
 zake>=0.1.6 # Apache-2.0
 kazoo>=2.2
diff --git a/tox.ini b/tox.ini
index 535e611f..5ee35ac8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -19,14 +19,11 @@ deps = -r{toxinidir}/requirements.txt
 commands = python setup.py testr --slowest --testr-args='{posargs}'
 
 [testenv:docs]
-basepython = python2.7
-deps = {[testenv:py27]deps}
 commands = python setup.py build_sphinx
     doc8 doc/source
 
 [testenv:update-states]
-basepython = python2.7
-deps = {[testenv:py27]deps}
+deps = {[testenv]deps}
     pydot2
 commands = {toxinidir}/tools/update_states.sh
 
@@ -43,14 +40,11 @@ deps = {[testenv]deps}
 commands = pylint --rcfile=pylintrc taskflow
 
 [testenv:cover]
-basepython = python2.7
-deps = {[testenv:py27]deps}
+deps = {[testenv]deps}
    coverage>=3.6
 commands = python setup.py testr --coverage --testr-args='{posargs}'
 
 [testenv:venv]
-basepython = python2.7
-deps = {[testenv:py27]deps}
 commands = {posargs}
 
 [flake8]
@@ -63,8 +57,6 @@ import_exceptions = six.moves
     unittest.mock
 
 [testenv:py27]
-deps = {[testenv]deps}
-    doc8
 commands = 
     python setup.py testr --slowest --testr-args='{posargs}'
     sphinx-build -b doctest doc/source doc/build