Skip to content

DataTree should not be "Generic" #9445

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 8, 2024
Merged

DataTree should not be "Generic" #9445

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
560a038
DataTree should not be "Generic"
shoyer Sep 7, 2024
aff87f0
Fix type error
shoyer Sep 7, 2024
24bdc11
type ignore
shoyer Sep 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions xarray/core/datatree.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
Mapping,
)
from html import escape
from typing import TYPE_CHECKING, Any, Generic, Literal, NoReturn, Union, overload
from typing import TYPE_CHECKING, Any, Literal, NoReturn, Union, overload

from xarray.core import utils
from xarray.core.alignment import align
Expand All @@ -37,7 +37,7 @@
from xarray.core.indexes import Index, Indexes
from xarray.core.merge import dataset_update_method
from xarray.core.options import OPTIONS as XR_OPTS
from xarray.core.treenode import NamedNode, NodePath, Tree
from xarray.core.treenode import NamedNode, NodePath
from xarray.core.utils import (
Default,
Frozen,
Expand Down Expand Up @@ -369,8 +369,7 @@ class DataTree(
MappedDataWithCoords,
DataTreeArithmeticMixin,
TreeAttrAccessMixin,
Generic[Tree],
Mapping,
Mapping[str, "DataArray | DataTree"],
):
"""
A tree-like hierarchical collection of xarray objects.
Expand Down Expand Up @@ -705,8 +704,8 @@ def __contains__(self, key: object) -> bool:
def __bool__(self) -> bool:
return bool(self._data_variables) or bool(self._children)

def __iter__(self) -> Iterator[Hashable]:
return itertools.chain(self._data_variables, self._children)
def __iter__(self) -> Iterator[str]:
return itertools.chain(self._data_variables, self._children) # type: ignore

def __array__(self, dtype=None, copy=None):
raise TypeError(
Expand Down
Loading