From 6b0e4625da2c53a1e3fdb4857fc7c6ba6ce562cf Mon Sep 17 00:00:00 2001 From: Michael Merickel Date: Wed, 31 Oct 2018 01:36:26 -0500 Subject: initial work to remove py2 from the codebase --- tox.ini | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) (limited to 'tox.ini') diff --git a/tox.ini b/tox.ini index 5bf19d2a7..0dae17e0f 100644 --- a/tox.ini +++ b/tox.ini @@ -1,23 +1,19 @@ [tox] envlist = lint, - py27,py34,py35,py36,py37,py38,pypy,pypy3, - docs,{py2,py3}-cover,coverage, + py34,py35,py36,py37,py38,pypy3, + docs,py36-cover,coverage, [testenv] # Most of these are defaults but if you specify any you can't fall back # to defaults for others. basepython = - py27: python2.7 py34: python3.4 py35: python3.5 py36: python3.6 py37: python3.7 py38: python3.8 - pypy: pypy pypy3: pypy3 - py2: python2.7 - py3: python3.6 commands = nosetests --with-xunit --xunit-file=nosetests-{envname}.xml {posargs:} @@ -59,21 +55,13 @@ extras = # we separate coverage into its own testenv because a) "last run wins" wrt # cobertura jenkins reporting and b) pypy and jython can't handle any # combination of versions of coverage and nosexcover that i can find. -[testenv:py2-cover] -commands = - coverage run {envbindir}/nosetests - coverage xml -o coverage-py2.xml -setenv = - COVERAGE_FILE=.coverage.py2 -extras = - testing - -[testenv:py3-cover] +[testenv:py36-cover] +basepython = python3.6 commands = coverage run {envbindir}/nosetests - coverage xml -o coverage-py3.xml + coverage xml -o coverage-{envname}.xml setenv = - COVERAGE_FILE=.coverage.py3 + COVERAGE_FILE=.coverage.{envname} extras = testing -- cgit v1.2.3