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 1/2] 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

From 572f250cd7a69e83ddb70442d23d2d8e09497128 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Mon, 2 Jan 2012 14:01:24 -0800
Subject: [PATCH 2/2] Install a good version of pip in the venv.

Change-Id: Iff60e6595a3a331961ac8d6be2224edf6548b470
---
 tools/install_venv.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tools/install_venv.py b/tools/install_venv.py
index d7231ac7a..0b1d843ae 100644
--- a/tools/install_venv.py
+++ b/tools/install_venv.py
@@ -168,7 +168,8 @@ def create_virtualenv(venv=VENV, no_site_packages=True):
         run_command(['virtualenv', '-q', VENV])
     print 'done.'
     print 'Installing pip in virtualenv...',
-    if not run_command(['tools/with_venv.sh', 'easy_install', 'pip']).strip():
+    if not run_command(['tools/with_venv.sh', 'easy_install',
+                        'pip>1.0']).strip():
         die("Failed to install pip.")
     print 'done.'