Merge branch 'main' into grdclip/S

Author: seisman

.github/workflows/check-links.yml

@@ -40,7 +40,7 @@ jobs:
 
     - name: Link Checker
       id: lychee
-      uses: lycheeverse/lychee-action@v2.3.0
+      uses: lycheeverse/lychee-action@v2.4.0
       with:
         fail: false  # Don't fail action on broken links
         output: /tmp/lychee-out.md

.github/workflows/ci_tests.yaml

@@ -72,9 +72,9 @@ jobs:
         include:
           # Python 3.11 + core packages (minimum supported versions) + optional packages (minimum supported versions if any)
           - python-version: '3.11'
-            numpy-version: '1.25'
+            numpy-version: '1.26'
             pandas-version: '=2.1'
-            xarray-version: '=2023.04'
+            xarray-version: '=2023.07'
             optional-packages: ' contextily geopandas ipython pyarrow-core rioxarray sphinx-gallery'
           # Python 3.13 + core packages (latest versions) + optional packages
           - python-version: '3.13'

.github/workflows/ci_tests_legacy.yaml

@@ -36,7 +36,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04, ubuntu-22.04-arm, macos-13, windows-2019]
+        os: [ubuntu-22.04, ubuntu-22.04-arm, macos-13, windows-2022]
         gmt_version: ['6.4']
     timeout-minutes: 30
     defaults:
@@ -61,15 +61,15 @@ jobs:
             python=3.11
             gmt=${{ matrix.gmt_version }}
             ghostscript<10
-            numpy<2
+            numpy=1.26
             pandas
             xarray
             netCDF4
             packaging
-            contextily
+            contextily=1.5
             geopandas=1.0
             ipython
-            pyarrow-core
+            pyarrow-core=16
             rioxarray
             sphinx-gallery
             make

.github/workflows/format-command.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       # Generate token from GenericMappingTools bot
-      - uses: actions/create-github-app-token@v1.12.0
+      - uses: actions/create-github-app-token@v2.0.2
         id: generate-token
         with:
           app-id: ${{ secrets.APP_ID }}

environment.yml

@@ -7,16 +7,16 @@ dependencies:
     # Required dependencies
     - gmt=6.5.0
     - ghostscript=10.04.0
-    - numpy>=1.25
+    - numpy>=1.26
     - pandas>=2.1
-    - xarray>=2023.04
+    - xarray>=2023.07
     - netCDF4
     - packaging
     # Optional dependencies
-    - contextily
+    - contextily>=1.5
     - geopandas>=1.0
     - ipython
-    - pyarrow-core
+    - pyarrow-core>=16
     - rioxarray
     # Development dependencies (general)
     - dvc

pygmt/datasets/tile_map.py

@@ -6,8 +6,6 @@
 from collections.abc import Sequence
 from typing import Literal
 
-from packaging.version import Version
-
 try:
     import contextily
     from rasterio.crs import CRS
@@ -100,9 +98,6 @@ def load_tile_map(
         The amount to adjust a chosen zoom level if it is chosen automatically. Values
         outside of -1 to 1 are not recommended as they can lead to slow execution.
 
-        .. note::
-           The ``zoom_adjust`` parameter requires ``contextily>=1.5.0``.
-
     Returns
     -------
     raster
@@ -165,16 +160,8 @@ def load_tile_map(
         "ll": lonlat,
         "wait": wait,
         "max_retries": max_retries,
+        "zoom_adjust": zoom_adjust,
     }
-    # TODO(contextily>=1.5.0): Remove the check for the 'zoom_adjust' parameter.
-    if zoom_adjust is not None:
-        if Version(contextily.__version__) < Version("1.5.0"):
-            msg = (
-                "The `zoom_adjust` parameter requires `contextily>=1.5.0` to work. "
-                "Please upgrade contextily, or manually set the `zoom` level instead."
-            )
-            raise ValueError(msg)
-        contextily_kwargs["zoom_adjust"] = zoom_adjust
 
     west, east, south, north = region
     image, extent = contextily.bounds2img(

pygmt/src/tilemap.py

@@ -102,10 +102,6 @@ def tilemap(
     zoom_adjust
         The amount to adjust a chosen zoom level if it is chosen automatically. Values
         outside of -1 to 1 are not recommended as they can lead to slow execution.
-
-        .. note::
-           The ``zoom_adjust`` parameter requires ``contextily>=1.5.0``.
-
     kwargs : dict
         Extra keyword arguments to pass to :meth:`pygmt.Figure.grdimage`.
     """

pygmt/tests/test_clib_to_numpy.py

@@ -24,8 +24,6 @@ class pa:  # noqa: N801
         A dummy class to mimic pyarrow.
         """
 
-        __version__ = "0.0.0"
-
         @staticmethod
         def timestamp(unit: str, tz: str | None = None):
             """
@@ -625,14 +623,7 @@ def test_to_numpy_pyarrow_numeric_with_na(dtype, expected_dtype):
         "utf8",  # alias for string
         "large_string",
         "large_utf8",  # alias for large_string
-        pytest.param(
-            "string_view",
-            # TODO(pyarrow>=16): Remove the skipif marker for pyarrow<16.
-            marks=pytest.mark.skipif(
-                Version(pa.__version__) < Version("16"),
-                reason="string_view type was added since pyarrow 16",
-            ),
-        ),
+        "string_view",
     ],
 )
 def test_to_numpy_pyarrow_string(dtype):

pyproject.toml

@@ -35,20 +35,20 @@ classifiers = [
     "Programming Language :: Python :: 3.13",
 ]
 dependencies = [
-    "numpy>=1.25",
+    "numpy>=1.26",
     "pandas>=2.1",
-    "xarray>=2023.04",
+    "xarray>=2023.07",
     "netCDF4",
     "packaging",
 ]
 dynamic = ["version"]
 
 [project.optional-dependencies]
 all = [
-    "contextily",
+    "contextily>=1.5",
     "geopandas>=1.0",
     "IPython",  # 'ipython' is not the correct module name.
-    "pyarrow",
+    "pyarrow>=16",
     "rioxarray",
 ]
 

requirements.txt

@@ -1,6 +1,6 @@
 # Required packages
-numpy>=1.25
+numpy>=1.26
 pandas>=2.1
-xarray>=2023.04
+xarray>=2023.07
 netCDF4
 packaging