From 0bb2cec1326274944f5b660193291bcaceef848b Mon Sep 17 00:00:00 2001 From: Wei Ji <23487320+weiji14@users.noreply.github.com> Date: Fri, 22 Nov 2024 13:58:27 +1300 Subject: [PATCH 1/4] Pin numpy<2 in ci_tests_legacy.yaml To fix `TypeError: ufunc 'create_collection' not supported for the input types, and the inputs could not be safely coerced to any supported types according to the casting rule ''safe''`. Xref https://github.com/shapely/shapely/issues/2098 --- .github/workflows/ci_tests_legacy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_tests_legacy.yaml b/.github/workflows/ci_tests_legacy.yaml index 5ac5dcedbbc..47d8a6ee887 100644 --- a/.github/workflows/ci_tests_legacy.yaml +++ b/.github/workflows/ci_tests_legacy.yaml @@ -62,7 +62,7 @@ jobs: python=3.10 gmt=${{ matrix.gmt_version }} ghostscript<10 - numpy + numpy<2 pandas xarray netCDF4 From 0ff11a54c245b3c7a86486bdf216d6095c53fd01 Mon Sep 17 00:00:00 2001 From: Wei Ji <23487320+weiji14@users.noreply.github.com> Date: Thu, 21 Nov 2024 15:16:10 +1300 Subject: [PATCH 2/4] Add --color=yes to test_no_images addopts Xref #3330 --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 4494f2996c3..2dd8243f95d 100644 --- a/Makefile +++ b/Makefile @@ -55,7 +55,7 @@ doctest: _runtest # run tests without image comparisons # run pytest without the --mpl option to disable image comparisons # use '-o addopts' to override 'addopts' settings in pyproject.toml file -test_no_images: PYTEST_ARGS=-o addopts="--verbose --durations=0 --durations-min=0.2 --doctest-modules" +test_no_images: PYTEST_ARGS=-o addopts="--verbose --color=yes --durations=0 --durations-min=0.2 --doctest-modules" test_no_images: _runtest format: From 1d174f8074213e5ecf1f1dafd6846c554cf220c1 Mon Sep 17 00:00:00 2001 From: Wei Ji <23487320+weiji14@users.noreply.github.com> Date: Thu, 21 Nov 2024 14:29:04 +1300 Subject: [PATCH 3/4] Temporarily enable ci_tests_legacy.yaml --- .github/workflows/ci_tests_legacy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_tests_legacy.yaml b/.github/workflows/ci_tests_legacy.yaml index 47d8a6ee887..ec7f7524fb1 100644 --- a/.github/workflows/ci_tests_legacy.yaml +++ b/.github/workflows/ci_tests_legacy.yaml @@ -12,7 +12,7 @@ on: # push: # branches: [ main ] # Uncomment the 'pull_request' line below to trigger the workflow in PR - # pull_request: + pull_request: # types: [ready_for_review] # paths: # - 'pygmt/**' From 8bdb9b0c5706945ed8853dd0f5faf8909696ed49 Mon Sep 17 00:00:00 2001 From: Wei Ji <23487320+weiji14@users.noreply.github.com> Date: Fri, 22 Nov 2024 14:29:51 +1300 Subject: [PATCH 4/4] Revert "Temporarily enable ci_tests_legacy.yaml" This reverts commit 1d174f8074213e5ecf1f1dafd6846c554cf220c1. --- .github/workflows/ci_tests_legacy.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci_tests_legacy.yaml b/.github/workflows/ci_tests_legacy.yaml index ec7f7524fb1..47d8a6ee887 100644 --- a/.github/workflows/ci_tests_legacy.yaml +++ b/.github/workflows/ci_tests_legacy.yaml @@ -12,7 +12,7 @@ on: # push: # branches: [ main ] # Uncomment the 'pull_request' line below to trigger the workflow in PR - pull_request: + # pull_request: # types: [ready_for_review] # paths: # - 'pygmt/**'