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

[phylo] Reconnect traits to export #252

Merged
merged 5 commits into from
May 10, 2024
Merged

[phylo] Reconnect traits to export #252

merged 5 commits into from
May 10, 2024

Conversation

joverlee521
Copy link
Contributor

@joverlee521 joverlee521 commented May 9, 2024

Description of proposed changes

Reconnects the augur traits output to augur export based on the presence of the traits.columns config parameter.

Related issue(s)

Resolves #251

Checklist

  • Checks pass

Allow users to customize the augur traits command through config
params.
If there are no columns defined for `augur traits` then do not include
the traits input for the `--node-data` option for `augur export`.
Restoring behavior from 43fdaf1 by
providing an empty traits column config param.
@joverlee521 joverlee521 requested a review from a team May 9, 2024 20:15
@@ -32,9 +32,9 @@ OUTPUTS:

rule remove_time:
input:
"results/{build_name}/branch_lengths.json",
build_dir + "/{build_name}/branch_lengths.json",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is probably some snakemake lore i haven't absorbed yet, but i wonder: why concatenate instead of interpolate? (e.g., "{build_dir}/{build_name}/branch_lengths.json")

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, this is using concatenation because the workflow uses a mix of variable (build_dir) and Snakemake wildcard (build_name) in the file paths.

We could update it to f"{build_dir}/{{build_name}}/branch_lengths.json" with double braces around build_name to keep the wildcard reference.

@joverlee521 joverlee521 merged commit b91a9ff into master May 10, 2024
17 checks passed
@joverlee521 joverlee521 deleted the phylo-traits branch May 10, 2024 17:50
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.

[phylo] traits input not passed to augur export
2 participants