From f2796f1e81e167f92d6c12d00be06452ce96b9dd Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Fri, 30 Dec 2011 14:27:36 -0800
Subject: [PATCH] Modify tox.ini file to do the standard thigns.

Change-Id: Iff2102fccdb60e8845ab2cd22c6661f1d56dde5c
---
 tox.ini | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/tox.ini b/tox.ini
index afdb8a629..c81dd64d8 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,14 @@
 [tox]
-envlist = py25,py26,py27
+envlist = py26,py27
 
 [testenv]
-deps = nose
-       mock
-       mox
-commands = nosetests
+deps = -r{toxinidir}/tools/pip-requires
+commands = /bin/bash run_tests.sh -N
+
+[testenv:pep8]
+deps = pep8
+commands = /bin/bash run_tests.sh -N --pep8
+
+[testenv:coverage]
+deps = pep8
+commands = /bin/bash run_tests.sh -N --with-coverage