From 643c52584232fce028e5b75b33ad791104211775 Mon Sep 17 00:00:00 2001 From: Cristian Vera Date: Sat, 30 Oct 2021 19:34:34 -0300 Subject: [PATCH 01/11] Add github action for upload coverge to codecov --- .github/workflows/main.yml | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 684e603a9d9..81c29539fd6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -165,11 +165,15 @@ jobs: if: "matrix.use_coverage" run: "tox -e ${{ matrix.tox_env }}-coverage" - - name: Upload coverage - if: matrix.use_coverage && github.repository == 'pytest-dev/pytest' - env: - CODECOV_NAME: ${{ matrix.name }} - run: bash scripts/upload-coverage.sh -F GHA,${{ runner.os }} + - name: Generate coverge report + run: python -m coverage xml + + - name: Upload coverage to Codecov + uses: codecov/codecov-action@v2 + with: + fail_ci_if_error: true + files: ./coverage.xml + verbose: true deploy: if: github.event_name == 'push' && startsWith(github.event.ref, 'refs/tags') && github.repository == 'pytest-dev/pytest' From 8c592496878f36fc5489a5c3671c07cc277d70f5 Mon Sep 17 00:00:00 2001 From: Cristian Vera Date: Sat, 30 Oct 2021 19:52:04 -0300 Subject: [PATCH 02/11] Add changelog for changes --- changelog/9202.improvement.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog/9202.improvement.rst diff --git a/changelog/9202.improvement.rst b/changelog/9202.improvement.rst new file mode 100644 index 00000000000..f43b75a1d79 --- /dev/null +++ b/changelog/9202.improvement.rst @@ -0,0 +1 @@ +Add github action to upload coverage report to codecov instead of bash uploader. \ No newline at end of file From 0b4b7ad474966387854549f538d2c55b5801ff92 Mon Sep 17 00:00:00 2001 From: Cristian Vera Date: Sat, 30 Oct 2021 20:02:55 -0300 Subject: [PATCH 03/11] Generate coverage report if test with coverage --- .github/workflows/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 81c29539fd6..b743c3cefe6 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -165,7 +165,8 @@ jobs: if: "matrix.use_coverage" run: "tox -e ${{ matrix.tox_env }}-coverage" - - name: Generate coverge report + - name: Generate coverage report + if: " !matirx.use_coverage" run: python -m coverage xml - name: Upload coverage to Codecov From 0594ecd1d749047f49be52a938aab6e6cb77efff Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sat, 30 Oct 2021 23:05:09 +0000 Subject: [PATCH 04/11] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- changelog/9202.improvement.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog/9202.improvement.rst b/changelog/9202.improvement.rst index f43b75a1d79..916d75074b9 100644 --- a/changelog/9202.improvement.rst +++ b/changelog/9202.improvement.rst @@ -1 +1 @@ -Add github action to upload coverage report to codecov instead of bash uploader. \ No newline at end of file +Add github action to upload coverage report to codecov instead of bash uploader. From 144f7058f52919aa1596ca75c951cfe2060f92d0 Mon Sep 17 00:00:00 2001 From: Cristian Vera Date: Sat, 30 Oct 2021 20:25:07 -0300 Subject: [PATCH 05/11] Fix typo in generate coverage report step --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b743c3cefe6..a89983081b7 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -166,7 +166,7 @@ jobs: run: "tox -e ${{ matrix.tox_env }}-coverage" - name: Generate coverage report - if: " !matirx.use_coverage" + if: " !matrix.use_coverage" run: python -m coverage xml - name: Upload coverage to Codecov From 11d9105af7e28e30543924f71921f297ea0b112b Mon Sep 17 00:00:00 2001 From: Cristian Vera Date: Sat, 30 Oct 2021 20:28:55 -0300 Subject: [PATCH 06/11] Fix generate coverage report step --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index a89983081b7..9d3fdb56690 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -166,7 +166,7 @@ jobs: run: "tox -e ${{ matrix.tox_env }}-coverage" - name: Generate coverage report - if: " !matrix.use_coverage" + if: "! matrix.use_coverage" run: python -m coverage xml - name: Upload coverage to Codecov From 5653ce37ca323a979a6d79c3c65eb1c363436d49 Mon Sep 17 00:00:00 2001 From: Cristian Vera Date: Sat, 30 Oct 2021 20:46:38 -0300 Subject: [PATCH 07/11] Add use_coverage flag to steps --- .github/workflows/main.yml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9d3fdb56690..187e7cf848e 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -60,14 +60,17 @@ jobs: python: "3.6" os: windows-latest tox_env: "py36-xdist" + use_coverage: false - name: "windows-py37" python: "3.7" os: windows-latest tox_env: "py37-numpy" + use_coverage: false - name: "windows-py37-pluggy" python: "3.7" os: windows-latest tox_env: "py37-pluggymain-xdist" + use_coverage: false - name: "windows-py38" python: "3.8" os: windows-latest @@ -77,15 +80,18 @@ jobs: python: "3.9" os: windows-latest tox_env: "py39-xdist" + use_coverage: false - name: "windows-py310" python: "3.10-dev" os: windows-latest tox_env: "py310-xdist" + use_coverage: false - name: "ubuntu-py36" python: "3.6" os: ubuntu-latest tox_env: "py36-xdist" + use_coverage: false - name: "ubuntu-py37" python: "3.7" os: ubuntu-latest @@ -95,31 +101,38 @@ jobs: python: "3.7" os: ubuntu-latest tox_env: "py37-pluggymain-xdist" + use_coverage: false - name: "ubuntu-py37-freeze" python: "3.7" os: ubuntu-latest tox_env: "py37-freeze" + use_coverage: false - name: "ubuntu-py38" python: "3.8" os: ubuntu-latest tox_env: "py38-xdist" + use_coverage: false - name: "ubuntu-py39" python: "3.9" os: ubuntu-latest tox_env: "py39-xdist" + use_coverage: false - name: "ubuntu-py310" python: "3.10-dev" os: ubuntu-latest tox_env: "py310-xdist" + use_coverage: false - name: "ubuntu-pypy3" python: "pypy-3.7" os: ubuntu-latest tox_env: "pypy3-xdist" + use_coverage: false - name: "macos-py37" python: "3.7" os: macos-latest tox_env: "py37-xdist" + use_coverage: false - name: "macos-py38" python: "3.8" os: macos-latest @@ -130,11 +143,13 @@ jobs: python: "3.7" os: ubuntu-latest tox_env: "plugins" + use_coverage: false - name: "docs" python: "3.7" os: ubuntu-latest tox_env: "docs" + use_coverage: false - name: "doctesting" python: "3.7" os: ubuntu-latest From 36d0d264036b2596e9bad98c020a5e40fa9c08a9 Mon Sep 17 00:00:00 2001 From: Cristian Vera Date: Sat, 30 Oct 2021 20:55:48 -0300 Subject: [PATCH 08/11] Fix generate coverage report --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 187e7cf848e..5494f86ec51 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -181,7 +181,7 @@ jobs: run: "tox -e ${{ matrix.tox_env }}-coverage" - name: Generate coverage report - if: "! matrix.use_coverage" + if: "matrix.use_coverage" run: python -m coverage xml - name: Upload coverage to Codecov From 06b6486a5aaa7c9cafea039191fac22bb6b79f42 Mon Sep 17 00:00:00 2001 From: Cristian Vera Date: Sat, 30 Oct 2021 21:10:01 -0300 Subject: [PATCH 09/11] Fix upload coverage report to codecov step --- .github/workflows/main.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 5494f86ec51..0beb87675d0 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -185,6 +185,7 @@ jobs: run: python -m coverage xml - name: Upload coverage to Codecov + if: "matrix.use_coverage" uses: codecov/codecov-action@v2 with: fail_ci_if_error: true From 002e8e9f47e6cd57d36610b10c918499ccfeb269 Mon Sep 17 00:00:00 2001 From: Cristian Vera Date: Mon, 1 Nov 2021 09:53:19 -0300 Subject: [PATCH 10/11] Remove upload-coverage.sh --- scripts/upload-coverage.sh | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100755 scripts/upload-coverage.sh diff --git a/scripts/upload-coverage.sh b/scripts/upload-coverage.sh deleted file mode 100755 index 089fb67bfe0..00000000000 --- a/scripts/upload-coverage.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail -set -x - -# Install coverage. -if [[ -z ${TOXENV+x} || -z $TOXENV ]]; then - python -m pip install coverage -else - # Add last TOXENV to $PATH. - PATH="$PWD/.tox/${TOXENV##*,}/bin:$PATH" -fi - -# Run coverage. -python -m coverage xml - -# Download and verify latest Codecov bash uploader. -# Set --connect-timeout to work around https://github.com/curl/curl/issues/4461 -curl --silent --show-error --location --connect-timeout 5 --retry 6 -o codecov https://codecov.io/bash -VERSION=$(grep --only-matching 'VERSION=\"[0-9\.]*\"' codecov | cut -d'"' -f2) -if command -v sha256sum; then - sha256sum --check --strict --ignore-missing --quiet <(curl --silent "https://raw.githubusercontent.com/codecov/codecov-bash/${VERSION}/SHA256SUM") -else - shasum --algorithm 256 --check --strict --ignore-missing --quiet <(curl --silent "https://raw.githubusercontent.com/codecov/codecov-bash/${VERSION}/SHA256SUM") -fi - -# Upload coverage. -bash codecov -Z -X fix -f coverage.xml "$@" From c9543fb120bf4d948959a2830001699253346129 Mon Sep 17 00:00:00 2001 From: Cristian Vera Date: Mon, 1 Nov 2021 12:00:39 -0300 Subject: [PATCH 11/11] Remove use_coverage where is set to false --- .github/workflows/main.yml | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 0beb87675d0..92e2dc6be7c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -60,17 +60,14 @@ jobs: python: "3.6" os: windows-latest tox_env: "py36-xdist" - use_coverage: false - name: "windows-py37" python: "3.7" os: windows-latest tox_env: "py37-numpy" - use_coverage: false - name: "windows-py37-pluggy" python: "3.7" os: windows-latest tox_env: "py37-pluggymain-xdist" - use_coverage: false - name: "windows-py38" python: "3.8" os: windows-latest @@ -80,18 +77,15 @@ jobs: python: "3.9" os: windows-latest tox_env: "py39-xdist" - use_coverage: false - name: "windows-py310" python: "3.10-dev" os: windows-latest tox_env: "py310-xdist" - use_coverage: false - name: "ubuntu-py36" python: "3.6" os: ubuntu-latest tox_env: "py36-xdist" - use_coverage: false - name: "ubuntu-py37" python: "3.7" os: ubuntu-latest @@ -101,38 +95,31 @@ jobs: python: "3.7" os: ubuntu-latest tox_env: "py37-pluggymain-xdist" - use_coverage: false - name: "ubuntu-py37-freeze" python: "3.7" os: ubuntu-latest tox_env: "py37-freeze" - use_coverage: false - name: "ubuntu-py38" python: "3.8" os: ubuntu-latest tox_env: "py38-xdist" - use_coverage: false - name: "ubuntu-py39" python: "3.9" os: ubuntu-latest tox_env: "py39-xdist" - use_coverage: false - name: "ubuntu-py310" python: "3.10-dev" os: ubuntu-latest tox_env: "py310-xdist" - use_coverage: false - name: "ubuntu-pypy3" python: "pypy-3.7" os: ubuntu-latest tox_env: "pypy3-xdist" - use_coverage: false - name: "macos-py37" python: "3.7" os: macos-latest tox_env: "py37-xdist" - use_coverage: false - name: "macos-py38" python: "3.8" os: macos-latest @@ -143,13 +130,11 @@ jobs: python: "3.7" os: ubuntu-latest tox_env: "plugins" - use_coverage: false - name: "docs" python: "3.7" os: ubuntu-latest tox_env: "docs" - use_coverage: false - name: "doctesting" python: "3.7" os: ubuntu-latest