From da424ba6d92e0ae55aeaec592569bf5bdc12705c Mon Sep 17 00:00:00 2001 From: Fabian Grunewald <32294573+fgrunewald@users.noreply.github.com> Date: Mon, 24 Apr 2023 10:28:00 +0200 Subject: [PATCH 1/7] Update CI This commit changes the way pytest is run and the code coverage is upload. Mainly coverage run is abandoned and a GH actions app used for making the upload. --- .github/workflows/run_tests.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index 883224746..5f5b9bf24 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -55,15 +55,14 @@ jobs: pip install -r requirements-tests.txt - name: Run pytest with codecoverage - run: | - coverage run --source=vermouth $(which pytest) -vv vermouth --hypothesis-show-statistics - coverage report --omit='*/bin/pytest' - + run: pytest --cov polyply - if: ${{ matrix.WITH_CODECOV }} - name: Report code coverage - run: | - codecov - + name: Upload coverage codecov + uses: codecov/codecov-action@v3 + with: + gcov_ignore: '*/bin/pytest' + verbose: true + lint: runs-on: ubuntu-latest From 7f264b4073ba33f9cb4ad27a687fd62c83b12ae9 Mon Sep 17 00:00:00 2001 From: Fabian Grunewald <32294573+fgrunewald@users.noreply.github.com> Date: Mon, 24 Apr 2023 10:49:31 +0200 Subject: [PATCH 2/7] fix spelling error --- .github/workflows/run_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index 5f5b9bf24..3e241fb1c 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -55,7 +55,7 @@ jobs: pip install -r requirements-tests.txt - name: Run pytest with codecoverage - run: pytest --cov polyply + run: pytest --cov vermouth - if: ${{ matrix.WITH_CODECOV }} name: Upload coverage codecov uses: codecov/codecov-action@v3 From 726cd2ac7ca4feb7dcc5fd812a466cfbd5a673f2 Mon Sep 17 00:00:00 2001 From: Fabian Grunewald <32294573+fgrunewald@users.noreply.github.com> Date: Mon, 24 Apr 2023 10:52:24 +0200 Subject: [PATCH 3/7] add hypothesis flag --- .github/workflows/run_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index 3e241fb1c..a5063196a 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -55,7 +55,7 @@ jobs: pip install -r requirements-tests.txt - name: Run pytest with codecoverage - run: pytest --cov vermouth + run: pytest --cov vermouth --hypothesis-show-statistics - if: ${{ matrix.WITH_CODECOV }} name: Upload coverage codecov uses: codecov/codecov-action@v3 From 5356bc6b1ddc309f3e9de80fd3c4e5c9e3095656 Mon Sep 17 00:00:00 2001 From: Fabian Grunewald <32294573+fgrunewald@users.noreply.github.com> Date: Mon, 24 Apr 2023 11:26:30 +0200 Subject: [PATCH 4/7] Update .github/workflows/run_tests.yml Co-authored-by: Peter C Kroon --- .github/workflows/run_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index a5063196a..dd226250b 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -55,7 +55,7 @@ jobs: pip install -r requirements-tests.txt - name: Run pytest with codecoverage - run: pytest --cov vermouth --hypothesis-show-statistics + run: pytest vermouth --cov=vermouth --hypothesis-show-statistics - if: ${{ matrix.WITH_CODECOV }} name: Upload coverage codecov uses: codecov/codecov-action@v3 From b77e8f280daef49948f7bd2af569982122a14c86 Mon Sep 17 00:00:00 2001 From: Fabian Grunewald <32294573+fgrunewald@users.noreply.github.com> Date: Mon, 24 Apr 2023 20:45:51 +0200 Subject: [PATCH 5/7] Update .github/workflows/run_tests.yml Co-authored-by: Peter C Kroon --- .github/workflows/run_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index dd226250b..c2561bd06 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -55,7 +55,7 @@ jobs: pip install -r requirements-tests.txt - name: Run pytest with codecoverage - run: pytest vermouth --cov=vermouth --hypothesis-show-statistics + run: pytest vermouth --cov=vermouth --cov-report=xml --hypothesis-show-statistics - if: ${{ matrix.WITH_CODECOV }} name: Upload coverage codecov uses: codecov/codecov-action@v3 From f30f52c0de6aa493ca97145d714ca56d9984b800 Mon Sep 17 00:00:00 2001 From: Fabian Grunewald <32294573+fgrunewald@users.noreply.github.com> Date: Mon, 24 Apr 2023 20:45:58 +0200 Subject: [PATCH 6/7] Update .github/workflows/run_tests.yml Co-authored-by: Peter C Kroon --- .github/workflows/run_tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/run_tests.yml b/.github/workflows/run_tests.yml index c2561bd06..06ee1e72a 100644 --- a/.github/workflows/run_tests.yml +++ b/.github/workflows/run_tests.yml @@ -60,7 +60,9 @@ jobs: name: Upload coverage codecov uses: codecov/codecov-action@v3 with: - gcov_ignore: '*/bin/pytest' + token: ${{ secrets.CODECOV_TOKEN }} + files: ./coverage.xml + fail_ci_if_error: true verbose: true lint: From f512b0c1bb30a79a7401cca40add91ab554cc5cd Mon Sep 17 00:00:00 2001 From: Fabian Grunewald <32294573+fgrunewald@users.noreply.github.com> Date: Tue, 25 Apr 2023 11:25:28 +0200 Subject: [PATCH 7/7] ignore tests --- .codecov.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.codecov.yml b/.codecov.yml index 116041477..c5cf9ee8e 100644 --- a/.codecov.yml +++ b/.codecov.yml @@ -10,5 +10,8 @@ coverage: patch: default: target: 90 + +ignore: + - vermouth/tests comment: off