From 3fcb31d748938722d72b11a4480df25e2ad45847 Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Fri, 15 Nov 2024 13:38:16 +0800 Subject: [PATCH 1/5] Use --override-ini option to override the 'addopts' option in pyproject.toml --- .github/workflows/benchmarks.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index ccb22dbe5a2..d2095cb406b 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -91,4 +91,4 @@ jobs: with: # 'bash -el -c' is needed to use the custom shell. # See https://github.com/CodSpeedHQ/action/issues/65. - run: bash -el -c "python -c \"import pygmt; pygmt.show_versions()\"; PYGMT_USE_EXTERNAL_DISPLAY=false python -m pytest -r P --pyargs pygmt --codspeed" + run: bash -el -c "python -c \"import pygmt; pygmt.show_versions()\"; PYGMT_USE_EXTERNAL_DISPLAY=false python -m pytest -r P --pyargs pygmt --codspeed --override-ini addopts='--verbose'" From 0dd80b69c29ea1481a077031a4c8260e7341a4c6 Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Fri, 15 Nov 2024 11:25:42 +0800 Subject: [PATCH 2/5] No need to install the pytest-mpl plugin --- .github/workflows/benchmarks.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index d2095cb406b..a0426fb6f55 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -68,7 +68,6 @@ jobs: pyarrow pytest pytest-codspeed - pytest-mpl # Download cached remote files (artifacts) from GitHub - name: Download remote data from GitHub From 73650654bafca5fbafce2243d61539a664e83a8d Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Fri, 15 Nov 2024 14:23:34 +0800 Subject: [PATCH 3/5] Register the mpl_image_compare marker --- pyproject.toml | 1 + 1 file changed, 1 insertion(+) diff --git a/pyproject.toml b/pyproject.toml index 8400da80625..5783e1c2fe2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -173,4 +173,5 @@ minversion = "6.0" addopts = "--verbose --color=yes --durations=0 --durations-min=0.2 --doctest-modules --mpl --mpl-results-path=results" markers = [ "benchmark: mark a test with custom benchmark settings.", + "mpl_image_compare: Compares matplotlib figures against a baseline image", ] From 5f5cc963bc83ba996f3051893d8d679d1e67f13b Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Fri, 15 Nov 2024 14:47:28 +0800 Subject: [PATCH 4/5] Add pytest-mpl back --- .github/workflows/benchmarks.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index a0426fb6f55..d2095cb406b 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -68,6 +68,7 @@ jobs: pyarrow pytest pytest-codspeed + pytest-mpl # Download cached remote files (artifacts) from GitHub - name: Download remote data from GitHub From e4dcb621a888a08573a32c2ad468d877eeb38fcb Mon Sep 17 00:00:00 2001 From: Dongdong Tian Date: Fri, 15 Nov 2024 15:02:10 +0800 Subject: [PATCH 5/5] Revert "Register the mpl_image_compare marker" This reverts commit 73650654bafca5fbafce2243d61539a664e83a8d. --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 5783e1c2fe2..8400da80625 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -173,5 +173,4 @@ minversion = "6.0" addopts = "--verbose --color=yes --durations=0 --durations-min=0.2 --doctest-modules --mpl --mpl-results-path=results" markers = [ "benchmark: mark a test with custom benchmark settings.", - "mpl_image_compare: Compares matplotlib figures against a baseline image", ]