From 7ac78a0d40393519eb0362b8a6d66b6445526c24 Mon Sep 17 00:00:00 2001 From: Aron Griffis Date: Sun, 29 Nov 2015 15:16:58 -0500 Subject: [PATCH] Clean up tox.ini using generative envlist. --- tox.ini | 71 ++++----------------------------------------------------- 1 file changed, 5 insertions(+), 66 deletions(-) diff --git a/tox.ini b/tox.ini index 09f25a7..d71cba7 100644 --- a/tox.ini +++ b/tox.ini @@ -1,16 +1,7 @@ [tox] envlist = - py26-without-extensions, - py27-without-extensions, - py33-without-extensions, - py34-without-extensions, - py35-without-extensions, - pypy-without-extensions, - py26-with-extensions, - py27-with-extensions, - py33-with-extensions, - py34-with-extensions, - py35-with-extensions + py{26,27,33,34,35}-{without,with}-extensions, + pypy-without-extensions [testenv] deps = @@ -18,61 +9,9 @@ deps = pytest commands = {env:COVERAGE_CMD:} py.test -v [] +setenv = + without-extensions: WRAPT_EXTENSIONS = false + with-extensions: WRAPT_EXTENSIONS = true [pytest] norecursedirs = .tox venv - -[testenv:py26-without-extensions] -basepython = python2.6 -setenv = - WRAPT_EXTENSIONS = false - -[testenv:py27-without-extensions] -basepython = python2.7 -setenv = - WRAPT_EXTENSIONS = false - -[testenv:py33-without-extensions] -basepython = python3.3 -setenv = - WRAPT_EXTENSIONS = false - -[testenv:py34-without-extensions] -basepython = python3.4 -setenv = - WRAPT_EXTENSIONS = false - -[testenv:py35-without-extensions] -basepython = python3.5 -setenv = - WRAPT_EXTENSIONS = false - -[testenv:pypy-without-extensions] -basepython = pypy -setenv = - WRAPT_EXTENSIONS = false - -[testenv:py26-with-extensions] -basepython = python2.6 -setenv = - WRAPT_EXTENSIONS = true - -[testenv:py27-with-extensions] -basepython = python2.7 -setenv = - WRAPT_EXTENSIONS = true - -[testenv:py33-with-extensions] -basepython = python3.3 -setenv = - WRAPT_EXTENSIONS = true - -[testenv:py34-with-extensions] -basepython = python3.4 -setenv = - WRAPT_EXTENSIONS = true - -[testenv:py35-with-extensions] -basepython = python3.5 -setenv = - WRAPT_EXTENSIONS = true