Merge branch 'main' into feature/clip

Author: seisman

.github/workflows/ci_tests.yaml

@@ -49,7 +49,7 @@ concurrency:
 
 jobs:
   test:
-    name: ${{ matrix.os }} - Python ${{ matrix.python-version }} / NumPy ${{ matrix.numpy-version }}
+    name: ${{ matrix.os }} - Python ${{ matrix.python-version }}
     runs-on: ${{ matrix.os }}
     permissions:
       id-token: write  # This is required for requesting OIDC token for codecov

pygmt/src/grdfill.py

@@ -185,13 +185,15 @@ def grdfill(
     Example
     -------
     Fill holes in a bathymetric grid with a constant value of 20.
+
     >>> import pygmt
     >>> # Load a bathymetric grid with missing data
     >>> earth_relief_holes = pygmt.datasets.load_sample_data(name="earth_relief_holes")
     >>> # Fill the holes with a constant value of 20
     >>> filled_grid = pygmt.grdfill(grid=earth_relief_holes, constantfill=20)
 
     Inquire the bounds of each hole.
+
     >>> pygmt.grdfill(grid=earth_relief_holes, inquire=True)
     array([[1.83333333, 6.16666667, 3.83333333, 8.16666667],
            [6.16666667, 7.83333333, 0.5       , 2.5       ]])

pygmt/tests/test_sphinterpolate.py

@@ -4,8 +4,10 @@
 
 from pathlib import Path
 
+import numpy as np
 import numpy.testing as npt
 import pytest
+from packaging.version import Version
 from pygmt import sphinterpolate
 from pygmt.datasets import load_sample_data
 from pygmt.enums import GridRegistration, GridType
@@ -42,4 +44,6 @@ def test_sphinterpolate_no_outgrid(mars):
     npt.assert_allclose(temp_grid.max(), 14628.144)
     npt.assert_allclose(temp_grid.min(), -6908.1987)
     npt.assert_allclose(temp_grid.median(), 118.96849)
-    npt.assert_allclose(temp_grid.mean(), 272.60593)
+    # TODO(NumPy>=2.3.0): Remove the numpy version check.
+    mean = 272.60568 if Version(np.__version__) >= Version("2.3.0dev") else 272.60593
+    npt.assert_allclose(temp_grid.mean(), mean)