Revert "Enable passing pyarrow.StringArray to clib.Session.put_strings"

This reverts commit d379e46.

Author: weiji14

pygmt/clib/conversion.py

@@ -11,7 +11,6 @@
 import pandas as pd
 import xarray as xr
 from packaging.version import Version
-from pygmt._typing import StringArrayTypes
 from pygmt.exceptions import GMTInvalidInput
 
 
@@ -279,15 +278,15 @@ def sequence_to_ctypes_array(
     return (ctype * size)(*sequence)
 
 
-def strings_to_ctypes_array(strings: StringArrayTypes) -> ctp.Array:
+def strings_to_ctypes_array(strings: Sequence[str] | np.ndarray) -> ctp.Array:
     """
-    Convert a sequence (e.g., a list) or numpy.ndarray of strings or a
-    pyarrow.StringArray into a ctypes array.
+    Convert a sequence (e.g., a list) of strings or numpy.ndarray of strings into a
+    ctypes array.
 
     Parameters
     ----------
     strings
-        A sequence of strings, a numpy.ndarray of str dtype, or a pyarrow.StringArray.
+        A sequence of strings, or a numpy.ndarray of str dtype.
 
     Returns
     -------
@@ -303,7 +302,7 @@ def strings_to_ctypes_array(strings: StringArrayTypes) -> ctp.Array:
     >>> [s.decode() for s in ctypes_array]
     ['first', 'second', 'third']
     """
-    return (ctp.c_char_p * len(strings))(*[s.encode() for s in np.asarray(strings)])
+    return (ctp.c_char_p * len(strings))(*[s.encode() for s in strings])
 
 
 def array_to_datetime(array: Sequence[Any] | np.ndarray) -> np.ndarray:

pygmt/clib/session.py

@@ -16,7 +16,6 @@
 import numpy as np
 import pandas as pd
 import xarray as xr
-from pygmt._typing import StringArrayTypes
 from pygmt.clib.conversion import (
     array_to_datetime,
     dataarray_to_matrix,
@@ -1000,40 +999,39 @@ def put_vector(self, dataset: ctp.c_void_p, column: int, vector: np.ndarray):
             )
             raise GMTCLibError(msg)
 
-    def put_strings(
-        self, dataset: ctp.c_void_p, family: str, strings: StringArrayTypes
-    ):
+    def put_strings(self, dataset: ctp.c_void_p, family: str, strings: np.ndarray):
         """
-        Attach a 1-D numpy array of dtype str or pyarrow.StringArray as a column on a
-        GMT dataset.
+        Attach a numpy 1-D array of dtype str as a column on a GMT dataset.
 
-        Use this function to attach string type numpy array data to a GMT dataset and
-        pass it to GMT modules. Wraps ``GMT_Put_Strings``.
+        Use this function to attach string type numpy array data to a GMT
+        dataset and pass it to GMT modules. Wraps ``GMT_Put_Strings``.
 
-        The dataset must be created by :meth:`pygmt.clib.Session.create_data` first.
+        The dataset must be created by :meth:`pygmt.clib.Session.create_data`
+        first.
 
         .. warning::
-            The numpy array must be C contiguous in memory. If it comes from a column
-            slice of a 2-D array, for example, you will have to make a copy. Use
-            :func:`numpy.ascontiguousarray` to make sure your vector is contiguous (it
-            won't copy if it already is).
+            The numpy array must be C contiguous in memory. If it comes from a
+            column slice of a 2-D array, for example, you will have to make a
+            copy. Use :func:`numpy.ascontiguousarray` to make sure your vector
+            is contiguous (it won't copy if it already is).
 
         Parameters
         ----------
-        dataset
-            The ctypes void pointer to a ``GMT_VECTOR``/``GMT_MATRIX`` data container.
-            Create it with :meth:`pygmt.clib.Session.create_data`.
-        family
+        dataset : :class:`ctypes.c_void_p`
+            The ctypes void pointer to a ``GMT_Dataset``. Create it with
+            :meth:`pygmt.clib.Session.create_data`.
+        family : str
             The family type of the dataset. Can be either ``GMT_IS_VECTOR`` or
             ``GMT_IS_MATRIX``.
-        strings
-            The array that will be attached to the dataset. Must be a 1-D C contiguous
-            array.
+        strings : numpy 1-D array
+            The array that will be attached to the dataset. Must be a 1-D C
+            contiguous array.
 
         Raises
         ------
         GMTCLibError
-            If given invalid input or ``GMT_Put_Strings`` exits with a non-zero status.
+            If given invalid input or ``GMT_Put_Strings`` exits with
+            status != 0.
         """
         c_put_strings = self.get_libgmt_func(
             "GMT_Put_Strings",

pygmt/tests/test_clib_put_strings.py

@@ -8,31 +8,12 @@
 from pygmt import clib
 from pygmt.exceptions import GMTCLibError
 from pygmt.helpers import GMTTempFile
-from pygmt.helpers.testing import skip_if_no
-
-try:
-    import pyarrow as pa
-except ImportError:
-    pa = None
 
 
 @pytest.mark.benchmark
-@pytest.mark.parametrize(
-    ("array_func", "dtype"),
-    [
-        pytest.param(np.array, {"dtype": np.str_}, id="str"),
-        pytest.param(
-            getattr(pa, "array", None),
-            {"type": "string"},  # pa.string()
-            marks=skip_if_no(package="pyarrow"),
-            id="pyarrow",
-        ),
-    ],
-)
-def test_put_strings(array_func, dtype):
+def test_put_strings():
     """
-    Check that assigning a numpy array of dtype str, or a pyarrow.StringArray to a
-    dataset works.
+    Check that assigning a numpy array of dtype str to a dataset works.
     """
     with clib.Session() as lib:
         dataset = lib.create_data(
@@ -43,7 +24,7 @@ def test_put_strings(array_func, dtype):
         )
         x = np.array([1, 2, 3, 4, 5], dtype=np.int32)
         y = np.array([6, 7, 8, 9, 10], dtype=np.int32)
-        strings = array_func(["a", "bc", "defg", "hijklmn", "opqrst"], **dtype)
+        strings = np.array(["a", "bc", "defg", "hijklmn", "opqrst"], dtype=str)
         lib.put_vector(dataset, column=lib["GMT_X"], vector=x)
         lib.put_vector(dataset, column=lib["GMT_Y"], vector=y)
         lib.put_strings(

pygmt/tests/test_clib_virtualfiles.py

@@ -153,7 +153,7 @@ def test_open_virtual_file():
         pytest.param(np.array, {"dtype": np.object_}, id="object"),
         pytest.param(
             getattr(pa, "array", None),
-            {"type": "string"},  # pa.string()
+            {},  # pa.string()
             marks=skip_if_no(package="pyarrow"),
             id="pyarrow",
         ),