Merge branch 'main' into alias-system

Author: seisman

.github/workflows/benchmarks.yml

@@ -87,7 +87,7 @@ jobs:
 
       # Run the benchmark tests
       - name: Run benchmarks
-        uses: CodSpeedHQ/action@v3.1.0
+        uses: CodSpeedHQ/action@v3.2.0
         with:
           # 'bash -el -c' is needed to use the custom shell.
           # See https://github.com/CodSpeedHQ/action/issues/65.

.github/workflows/ci_docs.yml

@@ -101,10 +101,9 @@ jobs:
             netCDF4
             packaging
             contextily
-            geopandas<1.0
+            geopandas
             ipython
             pyarrow
-            rasterio<1.4.3
             rioxarray
             make
             pip

.github/workflows/ci_doctests.yaml

@@ -61,7 +61,6 @@ jobs:
             geopandas
             ipython
             pyarrow
-            rasterio<1.4.3
             rioxarray
             make
             pip

.github/workflows/ci_tests.yaml

@@ -73,13 +73,13 @@ jobs:
             numpy-version: '1.24'
             pandas-version: '=2.0'
             xarray-version: '=2023.04'
-            optional-packages: ' contextily geopandas<1 ipython pyarrow rasterio<1.4.3 rioxarray sphinx-gallery'
+            optional-packages: ' contextily geopandas<1 ipython pyarrow rioxarray sphinx-gallery'
           # Python 3.12 + core packages (latest versions) + optional packages
           - python-version: '3.12'
             numpy-version: '2.1'
             pandas-version: ''
             xarray-version: ''
-            optional-packages: ' contextily geopandas>=1.0 ipython pyarrow rasterio<1.4.3 rioxarray sphinx-gallery'
+            optional-packages: ' contextily geopandas>=1.0 ipython pyarrow rioxarray sphinx-gallery'
           # Python 3.11 + core packages (Linux only)
           - os: 'ubuntu-latest'
             python-version: '3.11'

.github/workflows/ci_tests_dev.yaml

@@ -152,7 +152,7 @@ jobs:
           python -m pip install --pre --prefer-binary \
                         --extra-index https://pypi.anaconda.org/scientific-python-nightly-wheels/simple \
                         numpy pandas xarray netCDF4 packaging \
-                        build contextily dvc geopandas ipython pyarrow 'rasterio<1.4.3' rioxarray \
+                        build contextily dvc geopandas ipython pyarrow rioxarray \
                         pytest pytest-cov pytest-doctestplus pytest-mpl pytest-rerunfailures \
                         sphinx-gallery
 

.github/workflows/ci_tests_legacy.yaml

@@ -71,7 +71,6 @@ jobs:
             geopandas
             ipython
             pyarrow
-            rasterio<1.4.3
             rioxarray
             sphinx-gallery
             make

ci/requirements/docs.yml

@@ -14,10 +14,9 @@ dependencies:
     - packaging
     # Optional dependencies
     - contextily
-    - geopandas<1.0
+    - geopandas
     - ipython
     - pyarrow
-    - rasterio<1.4.3
     - rioxarray
     # Development dependencies (general)
     - make

pygmt/clib/session.py

@@ -400,7 +400,9 @@ def print_func(file_pointer, message):  # noqa: ARG001
         self._print_callback = print_func
 
         padding = self["GMT_PAD_DEFAULT"]
-        session_type = self["GMT_SESSION_EXTERNAL"]
+        # GMT_SESSION_EXTERNAL: GMT is called by an external wrapper.
+        # GMT_SESSION_NOGDALCLOSE: Do not call GDALDestroyDriverManager when using GDAL.
+        session_type = self["GMT_SESSION_EXTERNAL"] + self["GMT_SESSION_NOGDALCLOSE"]
         session = c_create_session(name.encode(), padding, session_type, print_func)
 
         if session is None:

pygmt/helpers/decorators.py

@@ -456,18 +456,22 @@ def fmt_docstring(module_func):
         Select map :doc:`projection </projections/index>`.
     <BLANKLINE>
     **Aliases:**
+    .. hlist::
+       :columns: 3
     <BLANKLINE>
-    - J = projection
-    - R = region
+       - J = projection
+       - R = region
     <BLANKLINE>
     """  # noqa: D410,D411
     filler_text = {}
 
     if hasattr(module_func, "aliases"):
         aliases = ["**Aliases:**\n"]
+        aliases.append(".. hlist::")
+        aliases.append("   :columns: 3\n")
         for arg in sorted(module_func.aliases):
             alias = module_func.aliases[arg]
-            aliases.append(f"- {arg} = {alias}")
+            aliases.append(f"   - {arg} = {alias}")
         filler_text["aliases"] = "\n".join(aliases)
 
     filler_text["table-like"] = (

pygmt/src/tilemap.py

@@ -50,7 +50,7 @@ def tilemap(
 
     **Note**: By default, standard web map tiles served in a Spherical Mercator
     (EPSG:3857) Cartesian format will be reprojected to a geographic coordinate
-    reference system (OGC:WGS84) and plotted with longitude/latitude bounds when
+    reference system (OGC:CRS84) and plotted with longitude/latitude bounds when
     ``lonlat=True``. If reprojection is not desired, please set ``lonlat=False`` and
     provide Spherical Mercator (EPSG:3857) coordinates to the ``region`` parameter.