From 9feb7e4aafb25c01361ddb62a0175c12c08b27a8 Mon Sep 17 00:00:00 2001 From: Tristan Van Berkom Date: Wed, 27 Feb 2019 23:12:33 +0900 Subject: setup.cfg, tox.ini: Moved coverage support to the tox.ini level This disables any attempt to use coverage when running tests directly against installed dependencies with setup.py. This fixes #916 --- setup.cfg | 2 +- tox.ini | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.cfg b/setup.cfg index 159c665c3..545a6c89c 100644 --- a/setup.cfg +++ b/setup.cfg @@ -11,7 +11,7 @@ parentdir_prefix = BuildStream- test=pytest [tool:pytest] -addopts = --verbose --basetemp ./tmp --pep8 --pylint --pylint-rcfile=.pylintrc --cov=buildstream --cov-config .coveragerc --durations=20 +addopts = --verbose --basetemp ./tmp --pep8 --pylint --pylint-rcfile=.pylintrc --durations=20 norecursedirs = integration-cache tmp __pycache__ .eggs python_files = tests/*/*.py pep8maxlinelength = 119 diff --git a/tox.ini b/tox.ini index bfe68f88a..c48db7a4c 100644 --- a/tox.ini +++ b/tox.ini @@ -12,7 +12,7 @@ skip_missing_interpreters = true # [testenv] commands = - pytest --basetemp {envtmpdir} {posargs} + pytest --basetemp {envtmpdir} --cov=buildstream --cov-config .coveragerc {posargs} mkdir -p .coverage-reports mv {envtmpdir}/.coverage {toxinidir}/.coverage-reports/.coverage.{env:COVERAGE_PREFIX:}{envname} deps = -- cgit v1.2.1