From 838c1cbb147550a39bf2ee35ec1fd5911358ad70 Mon Sep 17 00:00:00 2001
From: Monty Taylor <mordred@inaugust.com>
Date: Mon, 7 Oct 2013 12:03:28 -0400
Subject: [PATCH] Update tox requirements

Update to needing 1.6, which gives us the ability to alter how the
software is installed into the virtualenv. It also brings in pip 1.4,
which lets us avoid getting pre-releases of things we weren't expecting.

Change-Id: I3189f06610d776a032b5f8bf0910f59e4ed45719
---
 tox.ini | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tox.ini b/tox.ini
index eb0fb79..1107e6c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,11 @@
 [tox]
+minversion = 1.6
+skipsdist = True
 envlist = py26,py27,py26sa07,py27sa07,py33,pep8
 
 [testenv]
+usedevelop = True
+install_command = pip install {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt