Merge branch 'main' into uv/resolution-lowest

Author: weiji14

.github/workflows/check-links.yml

@@ -1,7 +1,7 @@
 # Check links in the repository and documentation
 #
-# This workflow runs the lychee tool to check all external links in plaintext
-# and HTML files. It will create an issue if broken links are found.
+# This workflow runs the lychee tool to check all external links in plaintext and HTML
+# files. It will create an issue if broken links are found.
 #
 # It is scheduled to run weekly at 12 noon every Sunday.
 #
@@ -76,7 +76,7 @@ jobs:
       run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
 
     - name: Create Issue From File
-      if: ${{ steps.lychee.outputs.exit_code }} != 0
+      if: steps.lychee.outputs.exit_code != 0
       run: |
         cd repository/
         title="Link Checker Report on ${CURRENT_DATE}"

.github/workflows/ci_tests.yaml

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

environment.yml

@@ -14,7 +14,7 @@ dependencies:
     - packaging
     # Optional dependencies
     - contextily
-    - geopandas
+    - geopandas>=1.0
     - ipython
     - pyarrow-core
     - rioxarray

pygmt/helpers/tempfile.py

@@ -9,7 +9,6 @@
 from tempfile import NamedTemporaryFile
 
 import numpy as np
-from packaging.version import Version
 
 
 def unique_name() -> str:
@@ -144,34 +143,16 @@ def tempfile_from_geojson(geojson):
             # https://github.com/geopandas/geopandas/issues/967#issuecomment-842877704
             # https://github.com/GenericMappingTools/pygmt/issues/2497
             int32_info = np.iinfo(np.int32)
-            # TODO(GeoPandas>=1.0): Remove the workaround for GeoPandas < 1.
-            # The default engine is "fiona" in v0.x and "pyogrio" in v1.x.
-            if Version(gpd.__version__).major < 1:  # GeoPandas v0.x
-                # The default engine 'fiona' supports the 'schema' parameter.
-                if geojson.index.name is None:
-                    geojson.index.name = "index"
-                geojson = geojson.reset_index(drop=False)
-                schema = gpd.io.file.infer_schema(geojson)
-                for col, dtype in schema["properties"].items():
-                    if dtype in {"int", "int64"}:
-                        overflow = (
-                            geojson[col].max() > int32_info.max
-                            or geojson[col].min() < int32_info.min
-                        )
-                        schema["properties"][col] = "float" if overflow else "int32"
-                        geojson[col] = geojson[col].astype(schema["properties"][col])
-                ogrgmt_kwargs["schema"] = schema
-            else:  # GeoPandas v1.x.
-                # The default engine "pyogrio" doesn't support the 'schema' parameter
-                # but we can change the dtype directly.
-                for col in geojson.columns:
-                    if geojson[col].dtype.name in {"int", "int64", "Int64"}:
-                        overflow = (
-                            geojson[col].max() > int32_info.max
-                            or geojson[col].min() < int32_info.min
-                        )
-                        dtype = "float" if overflow else "int32"
-                        geojson[col] = geojson[col].astype(dtype)
+            # The default engine "pyogrio" doesn't support the 'schema' parameter
+            # but we can change the dtype directly.
+            for col in geojson.columns:
+                if geojson[col].dtype.name in {"int", "int64", "Int64"}:
+                    overflow = (
+                        geojson[col].max() > int32_info.max
+                        or geojson[col].min() < int32_info.min
+                    )
+                    dtype = "float" if overflow else "int32"
+                    geojson[col] = geojson[col].astype(dtype)
             # Using geopandas.to_file to directly export to OGR_GMT format
             geojson.to_file(**ogrgmt_kwargs)
         except AttributeError:

pyproject.toml

@@ -46,7 +46,7 @@ dynamic = ["version"]
 [project.optional-dependencies]
 all = [
     "contextily>=1.2",
-    "geopandas>=0.14",
+    "geopandas>=1.0",
     "IPython>=8",  # 'ipython' is not the correct module name.
     "pyarrow>=13",
     "rioxarray>=0.14",