Merge pull request #336 from kayjan/v0.23.0

Change logic to sort path
kayjan · Dec 26, 2024 · ce55085 · ce55085
2 parents 35cb5d6 + 738e85c
commit ce55085
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/bigtree/tree/modify.py b/bigtree/tree/modify.py
@@ -1069,6 +1069,7 @@ def _merge_attribute(
                 common_attribute + "_y",
             ]
         )
+    merged_data = merged_data.sort_values("path")
     return construct.dataframe_to_tree(merged_data)
 
 

diff --git a/tests/tree/test_modify.py b/tests/tree/test_modify.py
@@ -2454,7 +2454,6 @@ def test_copy_nodes_from_tree_to_tree_merge_leaves_merge_attribute(self):
             merge_leaves=True,
             merge_attribute=True,
         )
-        self.root_other_full_wrong["b"].sort(key=lambda node: node.node_name)
         assert_tree_structure_basenode_root(self.root_other_full_wrong)
         assert_tree_structure_basenode_root_attr(self.root_other_full_wrong)
         assert_tree_structure_node_root(self.root_other_full_wrong)
-Original file line number
+Diff line change
@@ Expand Up / @@ -1069,6 +1069,7 @@ def _merge_attribute( @@
                     common_attribute + "_y",
                 ]
             )
+        merged_data = merged_data.sort_values("path")
         return construct.dataframe_to_tree(merged_data)
@@ Expand Down @@