From 3fbe100a02b6bddd39354890bd3fe135559a7d9e Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Tue, 26 Feb 2019 21:14:54 +0100 Subject: [PATCH 1/3] ci: Travis: remove coverage from some jobs --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 83429f355..17087bf95 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,10 +16,10 @@ env: # Specialized factors for py27. - TOXENV=py27-nobyte - TOXENV=py27-xdist - - TOXENV=py27-pluggymaster-xdist + - TOXENV=py27-pluggymaster-xdist PYTEST_NO_COVERAGE=1 # Specialized factors for py37. - TOXENV=py37-pexpect,py37-trial,py37-numpy - - TOXENV=py37-pluggymaster-xdist + - TOXENV=py37-pluggymaster-xdist PYTEST_NO_COVERAGE=1 - TOXENV=py37-freeze PYTEST_NO_COVERAGE=1 matrix: @@ -60,7 +60,7 @@ jobs: - test $(python -c 'import sys; print("%d%d" % sys.version_info[0:2])') = 37 # Jobs only run via Travis cron jobs (currently daily). - - env: TOXENV=py38-xdist + - env: TOXENV=py38-xdist PYTEST_NO_COVERAGE=1 python: '3.8-dev' if: type = cron From 86070f0b7dfa0308c818c9a23051f6a9d33dc19c Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Tue, 26 Feb 2019 21:16:01 +0100 Subject: [PATCH 2/3] ci: AppVeyor: no coverage reporting Should be covered by Azure. --- appveyor.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index d00cd143f..230fc6b9f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,6 @@ environment: + global: + PYTEST_NO_COVERAGE: "1" matrix: - TOXENV: "py37-xdist" - TOXENV: "py27-xdist" @@ -8,13 +10,11 @@ environment: - TOXENV: "py36-xdist" # NOTE: pypy-xdist is buggy currently (https://github.com/pytest-dev/pytest-xdist/issues/142). - TOXENV: "pypy" - PYTEST_NO_COVERAGE: "1" # Specialized factors for py27. - TOXENV: "py27-trial,py27-numpy,py27-nobyte" # Specialized factors for py37. - TOXENV: "py37-trial,py37-numpy" - TOXENV: "py37-freeze" - PYTEST_NO_COVERAGE: "1" matrix: fast_finish: true @@ -38,9 +38,6 @@ before_test: test_script: - python -m tox -on_success: - - call scripts\upload-coverage.bat - cache: - '%LOCALAPPDATA%\pip\cache' - '%USERPROFILE%\.cache\pre-commit' From e3eb26f91affb9cc1534886470e231e723741c0e Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Tue, 26 Feb 2019 21:24:03 +0100 Subject: [PATCH 3/3] ci: Travis: no coverage by default [skip appveyor] --- .travis.yml | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index 17087bf95..9616a0818 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,15 +12,15 @@ install: - python -m pip install --upgrade --pre tox env: matrix: - - TOXENV=py27 + - TOXENV=py27 PYTEST_COVERAGE=1 # Specialized factors for py27. - - TOXENV=py27-nobyte - - TOXENV=py27-xdist - - TOXENV=py27-pluggymaster-xdist PYTEST_NO_COVERAGE=1 + - TOXENV=py27-nobyte PYTEST_COVERAGE=1 + - TOXENV=py27-xdist PYTEST_COVERAGE=1 + - TOXENV=py27-pluggymaster-xdist # Specialized factors for py37. - TOXENV=py37-pexpect,py37-trial,py37-numpy - - TOXENV=py37-pluggymaster-xdist PYTEST_NO_COVERAGE=1 - - TOXENV=py37-freeze PYTEST_NO_COVERAGE=1 + - TOXENV=py37-pluggymaster-xdist + - TOXENV=py37-freeze matrix: allow_failures: @@ -30,9 +30,9 @@ matrix: jobs: include: # Coverage tracking is slow with pypy, skip it. - - env: TOXENV=pypy-xdist PYTEST_NO_COVERAGE=1 + - env: TOXENV=pypy-xdist python: 'pypy2.7-6.0' - - env: TOXENV=pypy3-xdist PYTEST_NO_COVERAGE=1 + - env: TOXENV=pypy3-xdist python: 'pypy3.5-6.0' - env: TOXENV=py34-xdist @@ -60,7 +60,7 @@ jobs: - test $(python -c 'import sys; print("%d%d" % sys.version_info[0:2])') = 37 # Jobs only run via Travis cron jobs (currently daily). - - env: TOXENV=py38-xdist PYTEST_NO_COVERAGE=1 + - env: TOXENV=py38-xdist python: '3.8-dev' if: type = cron @@ -72,7 +72,6 @@ jobs: - stage: deploy python: '3.6' - env: PYTEST_NO_COVERAGE=1 install: pip install -U setuptools setuptools_scm script: skip deploy: @@ -88,7 +87,7 @@ jobs: before_script: - | - if [[ "$PYTEST_NO_COVERAGE" != 1 ]]; then + if [[ "$PYTEST_COVERAGE" = 1 ]]; then export COVERAGE_FILE="$PWD/.coverage" export COVERAGE_PROCESS_START="$PWD/.coveragerc" export _PYTEST_TOX_COVERAGE_RUN="coverage run -m" @@ -99,7 +98,7 @@ script: tox --recreate after_success: - | - if [[ "$PYTEST_NO_COVERAGE" != 1 ]]; then + if [[ "$PYTEST_COVERAGE" = 1 ]]; then set -e # Add last TOXENV to $PATH. PATH="$PWD/.tox/${TOXENV##*,}/bin:$PATH"