From 66fc1ccc27b445dfadf16b09a7e838f6aac21899 Mon Sep 17 00:00:00 2001
From: Bert JW Regeer <bertjw@regeer.org>
Date: Mon, 4 May 2020 00:14:03 -0700
Subject: Update tox.ini to run pytest instead

---
 tox.ini | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'tox.ini')

diff --git a/tox.ini b/tox.ini
index 74f5cfbbd..45e786684 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,16 +2,14 @@
 envlist =
     lint,
     py35,py36,py37,py38,pypy3,
-    docs,py36-cover,coverage,
+    docs,coverage,
 
 [testenv]
 commands =
-    cover: coverage run \
-    {envbindir}/nosetests --with-xunit --xunit-file=nosetests-{envname}.xml {posargs:}
+    python --version
+    pytest {posargs:}
 extras =
     testing
-deps =
-    cover: coverage
 setenv =
     COVERAGE_FILE=.coverage.{envname}
 
-- 
cgit v1.2.3


From 57687face8ec3a912d6d886b8b2bcf27a97c82d0 Mon Sep 17 00:00:00 2001
From: Bert JW Regeer <bertjw@regeer.org>
Date: Mon, 4 May 2020 23:23:22 -0700
Subject: Disable coverage by default

Use a special py38-cover testenv in tox to re-enable coverage reporting.
---
 tox.ini | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'tox.ini')

diff --git a/tox.ini b/tox.ini
index 45e786684..91baa42db 100644
--- a/tox.ini
+++ b/tox.ini
@@ -2,7 +2,8 @@
 envlist =
     lint,
     py35,py36,py37,py38,pypy3,
-    docs,coverage,
+    py38-cover,coverage,
+    docs
 
 [testenv]
 commands =
@@ -13,6 +14,11 @@ extras =
 setenv =
     COVERAGE_FILE=.coverage.{envname}
 
+[testenv:py38-cover]
+commands =
+    python --version
+    pytest --cov {posargs:}
+
 [testenv:lint]
 skip_install = true
 commands =
@@ -52,6 +58,7 @@ deps =
     coverage
 setenv =
     COVERAGE_FILE=.coverage
+depends = py38-cover
 
 [testenv:format]
 skip_install = true
-- 
cgit v1.2.3