From 95c573db44d27c8faf91edb0a083189ed96fd30f Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Thu, 2 Jan 2020 14:50:35 +0100 Subject: [PATCH 1/3] ci: test with py38 --- .circleci/config.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.circleci/config.yml b/.circleci/config.yml index 46bab635..475f2b8c 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -40,6 +40,12 @@ common: &common set +x fi jobs: + py38: + <<: *common + docker: + - image: circleci/python:3.8 + environment: + - TOXENV=py38-coverage py37-coveragepy5: <<: *common docker: @@ -93,6 +99,7 @@ workflows: version: 2 test: jobs: + - py38 - py37-coveragepy5 - py37 - py37-click6 From b450bcfc497b97f84c03580783e89b45bb865cae Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Thu, 2 Jan 2020 15:28:38 +0100 Subject: [PATCH 2/3] tox.ini: remove usedevelop --- tox.ini | 1 - 1 file changed, 1 deletion(-) diff --git a/tox.ini b/tox.ini index ba6999d0..189a31e6 100644 --- a/tox.ini +++ b/tox.ini @@ -3,7 +3,6 @@ envlist = py{27,33,34,35,36,37},checkqa [testenv] extras = {env:TOX_EXTRAS:testing} -usedevelop = True passenv = PYTEST_ADDOPTS commands = {env:TOX_CMD:{env:COVERAGE_RUN:pytest}} {posargs} setenv = From 3aa650046e4e4d7899698eec51608a8b0c1a1b84 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Thu, 2 Jan 2020 15:41:32 +0100 Subject: [PATCH 3/3] coveragerc: use include/paths --- .coveragerc | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/.coveragerc b/.coveragerc index edc246dd..38964e9e 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,5 +1,10 @@ [run] -source = . +include = + covimerage/* + tests/* + */lib/python*/site-packages/covimerage/* + */pypy*/site-packages/covimerage/* + *\Lib\site-packages\covimerage\* branch = true # Wrong warning caused by include used in [report] (Coveragepy 4.4.2) # Ref: https://bitbucket.org/ned/coveragepy/issues/621 @@ -8,4 +13,9 @@ parallel = true [report] show_missing = true -include = covimerage/*,tests/* + +[paths] +source = covimerage/ + */lib/python*/site-packages/covimerage/ + */pypy*/site-packages/covimerage/ + *\Lib\site-packages\covimerage\