Fixed RaggedArray tests after pandas changes (#982)

holoviz · Jan 7, 2021 · 9b4b719 · 9b4b719
1 parent c1b9c9d
commit 9b4b719
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/datashader/datatypes.py b/datashader/datatypes.py
@@ -500,7 +500,7 @@ def unique(self):
     def fillna(self, value=None, method=None, limit=None):
         # Override in RaggedArray to handle ndarray fill values
         from pandas.util._validators import validate_fillna_kwargs
-        from pandas.core.missing import pad_1d, backfill_1d
+        from pandas.core.missing import get_fill_func
 
         value, method = validate_fillna_kwargs(value, method)
 
@@ -514,7 +514,7 @@ def fillna(self, value=None, method=None, limit=None):
 
         if mask.any():
             if method is not None:
-                func = pad_1d if method == 'pad' else backfill_1d
+                func = get_fill_func(method)
                 new_values = func(self.astype(object), limit=limit,
                                   mask=mask)
                 new_values = self._from_sequence(new_values, dtype=self.dtype)

diff --git a/datashader/tests/test_datatypes.py b/datashader/tests/test_datatypes.py
@@ -834,3 +834,8 @@ def test_ravel(self):
     @pytest.mark.skip(reason="transpose with numpy array elements seems not supported")
     def test_transpose(self):
         pass
+
+    @pytest.mark.skip(reason="transpose with numpy array elements seems not supported")
+    def test_transpose_frame(self):
+        pass
+