update core tests

Author: hoxbro

holoviews/core/util/__init__.py

@@ -860,9 +860,7 @@ def asarray(arraylike, strict=True):
         return arraylike
     elif isinstance(arraylike, list):
         return np.asarray(arraylike, dtype=object)
-    elif not isinstance(arraylike, np.ndarray) and isinstance(arraylike, arraylike_types):
-        return arraylike.values
-    elif hasattr(arraylike, '__array__'):
+    elif hasattr(arraylike, '__array__') or isinstance(arraylike, arraylike_types):
         return np.asarray(arraylike)
     elif strict:
         raise ValueError(f'Could not convert {type(arraylike)} type to array')

holoviews/core/util/dependencies.py

@@ -112,5 +112,15 @@ def __version__(self):
 NUMPY_GE_2_0_0 = NUMPY_VERSION >= (2, 0, 0)
 PANDAS_GE_2_1_0 = PANDAS_VERSION >= (2, 1, 0)
 PANDAS_GE_2_2_0 = PANDAS_VERSION >= (2, 2, 0)
-
-__all__ = ["NUMPY_GE_2_0_0", "NUMPY_VERSION", "PANDAS_GE_2_1_0", "PANDAS_GE_2_2_0", "PANDAS_VERSION", "PARAM_VERSION", "_LazyModule"]
+PANDAS_GE_3_0_0 = PANDAS_VERSION >= (3, 0, 0)
+
+__all__ = [
+    "NUMPY_GE_2_0_0",
+    "NUMPY_VERSION",
+    "PANDAS_GE_2_1_0",
+    "PANDAS_GE_2_2_0",
+    "PANDAS_GE_3_0_0",
+    "PANDAS_VERSION",
+    "PARAM_VERSION",
+    "_LazyModule",
+]

holoviews/operation/element.py

@@ -32,6 +32,7 @@
 from ..core.util import (
     datetime_types,
     dt_to_int,
+    dtype_kind,
     group_sanitizer,
     is_cupy_array,
     is_dask_array,
@@ -1065,16 +1066,23 @@ class interpolate_curve(Operation):
 
     _per_element = True
 
+    @staticmethod
+    def _get_dtype(obj):
+        if dtype_kind(obj) == "O":
+            # Handle non-numpy objects like Pandas 3.0 StringArray
+            return "O"
+        return obj.dtype
+
     @classmethod
     def pts_to_prestep(cls, x, values):
         steps = np.zeros(2 * len(x) - 1)
-        value_steps = tuple(np.empty(2 * len(x) - 1, dtype=v.dtype) for v in values)
+        value_steps = tuple(np.empty(2 * len(x) - 1, dtype=cls._get_dtype(v)) for v in values)
 
         steps[0::2] = x
         steps[1::2] = steps[0:-2:2]
 
         val_arrays = []
-        for v, s in zip(values, value_steps, strict=None):
+        for v, s in zip(values, value_steps, strict=True):
             s[0::2] = v
             s[1::2] = s[2::2]
             val_arrays.append(s)
@@ -1084,13 +1092,13 @@ def pts_to_prestep(cls, x, values):
     @classmethod
     def pts_to_midstep(cls, x, values):
         steps = np.zeros(2 * len(x))
-        value_steps = tuple(np.empty(2 * len(x), dtype=v.dtype) for v in values)
+        value_steps = tuple(np.empty(2 * len(x), dtype=cls._get_dtype(v)) for v in values)
 
         steps[1:-1:2] = steps[2::2] = x[:-1] + (x[1:] - x[:-1])/2
         steps[0], steps[-1] = x[0], x[-1]
 
         val_arrays = []
-        for v, s in zip(values, value_steps, strict=None):
+        for v, s in zip(values, value_steps, strict=True):
             s[0::2] = v
             s[1::2] = s[0::2]
             val_arrays.append(s)
@@ -1100,13 +1108,13 @@ def pts_to_midstep(cls, x, values):
     @classmethod
     def pts_to_poststep(cls, x, values):
         steps = np.zeros(2 * len(x) - 1)
-        value_steps = tuple(np.empty(2 * len(x) - 1, dtype=v.dtype) for v in values)
+        value_steps = tuple(np.empty(2 * len(x) - 1, dtype=cls._get_dtype(v)) for v in values)
 
         steps[0::2] = x
         steps[1::2] = steps[2::2]
 
         val_arrays = []
-        for v, s in zip(values, value_steps, strict=None):
+        for v, s in zip(values, value_steps, strict=True):
             s[0::2] = v
             s[1::2] = s[0:-2:2]
             val_arrays.append(s)

holoviews/plotting/bokeh/path.py

@@ -6,7 +6,7 @@
 
 from ...core import util
 from ...core.dimension import Dimension
-from ...core.util import dtype_kind
+from ...core.util import arraylike_types, dtype_kind
 from ...element import Contours, Polygons
 from ...util.transform import dim
 from .callbacks import PolyDrawCallback, PolyEditCallback
@@ -50,7 +50,7 @@ def _element_transform(self, transform, element, ranges):
             data = super()._element_transform(transform, element, ranges)
             new_data = []
             for d in data:
-                if isinstance(d, np.ndarray) and len(d) == 1:
+                if isinstance(d, (np.ndarray, arraylike_types)) and len(d) == 1:
                     new_data.append(d[0])
                 else:
                     new_data.append(d)

holoviews/tests/core/data/test_pandasinterface.py

@@ -7,6 +7,7 @@
 from holoviews.core.data.pandas import PandasInterface
 from holoviews.core.dimension import Dimension
 from holoviews.core.spaces import HoloMap
+from holoviews.core.util.dependencies import PANDAS_GE_3_0_0
 from holoviews.element import Distribution, Points, Scatter
 
 from .base import HeterogeneousColumnTests, InterfaceTests
@@ -172,6 +173,14 @@ def test_dataset_range_with_object_index(self):
         ds = Dataset(df, kdims='index')
         assert ds.range('index') == ('A', 'D')
 
+    def test_dataset_dataset_ht_dtypes(self):
+        ds = self.table
+        string_dtype = pd.StringDtype(na_value=np.nan) if PANDAS_GE_3_0_0 else np.dtype('object')
+        assert ds.interface.dtype(ds, 'Gender') == string_dtype
+        assert ds.interface.dtype(ds, 'Age') == np.dtype(int)
+        assert ds.interface.dtype(ds, 'Weight') == np.dtype(int)
+        assert ds.interface.dtype(ds, 'Height') == np.dtype('float64')
+
 
 class PandasInterfaceTests(BasePandasInterfaceTests):
 
@@ -412,6 +421,14 @@ def test_groupby_one_index_one_column(self):
         for k, v in grouped.items():
             pd.testing.assert_frame_equal(v.data, ds.select(values=k).data)
 
+    def test_dataset_dataset_ht_dtypes(self):
+        ds = self.table
+        string_dtype = pd.StringDtype(na_value=np.nan) if PANDAS_GE_3_0_0 else np.dtype('object')
+        assert ds.interface.dtype(ds, 'Gender') == string_dtype
+        assert ds.interface.dtype(ds, 'Age') == np.dtype(int)
+        assert ds.interface.dtype(ds, 'Weight') == np.dtype(int)
+        assert ds.interface.dtype(ds, 'Height') == np.dtype('float64')
+
     def test_regression_no_auto_index(self):
         # https://github.com/holoviz/holoviews/issues/6298