From 4f812e032515f5d17471e32892edbeb82024098b Mon Sep 17 00:00:00 2001
From: Gordon Chung <chungg@ca.ibm.com>
Date: Tue, 17 Sep 2013 19:25:16 -0400
Subject: update tox to 1.6

ceilometer uses 1.6, let's utilise it as well to avoid any
incompatibility when manually running tests.

Change-Id: I9a3323310020381ceeebe7aa86219eff32b92ec1
Fixes: Bug#1226853
---
 tox.ini | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'tox.ini')

diff --git a/tox.ini b/tox.ini
index ab5e71b..fba98d9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,11 +1,14 @@
 [tox]
-distribute = False
+minversion = 1.6
+skipsdist = True
 envlist = py26,py27,py33,pep8
 
 [testenv]
 setenv = VIRTUAL_ENV={envdir}
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
+install_command = pip install -U {opts} {packages}
+usedevelop = True
 commands = python setup.py testr --slowest --testr-args='{posargs}'
 
 [testenv:pep8]
-- 
cgit v1.2.1