From ee43a1d872706fc6890ebde5c8478bfba7adfa18 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Tue, 8 May 2018 14:04:28 +0200 Subject: [PATCH] coverage: improve config / conditionals - move config to setup.cfg, add report-include - Travis: codecov: skip fixes, generate and pass coverage.xml - only do coverage for py jobs, fix -X for codecov Closes https://github.com/jazzband/django-configurations/pull/194 --- .coveragerc | 4 ---- .travis.yml | 10 +++++++--- setup.cfg | 7 +++++++ 3 files changed, 14 insertions(+), 7 deletions(-) delete mode 100644 .coveragerc diff --git a/.coveragerc b/.coveragerc deleted file mode 100644 index 0daa53e..0000000 --- a/.coveragerc +++ /dev/null @@ -1,4 +0,0 @@ -[run] -source = . -include = configurations/*,tests/* -branch = 1 diff --git a/.travis.yml b/.travis.yml index 093db7c..aa6b91b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -62,9 +62,13 @@ install: - pip install tox script: tox -v after_success: - - pip install codecov - - codecov --required -X gcov --flags ${TOXENV//-/ } - - coverage report -m + - | + if [ "$TOXENV" = py* ]; then + pip install codecov + coverage xml + coverage report -m + codecov --required -X gcov fix pycov -f coverage.xml --flags ${TOXENV//-/ } + fi branches: except: templates/1.5.x templates/1.6.x deploy: diff --git a/setup.cfg b/setup.cfg index 5e40900..bf145a1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,2 +1,9 @@ [wheel] universal = 1 + +[coverage:run] +source = . +include = configurations/*,tests/* +branch = 1 +[coverage:report] +include = configurations/*,tests/*