Merge branch 'main' into exception/parametererror

Author: seisman

.github/workflows/benchmarks.yml

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

.github/workflows/ci_tests.yaml

@@ -151,7 +151,7 @@ jobs:
           GH_TOKEN: ${{ github.token }}
 
       - name: Install uv
-        uses: astral-sh/setup-uv@bd01e18f51369d5a26f1651c3cb451d3417e3bba # v6.3.1
+        uses: astral-sh/setup-uv@7edac99f961f18b581bbd960d59d049f04c0002f # v6.4.1
         with:
           activate-environment: true
           python-version: ${{ matrix.python-version }}

pygmt/helpers/utils.py

@@ -604,7 +604,8 @@ def build_arg_list(  # noqa: PLR0912
 
 def is_nonstr_iter(value: Any) -> bool:
     """
-    Check if the value is iterable (e.g., list, tuple, array) but not a string.
+    Check if the value is iterable (e.g., list, tuple, array) but not a string or a 0-D
+    array.
 
     Parameters
     ----------
@@ -633,8 +634,14 @@ def is_nonstr_iter(value: Any) -> bool:
     True
     >>> is_nonstr_iter(np.array(["abc", "def", "ghi"]))
     True
+    >>> is_nonstr_iter(np.array(42))
+    False
     """
-    return isinstance(value, Iterable) and not isinstance(value, str)
+    return (
+        isinstance(value, Iterable)
+        and not isinstance(value, str)
+        and not (hasattr(value, "ndim") and value.ndim == 0)
+    )
 
 
 def launch_external_viewer(fname: PathLike, waiting: float = 0) -> None:

pygmt/tests/test_datatypes_dataset.py

@@ -6,6 +6,7 @@
 
 import pandas as pd
 import pytest
+from packaging.version import Version
 from pygmt import which
 from pygmt.clib import Session
 from pygmt.helpers import GMTTempFile
@@ -25,8 +26,12 @@ def dataframe_from_pandas(filepath_or_buffer, sep=r"\s+", comment="#", header=No
 
     # By default, pandas reads text strings with whitespaces as multiple columns, but
     # GMT concatenates all trailing text as a single string column. Need do find all
-    # string columns (with dtype="object") and combine them into a single string column.
-    string_columns = df.select_dtypes(include=["object"]).columns
+    # string columns and combine them into a single string column.
+    # For pandas<3.0, string columns have dtype="object".
+    # For pandas>=3.0, string columns have dtype="str".
+    # TODO(pandas>=3.0): Remove the pandas version check.
+    dtype = "object" if Version(pd.__version__) < Version("3.0.0.dev0") else "str"
+    string_columns = df.select_dtypes(include=[dtype]).columns
     if len(string_columns) > 1:
         df[string_columns[0]] = df[string_columns].apply(lambda x: " ".join(x), axis=1)
         df = df.drop(string_columns[1:], axis=1)