CI: guard dask-geopandas expr import to avoid a TypeError on Python 3…

….10 (#1356)
holoviz · Sep 13, 2024 · 5c62bf0 · 5c62bf0
1 parent 6208529
commit 5c62bf0
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/datashader/core.py b/datashader/core.py
@@ -1285,9 +1285,12 @@ def _source_from_geopandas(self, source):
             import dask_geopandas
             if Version(dask_geopandas.__version__) >= Version("0.4.0"):
                 from dask_geopandas.core import GeoDataFrame as gdf1
-                from dask_geopandas.expr import GeoDataFrame as gdf2
+                dfs.append(gdf1)
 
-                dfs.extend([gdf1, gdf2])
+                # See https://github.com/geopandas/dask-geopandas/issues/311
+                with contextlib.suppress(TypeError):
+                    from dask_geopandas.expr import GeoDataFrame as gdf2
+                    dfs.append(gdf2)
             else:
                 dfs.append(dask_geopandas.GeoDataFrame)