From 6508b393ff10e354189c92b2776365267d759b9f Mon Sep 17 00:00:00 2001 From: TimMonko <47310455+TimMonko@users.noreply.github.com> Date: Thu, 6 Mar 2025 10:10:51 -0600 Subject: [PATCH 1/7] add color --- .github/workflows/test_and_deploy.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index 3c4f138..b790d0d 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -16,6 +16,9 @@ on: - npe2 workflow_dispatch: +env: + FORCE_COLOR: 1 + jobs: test: name: ${{ matrix.platform }} py${{ matrix.python-version }} From 1c4d3740ec99b0b6a23f17cc75b47247d15180ea Mon Sep 17 00:00:00 2001 From: TimMonko <47310455+TimMonko@users.noreply.github.com> Date: Thu, 6 Mar 2025 10:17:30 -0600 Subject: [PATCH 2/7] add codecov token --- .github/workflows/test_and_deploy.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index b790d0d..c39cad9 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -65,7 +65,14 @@ jobs: PLATFORM: ${{ matrix.platform }} - name: Coverage - uses: codecov/codecov-action@v3 + uses: codecov/codecov-action@v5 + with: + token: CODECOV_TOKEN=be4e7201-27a9-4b44-a4a6-ff2903872cf1 + files: .tox/*/coverage.xml + flags: unittests + name: codecov-umbrella + fail_ci_if_error: true + deploy: # this will run when you have tagged a commit, starting with "v*" From 7fa1b8509a708929c95ea81186fecb153b92e780 Mon Sep 17 00:00:00 2001 From: TimMonko <47310455+TimMonko@users.noreply.github.com> Date: Thu, 6 Mar 2025 10:23:27 -0600 Subject: [PATCH 3/7] add module name to tox.ini --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index 51b38c3..0570819 100644 --- a/tox.ini +++ b/tox.ini @@ -30,4 +30,4 @@ passenv = PYVISTA_OFF_SCREEN extras = testing -commands = pytest -v --color=yes --cov={{module_name}} --cov-report=xml +commands = pytest -v --color=yes --cov=platemapper --cov-report=xml From 9635ff42ce528793126f3114de4520caeb334240 Mon Sep 17 00:00:00 2001 From: TimMonko <47310455+TimMonko@users.noreply.github.com> Date: Thu, 6 Mar 2025 10:25:22 -0600 Subject: [PATCH 4/7] change token --- .github/workflows/test_and_deploy.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index c39cad9..9a7151a 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -67,7 +67,7 @@ jobs: - name: Coverage uses: codecov/codecov-action@v5 with: - token: CODECOV_TOKEN=be4e7201-27a9-4b44-a4a6-ff2903872cf1 + token: be4e7201-27a9-4b44-a4a6-ff2903872cf1 files: .tox/*/coverage.xml flags: unittests name: codecov-umbrella From 5439211516cb4e49bc6d28a217147f88d974ece8 Mon Sep 17 00:00:00 2001 From: TimMonko <47310455+TimMonko@users.noreply.github.com> Date: Thu, 6 Mar 2025 10:33:29 -0600 Subject: [PATCH 5/7] try removing token info --- .github/workflows/test_and_deploy.yml | 6 ------ 1 file changed, 6 deletions(-) diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index 9a7151a..ba34e72 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -66,12 +66,6 @@ jobs: - name: Coverage uses: codecov/codecov-action@v5 - with: - token: be4e7201-27a9-4b44-a4a6-ff2903872cf1 - files: .tox/*/coverage.xml - flags: unittests - name: codecov-umbrella - fail_ci_if_error: true deploy: From 9415d709480079971cd6862e0479c2930bb3ad53 Mon Sep 17 00:00:00 2001 From: TimMonko <47310455+TimMonko@users.noreply.github.com> Date: Thu, 6 Mar 2025 14:44:04 -0600 Subject: [PATCH 6/7] readd codecov token and fix tox --- .github/workflows/test_and_deploy.yml | 6 ++++++ tox.ini | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/test_and_deploy.yml b/.github/workflows/test_and_deploy.yml index ba34e72..9a7151a 100644 --- a/.github/workflows/test_and_deploy.yml +++ b/.github/workflows/test_and_deploy.yml @@ -66,6 +66,12 @@ jobs: - name: Coverage uses: codecov/codecov-action@v5 + with: + token: be4e7201-27a9-4b44-a4a6-ff2903872cf1 + files: .tox/*/coverage.xml + flags: unittests + name: codecov-umbrella + fail_ci_if_error: true deploy: diff --git a/tox.ini b/tox.ini index 0570819..b2002a8 100644 --- a/tox.ini +++ b/tox.ini @@ -1,10 +1,11 @@ # For more information about tox, see https://tox.readthedocs.io/en/latest/ [tox] -envlist = py{39,310,311,312}-{linux,macos,windows} +envlist = py{39,310,311,312,313}-{linux,macos,windows} isolated_build=true [gh-actions] python = + 3.9: py39 3.10: py310 3.11: py311 3.12: py312 From d0bdc502a7806a7c39306d7c73b61ea056f119bc Mon Sep 17 00:00:00 2001 From: TimMonko <47310455+TimMonko@users.noreply.github.com> Date: Thu, 6 Mar 2025 14:54:55 -0600 Subject: [PATCH 7/7] try codecov branch --- tox.ini | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tox.ini b/tox.ini index b2002a8..0bd858d 100644 --- a/tox.ini +++ b/tox.ini @@ -32,3 +32,6 @@ passenv = extras = testing commands = pytest -v --color=yes --cov=platemapper --cov-report=xml + +[coverage:run] +branch = True