Skip to content

Commit 8fb92b5

Browse files
committed
phylogenetic: Use strain as default tip label
Testing <nextstrain/auspice#1668> Following changes made in mpox <nextstrain/mpox@4a268ba>
1 parent 418327a commit 8fb92b5

File tree

3 files changed

+6
-72
lines changed

3 files changed

+6
-72
lines changed

phylogenetic/defaults/auspice_config.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,12 @@
4646
"region"
4747
],
4848
"display_defaults": {
49-
"map_triplicate": true
49+
"map_triplicate": true,
50+
"tip_label": "strain"
5051
},
52+
"metadata_columns": [
53+
"strain"
54+
],
5155
"filters": [
5256
"country",
5357
"region",

phylogenetic/rules/export.smk

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ rule export:
3838
auspice_config = "defaults/auspice_config.json",
3939
description = "defaults/description.md"
4040
output:
41-
auspice_json = "results/raw_zika.json"
41+
auspice_json = "auspice/zika.json"
4242
params:
4343
strain_id = config.get("strain_id_field", "strain"),
4444
shell:
@@ -54,22 +54,3 @@ rule export:
5454
--include-root-sequence-inline \
5555
--output {output.auspice_json}
5656
"""
57-
58-
rule final_strain_name:
59-
input:
60-
auspice_json="results/raw_zika.json",
61-
metadata="data/metadata_all.tsv"
62-
output:
63-
auspice_json="auspice/zika.json"
64-
params:
65-
strain_id=config["strain_id_field"],
66-
display_strain_field=config.get("display_strain_field", "strain"),
67-
shell:
68-
"""
69-
python3 scripts/set_final_strain_name.py \
70-
--metadata {input.metadata} \
71-
--metadata-id-columns {params.strain_id} \
72-
--input-auspice-json {input.auspice_json} \
73-
--display-strain-name {params.display_strain_field} \
74-
--output {output.auspice_json}
75-
"""

phylogenetic/scripts/set_final_strain_name.py

Lines changed: 0 additions & 51 deletions
This file was deleted.

0 commit comments

Comments
 (0)