DataTree.lineage should be renamed to .parents xarray-contrib/datatre…

…e#286

* Replace 'lineage' occurences in code by 'parents'

* Replace 'lineage' occurences in api.rst by 'parents'

* MyPy ignore

* whats-new

* Re-introduce lineage and deprecate it

* Added credit

* Added back lineage in api.rst

* Update datatree/tests/test_treenode.py

Co-authored-by: Tom Nicholas <tom@cworthy.org>

* Updated lineage and parents, broke tests

* Replaced slash by point, tests pass

* New PR

* Fix tests

* Remove iter_parents from api.rst

* Avoid entering into the more complex else branch

---------

Co-authored-by: Tom Nicholas <tom@cworthy.org>

xarray/datatree_/.gitignore

@@ -132,4 +132,5 @@ dmypy.json
 # version
 _version.py
 
-.vscode
+# Ignore vscode specific settings
+.vscode/

xarray/datatree_/datatree/tests/test_treenode.py

@@ -95,7 +95,7 @@ def test_ancestors(self):
         michael = TreeNode(children={"Tony": tony})
         vito = TreeNode(children={"Michael": michael})
         assert tony.root is vito
-        assert tony.lineage == (tony, michael, vito)
+        assert tony.parents == (michael, vito)
         assert tony.ancestors == (vito, michael, tony)
 
 
@@ -279,12 +279,15 @@ def test_levelorderiter(self):
 
 
 class TestAncestry:
+    def test_parents(self):
+        _, leaf = create_test_tree()
+        expected = ["e", "b", "a"]
+        assert [node.name for node in leaf.parents] == expected
+
     def test_lineage(self):
         _, leaf = create_test_tree()
-        lineage = leaf.lineage
         expected = ["f", "e", "b", "a"]
-        for node, expected_name in zip(lineage, expected):
-            assert node.name == expected_name
+        assert [node.name for node in leaf.lineage] == expected
 
     def test_ancestors(self):
         _, leaf = create_test_tree()

xarray/datatree_/datatree/treenode.py

@@ -121,8 +121,7 @@ def _check_loop(self, new_parent: Tree | None) -> None:
                 )
 
     def _is_descendant_of(self, node: Tree) -> bool:
-        _self, *lineage = list(node.lineage)
-        return any(n is self for n in lineage)
+        return any(n is self for n in node.parents)
 
     def _detach(self, parent: Tree | None) -> None:
         if parent is not None:
@@ -236,26 +235,53 @@ def _post_attach_children(self: Tree, children: Mapping[str, Tree]) -> None:
         """Method call after attaching `children`."""
         pass
 
-    def iter_lineage(self: Tree) -> Iterator[Tree]:
+    def _iter_parents(self: Tree) -> Iterator[Tree]:
         """Iterate up the tree, starting from the current node."""
-        node: Tree | None = self
+        node: Tree | None = self.parent
         while node is not None:
             yield node
             node = node.parent
 
+    def iter_lineage(self: Tree) -> Tuple[Tree, ...]:
+        """Iterate up the tree, starting from the current node."""
+        from warnings import warn
+
+        warn(
+            "`iter_lineage` has been deprecated, and in the future will raise an error."
+            "Please use `parents` from now on.",
+            DeprecationWarning,
+        )
+        return tuple((self, *self.parents))
+
     @property
     def lineage(self: Tree) -> Tuple[Tree, ...]:
         """All parent nodes and their parent nodes, starting with the closest."""
-        return tuple(self.iter_lineage())
+        from warnings import warn
+
+        warn(
+            "`lineage` has been deprecated, and in the future will raise an error."
+            "Please use `parents` from now on.",
+            DeprecationWarning,
+        )
+        return self.iter_lineage()
+
+    @property
+    def parents(self: Tree) -> Tuple[Tree, ...]:
+        """All parent nodes and their parent nodes, starting with the closest."""
+        return tuple(self._iter_parents())
 
     @property
     def ancestors(self: Tree) -> Tuple[Tree, ...]:
         """All parent nodes and their parent nodes, starting with the most distant."""
-        if self.parent is None:
-            return (self,)
-        else:
-            ancestors = tuple(reversed(list(self.lineage)))
-            return ancestors
+
+        from warnings import warn
+
+        warn(
+            "`ancestors` has been deprecated, and in the future will raise an error."
+            "Please use `parents`. Example: `tuple(reversed(node.parents))`",
+            DeprecationWarning,
+        )
+        return tuple((*reversed(self.parents), self))
 
     @property
     def root(self: Tree) -> Tree:
@@ -351,7 +377,7 @@ def level(self: Tree) -> int:
         depth
         width
         """
-        return len(self.ancestors) - 1
+        return len(self.parents)
 
     @property
     def depth(self: Tree) -> int:
@@ -591,9 +617,9 @@ def path(self) -> str:
         if self.is_root:
             return "/"
         else:
-            root, *ancestors = self.ancestors
+            root, *ancestors = tuple(reversed(self.parents))
             # don't include name of root because (a) root might not have a name & (b) we want path relative to root.
-            names = [node.name for node in ancestors]
+            names = [*(node.name for node in ancestors), self.name]
             return "/" + "/".join(names)
 
     def relative_to(self: NamedNode, other: NamedNode) -> str:
@@ -608,7 +634,7 @@ def relative_to(self: NamedNode, other: NamedNode) -> str:
             )
 
         this_path = NodePath(self.path)
-        if other.path in list(ancestor.path for ancestor in self.lineage):
+        if other.path in list(parent.path for parent in (self, *self.parents)):
             return str(this_path.relative_to(other.path))
         else:
             common_ancestor = self.find_common_ancestor(other)
@@ -623,18 +649,17 @@ def find_common_ancestor(self, other: NamedNode) -> NamedNode:
 
         Raise ValueError if they are not in the same tree.
         """
-        common_ancestor = None
-        for node in other.iter_lineage():
-            if node.path in [ancestor.path for ancestor in self.ancestors]:
-                common_ancestor = node
-                break
+        if self is other:
+            return self
 
-        if not common_ancestor:
-            raise NotFoundInTreeError(
-                "Cannot find common ancestor because nodes do not lie within the same tree"
-            )
+        other_paths = [op.path for op in other.parents]
+        for parent in (self, *self.parents):
+            if parent.path in other_paths:
+                return parent
 
-        return common_ancestor
+        raise NotFoundInTreeError(
+            "Cannot find common ancestor because nodes do not lie within the same tree"
+        )
 
     def _path_to_ancestor(self, ancestor: NamedNode) -> NodePath:
         """Return the relative path from this node to the given ancestor node"""
@@ -643,12 +668,12 @@ def _path_to_ancestor(self, ancestor: NamedNode) -> NodePath:
             raise NotFoundInTreeError(
                 "Cannot find relative path to ancestor because nodes do not lie within the same tree"
             )
-        if ancestor.path not in list(a.path for a in self.ancestors):
+        if ancestor.path not in list(a.path for a in (self, *self.parents)):
             raise NotFoundInTreeError(
                 "Cannot find relative path to ancestor because given node is not an ancestor of this node"
             )
 
-        lineage_paths = list(ancestor.path for ancestor in self.lineage)
-        generation_gap = list(lineage_paths).index(ancestor.path)
-        path_upwards = "../" * generation_gap if generation_gap > 0 else "/"
+        parents_paths = list(parent.path for parent in (self, *self.parents))
+        generation_gap = list(parents_paths).index(ancestor.path)
+        path_upwards = "../" * generation_gap if generation_gap > 0 else "."
         return NodePath(path_upwards)

xarray/datatree_/docs/source/api.rst

@@ -38,6 +38,7 @@ Attributes relating to the recursive tree-like structure of a ``DataTree``.
    DataTree.descendants
    DataTree.siblings
    DataTree.lineage
+   DataTree.parents
    DataTree.ancestors
    DataTree.groups
 

xarray/datatree_/docs/source/whats-new.rst

@@ -26,6 +26,8 @@ New Features
 Breaking changes
 ~~~~~~~~~~~~~~~~
 
+- Renamed `DataTree.lineage` to `DataTree.parents` to match `pathlib` vocabulary
+  (:issue:`283`, :pull:`286`)
 - Minimum required version of xarray is now 2023.12.0, i.e. the latest version.
   This is required to prevent recent changes to xarray's internals from breaking datatree.
   (:issue:`293`, :pull:`294`)
@@ -37,6 +39,10 @@ Breaking changes
 Deprecations
 ~~~~~~~~~~~~
 
+- Renamed `DataTree.lineage` to `DataTree.parents` to match `pathlib` vocabulary
+  (:issue:`283`, :pull:`286`). `lineage` is now deprecated and use of `parents` is encouraged.
+  By `Etienne Schalk <https://github.com/etienneschalk>`_.
+
 Bug fixes
 ~~~~~~~~~
 - Keep attributes on nodes containing no data in :py:func:`map_over_subtree`. (:issue:`278`, :pull:`279`)