From 26b154ac8866cb06eee0eab7bf06bcc42a003a05 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Wed, 15 Jan 2020 09:21:23 +0100 Subject: [PATCH 01/11] ci: Travis: remove most jobs running on GitHub now --- .github/workflows/main.yml | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index c5531687401..0972b000436 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -80,6 +80,13 @@ jobs: - name: "ubuntu-py37" python: "3.7" os: ubuntu-latest + # Coverage for: + # - pytester's LsofFdLeakChecker + # - TestArgComplete (linux only) + # - numpy + # - old attrs + # - verbose=0 + # - test_sys_breakpoint_interception (via pexpect). tox_env: "py37-lsof-numpy-oldattrs-pexpect-twisted" - name: "ubuntu-py37-pluggy" python: "3.7" @@ -106,6 +113,9 @@ jobs: python: "3.7" os: macos-latest tox_env: "py37-xdist" + env: + # Cover verbose=1. + PYTEST_ADDOPTS: -v - name: "macos-py38" python: "3.8" os: macos-latest From f7a5764334b9d56c63e1f3786cd42fe701ecc413 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Thu, 23 Jan 2020 23:44:58 +0100 Subject: [PATCH 02/11] Remove TOXENV=py35 --- .travis.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 59c7951e407..deed9938e09 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,11 +42,6 @@ jobs: - env: TOXENV=py37-lsof-numpy-oldattrs-pexpect-twisted PYTEST_COVERAGE=1 PYTEST_ADDOPTS= python: '3.7' - # Coverage for Python 3.5.{0,1} specific code, mostly typing related. - - env: TOXENV=py35 PYTEST_COVERAGE=1 PYTEST_ADDOPTS="-k test_raises_cyclic_reference" - python: '3.5.1' - dist: trusty - before_script: - | # Do not (re-)upload coverage with cron runs. From 3e1bbaa5848815a16eb7620f58c0a7a61eb77234 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Fri, 24 Jan 2020 00:17:40 +0100 Subject: [PATCH 03/11] Revert "Remove TOXENV=py35" This reverts commit e5950d2497654c3c3bf1ae662d73cb1ac3442410. --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.travis.yml b/.travis.yml index deed9938e09..59c7951e407 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,6 +42,11 @@ jobs: - env: TOXENV=py37-lsof-numpy-oldattrs-pexpect-twisted PYTEST_COVERAGE=1 PYTEST_ADDOPTS= python: '3.7' + # Coverage for Python 3.5.{0,1} specific code, mostly typing related. + - env: TOXENV=py35 PYTEST_COVERAGE=1 PYTEST_ADDOPTS="-k test_raises_cyclic_reference" + python: '3.5.1' + dist: trusty + before_script: - | # Do not (re-)upload coverage with cron runs. From 5b6fa0c8e8f187a26fee5d8d55c45840242dbf15 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Fri, 24 Jan 2020 00:18:41 +0100 Subject: [PATCH 04/11] Remove osx --- .travis.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 59c7951e407..10ac3b97448 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,21 +16,6 @@ install: jobs: include: - # OSX tests - first (in test stage), since they are the slower ones. - # Coverage for: - # - osx - # - verbose=1 - - os: osx - osx_image: xcode10.1 - language: generic - env: TOXENV=py37-xdist PYTEST_COVERAGE=1 PYTEST_ADDOPTS=-v - before_install: - - which python3 - - python3 -V - - ln -sfn "$(which python3)" /usr/local/bin/python - - python -V - - test $(python -c 'import sys; print("%d%d" % sys.version_info[0:2])') = 37 - # Full run of latest supported version, without xdist. # Coverage for: # - pytester's LsofFdLeakChecker From 5552d1e24d3d4aae852cf45ef3ecd22499064a2c Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Fri, 24 Jan 2020 10:52:36 +0100 Subject: [PATCH 05/11] Revert "Remove osx" This reverts commit a970c65c02963317bfb1c4e53cc04c4142c53b58. --- .travis.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.travis.yml b/.travis.yml index 10ac3b97448..59c7951e407 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,21 @@ install: jobs: include: + # OSX tests - first (in test stage), since they are the slower ones. + # Coverage for: + # - osx + # - verbose=1 + - os: osx + osx_image: xcode10.1 + language: generic + env: TOXENV=py37-xdist PYTEST_COVERAGE=1 PYTEST_ADDOPTS=-v + before_install: + - which python3 + - python3 -V + - ln -sfn "$(which python3)" /usr/local/bin/python + - python -V + - test $(python -c 'import sys; print("%d%d" % sys.version_info[0:2])') = 37 + # Full run of latest supported version, without xdist. # Coverage for: # - pytester's LsofFdLeakChecker From b170150c7bbfc8707fd58727c9f9bdcf554810b8 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Fri, 24 Jan 2020 19:22:52 +0100 Subject: [PATCH 06/11] remove osx --- .travis.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index 59c7951e407..10ac3b97448 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,21 +16,6 @@ install: jobs: include: - # OSX tests - first (in test stage), since they are the slower ones. - # Coverage for: - # - osx - # - verbose=1 - - os: osx - osx_image: xcode10.1 - language: generic - env: TOXENV=py37-xdist PYTEST_COVERAGE=1 PYTEST_ADDOPTS=-v - before_install: - - which python3 - - python3 -V - - ln -sfn "$(which python3)" /usr/local/bin/python - - python -V - - test $(python -c 'import sys; print("%d%d" % sys.version_info[0:2])') = 37 - # Full run of latest supported version, without xdist. # Coverage for: # - pytester's LsofFdLeakChecker From 62883e1fdd6012baacfd913974e8ddf4ae94b543 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Fri, 24 Jan 2020 19:59:47 +0100 Subject: [PATCH 07/11] Revert "remove osx" This reverts commit 8dcae464d2e57ba15bc99da1f2f5ed922c3f39dd. --- .travis.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.travis.yml b/.travis.yml index 10ac3b97448..59c7951e407 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,6 +16,21 @@ install: jobs: include: + # OSX tests - first (in test stage), since they are the slower ones. + # Coverage for: + # - osx + # - verbose=1 + - os: osx + osx_image: xcode10.1 + language: generic + env: TOXENV=py37-xdist PYTEST_COVERAGE=1 PYTEST_ADDOPTS=-v + before_install: + - which python3 + - python3 -V + - ln -sfn "$(which python3)" /usr/local/bin/python + - python -V + - test $(python -c 'import sys; print("%d%d" % sys.version_info[0:2])') = 37 + # Full run of latest supported version, without xdist. # Coverage for: # - pytester's LsofFdLeakChecker From 31aa83b05cd9751ec4057ad56ad8805fce47e631 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Fri, 24 Jan 2020 23:51:27 +0100 Subject: [PATCH 08/11] remove TOXENV=py37-lsof-numpy-oldattrs-pexpect-twisted --- .travis.yml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index 59c7951e407..f3c7a7ba524 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,17 +31,6 @@ jobs: - python -V - test $(python -c 'import sys; print("%d%d" % sys.version_info[0:2])') = 37 - # Full run of latest supported version, without xdist. - # Coverage for: - # - pytester's LsofFdLeakChecker - # - TestArgComplete (linux only) - # - numpy - # - old attrs - # - verbose=0 - # - test_sys_breakpoint_interception (via pexpect). - - env: TOXENV=py37-lsof-numpy-oldattrs-pexpect-twisted PYTEST_COVERAGE=1 PYTEST_ADDOPTS= - python: '3.7' - # Coverage for Python 3.5.{0,1} specific code, mostly typing related. - env: TOXENV=py35 PYTEST_COVERAGE=1 PYTEST_ADDOPTS="-k test_raises_cyclic_reference" python: '3.5.1' From 55f3755e72776df104f62152a31983cc5286c5e1 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sat, 25 Jan 2020 14:39:18 +0100 Subject: [PATCH 09/11] codecov: alternative way to enable changes status? --- codecov.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/codecov.yml b/codecov.yml index db2472009c6..82ad2c212a1 100644 --- a/codecov.yml +++ b/codecov.yml @@ -1 +1,5 @@ comment: off +coverage: + status: + changes: + default: on From 503e128cbe152b5fbf6a1fd32edffcc805e8ec8c Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sat, 25 Jan 2020 15:05:11 +0100 Subject: [PATCH 10/11] WIP: scripts/report-coverage.sh: codecov: pass -N --- scripts/report-coverage.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/scripts/report-coverage.sh b/scripts/report-coverage.sh index fbcf20ca929..bccf6a21ca0 100755 --- a/scripts/report-coverage.sh +++ b/scripts/report-coverage.sh @@ -15,4 +15,7 @@ python -m coverage xml python -m coverage report -m # Set --connect-timeout to work around https://github.com/curl/curl/issues/4461 curl -S -L --connect-timeout 5 --retry 6 -s https://codecov.io/bash -o codecov-upload.sh -bash codecov-upload.sh -Z -X fix -f coverage.xml "$@" + +base_branch="${GITHUB_BASE_REF:-${TRAVIS_BRANCH}}" +base_commit=$(git merge-base FETCH_HEAD "origin/$base_branch") +bash codecov-upload.sh -Z -X fix -f coverage.xml -N "$base_commit" "$@" From 4b7f0def20ba821ba2cf470e39a0af3a7b93f536 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sat, 25 Jan 2020 15:39:33 +0100 Subject: [PATCH 11/11] remove osx --- .travis.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/.travis.yml b/.travis.yml index f3c7a7ba524..30f15867d75 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,21 +16,6 @@ install: jobs: include: - # OSX tests - first (in test stage), since they are the slower ones. - # Coverage for: - # - osx - # - verbose=1 - - os: osx - osx_image: xcode10.1 - language: generic - env: TOXENV=py37-xdist PYTEST_COVERAGE=1 PYTEST_ADDOPTS=-v - before_install: - - which python3 - - python3 -V - - ln -sfn "$(which python3)" /usr/local/bin/python - - python -V - - test $(python -c 'import sys; print("%d%d" % sys.version_info[0:2])') = 37 - # Coverage for Python 3.5.{0,1} specific code, mostly typing related. - env: TOXENV=py35 PYTEST_COVERAGE=1 PYTEST_ADDOPTS="-k test_raises_cyclic_reference" python: '3.5.1'