Merge pull request #336 from kayjan/v0.23.0

kayjan · web-flow · commit ce55085ebe27 · 2024-12-26T19:53:35.000+08:00
Change logic to sort path
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 number	Diff line change
`@@ -1069,6 +1069,7 @@ def _merge_attribute(`
`1069`	`1069`	`common_attribute + "_y",`
`1070`	`1070`	`]`
`1071`	`1071`	`)`
	`1072`	`+ merged_data = merged_data.sort_values("path")`
`1072`	`1073`	`return construct.dataframe_to_tree(merged_data)`
`1073`	`1074`
`1074`	`1075`
Original file line number	Diff line number	Diff line change
`@@ -2454,7 +2454,6 @@ def test_copy_nodes_from_tree_to_tree_merge_leaves_merge_attribute(self):`
`2454`	`2454`	`merge_leaves=True,`
`2455`	`2455`	`merge_attribute=True,`
`2456`	`2456`	`)`
`2457`		`- self.root_other_full_wrong["b"].sort(key=lambda node: node.node_name)`
`2458`	`2457`	`assert_tree_structure_basenode_root(self.root_other_full_wrong)`
`2459`	`2458`	`assert_tree_structure_basenode_root_attr(self.root_other_full_wrong)`
`2460`	`2459`	`assert_tree_structure_node_root(self.root_other_full_wrong)`