From 787a2877e9e598feaf1a720ad7ac2d5858577a10 Mon Sep 17 00:00:00 2001 From: Glyph Date: Mon, 23 Mar 2020 23:59:18 -0700 Subject: [PATCH 1/5] make a discrete coverage-report environment --- .gitignore | 2 +- tox.ini | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 2c988749..a1ac280e 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,6 @@ MANIFEST .coverage coverage htmlcov -_trial_temp +_trial_temp* .tox _trial_temp.lock diff --git a/tox.ini b/tox.ini index b20489ec..15f3ca5b 100644 --- a/tox.ini +++ b/tox.ini @@ -3,7 +3,7 @@ envlist = {pypy,py27,py35,py36,py37}-twisted_lowest, {pypy,pypy3,py27,py35,py36,py37,py38}-twisted_latest, {pypy3,py35,py36,py37,py38}-twisted_trunk-pyopenssl_trunk, - towncrier, twine, check-manifest, flake8, docs + towncrier, twine, check-manifest, flake8, docs, coverage-report [testenv] extras = dev @@ -26,8 +26,7 @@ setenv = passenv = TERM # ensure colors commands = pip list - coverage run {envbindir}/trial {posargs:treq} - coverage report -m + coverage run -p {envbindir}/trial {posargs:treq} [testenv:flake8] skip_install = True @@ -58,3 +57,9 @@ commands = changedir = docs commands = sphinx-build -b html . html + +[testenv:coverage-report] +depends = pypy,py27,py35,py36,py37 +commands = + coverage combine + coverage report From b3062118ef72fe344b6b01148f9f8a1188f24539 Mon Sep 17 00:00:00 2001 From: Glyph Date: Tue, 24 Mar 2020 00:01:48 -0700 Subject: [PATCH 2/5] don't run towncrier all the time --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 15f3ca5b..90bf83af 100644 --- a/tox.ini +++ b/tox.ini @@ -3,7 +3,7 @@ envlist = {pypy,py27,py35,py36,py37}-twisted_lowest, {pypy,pypy3,py27,py35,py36,py37,py38}-twisted_latest, {pypy3,py35,py36,py37,py38}-twisted_trunk-pyopenssl_trunk, - towncrier, twine, check-manifest, flake8, docs, coverage-report + twine, check-manifest, flake8, docs, coverage-report [testenv] extras = dev From a024eac6dd0bfd6072de871b0331763fab32764a Mon Sep 17 00:00:00 2001 From: Glyph Date: Tue, 24 Mar 2020 00:01:58 -0700 Subject: [PATCH 3/5] combine coverage before reporting --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index ecbc6b40..18176d7a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -58,6 +58,7 @@ script: - tox after_success: + - coverage combine - coveralls after_failure: From 6a0454e3516fac15562c3b78d6675fde200cc89c Mon Sep 17 00:00:00 2001 From: Glyph Date: Fri, 17 Apr 2020 00:55:51 -0700 Subject: [PATCH 4/5] update and run tox2travis --- .travis.yml | 2 +- tox2travis.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 18176d7a..ac74bc21 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ cache: pip jobs: include: - python: "3.8" - env: TOXENV=towncrier,twine,check-manifest,flake8,docs + env: TOXENV=twine,check-manifest,flake8,docs,coverage-report - python: "2.7" env: TOXENV=py27-twisted_lowest,py27-twisted_latest - python: "3.5" diff --git a/tox2travis.py b/tox2travis.py index e2c2d9ca..27829366 100755 --- a/tox2travis.py +++ b/tox2travis.py @@ -40,6 +40,7 @@ - tox after_success: + - coverage combine - coveralls after_failure: From f4a53d1b23612e3c1ce9fe7b685ba3475d3cc92d Mon Sep 17 00:00:00 2001 From: Glyph Date: Tue, 28 Dec 2021 03:09:49 -0800 Subject: [PATCH 5/5] update depends list for current factors --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index cc44c821..68aacbff 100644 --- a/tox.ini +++ b/tox.ini @@ -57,7 +57,7 @@ commands = sphinx-build -b html . html [testenv:coverage-report] -depends = pypy,py27,py35,py36,py37 +depends = pypy3,py36,py37,py38,py39 commands = coverage combine coverage report