Skip to content
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.

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

Change logic to sort path #336

Merged
merged 1 commit into from
Dec 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions bigtree/tree/modify.py
Original file line number Diff 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
1 change: 0 additions & 1 deletion tests/tree/test_modify.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading