import DataTree from xarray

Author: melonora

src/spatialdata_plot/pl/basic.py

@@ -14,14 +14,13 @@
 import spatialdata as sd
 from anndata import AnnData
 from dask.dataframe import DataFrame as DaskDataFrame
-from datatree import DataTree
 from geopandas import GeoDataFrame
 from matplotlib.axes import Axes
 from matplotlib.colors import Colormap, Normalize
 from matplotlib.figure import Figure
 from spatialdata import get_extent
 from spatialdata._utils import _deprecation_alias
-from xarray import DataArray
+from xarray import DataArray, DataTree
 
 from spatialdata_plot._accessor import register_spatial_data_accessor
 from spatialdata_plot.pl.render import (

src/spatialdata_plot/pl/render.py

@@ -15,7 +15,6 @@
 import scanpy as sc
 import spatialdata as sd
 from anndata import AnnData
-from datatree import DataTree
 from matplotlib.cm import ScalarMappable
 from matplotlib.colors import ListedColormap, Normalize
 from scanpy._settings import settings as sc_settings
@@ -24,6 +23,7 @@
 from spatialdata.transformations import (
     set_transformation,
 )
+from xarray import DataTree
 
 from spatialdata_plot._logging import logger
 from spatialdata_plot.pl.render_params import (

src/spatialdata_plot/pl/utils.py

@@ -26,7 +26,6 @@
 from anndata import AnnData
 from cycler import Cycler, cycler
 from datashader.core import Canvas
-from datatree import DataTree
 from geopandas import GeoDataFrame
 from matplotlib import colors, patheffects, rcParams
 from matplotlib.axes import Axes
@@ -61,7 +60,7 @@
 from spatialdata.models import Image2DModel, Labels2DModel, PointsModel, SpatialElement, get_model
 from spatialdata.transformations.operations import get_transformation
 from spatialdata.transformations.transformations import Scale
-from xarray import DataArray
+from xarray import DataArray, DataTree
 
 from spatialdata_plot._logging import logger
 from spatialdata_plot.pl.render_params import (

tests/conftest.py

@@ -10,7 +10,6 @@
 import pytest
 import spatialdata as sd
 from anndata import AnnData
-from datatree import DataTree
 from geopandas import GeoDataFrame
 from matplotlib.testing.compare import compare_images
 from shapely.geometry import MultiPolygon, Polygon
@@ -25,7 +24,7 @@
     ShapesModel,
     TableModel,
 )
-from xarray import DataArray
+from xarray import DataArray, DataTree
 
 import spatialdata_plot  # noqa: F401