From 4371ecae350929ef688a61fa5799754eabc475a6 Mon Sep 17 00:00:00 2001 From: Davanum Srinivas Date: Sat, 14 Nov 2015 23:06:55 -0500 Subject: [PATCH] Remove python 2.6 and cleanup tox.ini * Remove support for python 2.6 * Remove skipsdist : Needs to be set only if sdist is expensive * Remove usedevelop : only needed when skipsdist is set to True * Remove install_command : We can just use the default, we don't need to override * Remove setenv : We can just use the default as we don't need any extra environment variables * Remove requirements.txt from deps, as this is already added automatically Change-Id: I0441d771f554c86f3069bf62999c41f9b3ced99d --- tox.ini | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/tox.ini b/tox.ini index 08c2017..37d2459 100644 --- a/tox.ini +++ b/tox.ini @@ -1,19 +1,9 @@ [tox] minversion = 1.6 -envlist = py34,py26,py27,pep8 -# NOTE(dhellmann): We cannot set skipdist=True -# for oslo libraries because of the namespace package. -#skipsdist = True +envlist = py34,py27,pep8 [testenv] -# NOTE(dhellmann): We cannot set usedevelop=True -# for oslo libraries because of the namespace package. -#usedevelop = True -install_command = pip install -U {opts} {packages} -setenv = - VIRTUAL_ENV={envdir} -deps = -r{toxinidir}/requirements.txt - -r{toxinidir}/test-requirements.txt +deps = -r{toxinidir}/test-requirements.txt commands = python setup.py testr --slowest --testr-args='{posargs}' [testenv:pep8]