From 6b0e4625da2c53a1e3fdb4857fc7c6ba6ce562cf Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
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


From 9c2373c3b32f587061eae387edf2678a4307897a Mon Sep 17 00:00:00 2001
From: Michael Merickel <michael@merickel.org>
Date: Fri, 23 Nov 2018 17:13:04 -0600
Subject: simplify the tox setup, get rid of basepython warning

---
 tox.ini | 35 +++++++----------------------------
 1 file changed, 7 insertions(+), 28 deletions(-)

(limited to 'tox.ini')

diff --git a/tox.ini b/tox.ini
index 0dae17e0f..33e3c2c81 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,25 +1,19 @@
 [tox]
 envlist =
     lint,
-    py34,py35,py36,py37,py38,pypy3,
+    py34,py35,py36,py37,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 =
-    py34: python3.4
-    py35: python3.5
-    py36: python3.6
-    py37: python3.7
-    py38: python3.8
-    pypy3: pypy3
-
 commands =
-    nosetests --with-xunit --xunit-file=nosetests-{envname}.xml {posargs:}
-
+    cover: coverage run \
+    {envbindir}/nosetests --with-xunit --xunit-file=nosetests-{envname}.xml {posargs:}
 extras =
     testing
+deps =
+    cover: coverage
+setenv =
+    COVERAGE_FILE=.coverage.{envname}
 
 [testenv:lint]
 skip_install = true
@@ -52,24 +46,10 @@ commands =
 extras =
     docs
 
-# 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:py36-cover]
-basepython = python3.6
-commands =
-    coverage run {envbindir}/nosetests
-    coverage xml -o coverage-{envname}.xml
-setenv =
-    COVERAGE_FILE=.coverage.{envname}
-extras =
-    testing
-
 [testenv:coverage]
 skip_install = true
 basepython = python3.6
 commands =
-    coverage erase
     coverage combine
     coverage xml
     coverage report --fail-under=100
@@ -97,7 +77,6 @@ commands =
     python setup.py sdist --dist-dir {toxinidir}/dist
     # build wheel from sdist
     pip wheel -v --no-deps --no-index --no-build-isolation --wheel-dir {toxinidir}/dist --find-links {toxinidir}/dist pyramid
-
 deps =
     setuptools
     wheel
-- 
cgit v1.2.3