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

Support v2 auspice JSONs in json_to_tree #432

Merged
merged 1 commit into from
Jan 25, 2020
Merged

Conversation

huddlej
Copy link
Contributor

@huddlej huddlej commented Jan 22, 2020

Updates the json_to_tree utility to support v2 auspice JSONs which previously
caused the tool to break. This commit minimally modifies the original function
to pull out the tree information from v2 JSONs. The function does not attempt to
maintain the same attribute interface between v1 and v2 JSONs. For example, the
attr attribute from v1 JSONs is split into the node_attrs and branch_attrs
attributes in v2 JSONs and the json_to_tree function does not try to force all
outputs to have a unified attr attribute.

This commit also adds a v2 tree and metadata JSON from the Zika tutorial build
to the test data and doctests for the new json_to_tree support for these v2
JSONs.

Closes #428.

Updates the json_to_tree utility to support v2 auspice JSONs which previously
caused the tool to break. This commit minimally modifies the original function
to pull out the tree information from v2 JSONs. The function does not attempt to
maintain the same attribute interface between v1 and v2 JSONs. For example, the
`attr` attribute from v1 JSONs is split into the `node_attrs` and `branch_attrs`
attributes in v2 JSONs and the json_to_tree function does not try to force all
outputs to have a unified `attr` attribute.

This commit also adds a v2 tree and metadata JSON from the Zika tutorial build
to the test data and doctests for the new json_to_tree support for these v2
JSONs.

Closes #428.
@trvrb
Copy link
Member

trvrb commented Jan 25, 2020

Thank you John!

@trvrb trvrb merged commit 2f43d09 into master Jan 25, 2020
@trvrb trvrb deleted the upgrade-json-to-tree branch January 25, 2020 16:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

json_to_tree utility does not parse v2 auspice JSONs
2 participants