Skip to content

Commit 52edcc2

Browse files
authored
Merge pull request #1164 from nextstrain/remove-run-pangolin
Remove "run_pangolin" config option
2 parents 61e5cf4 + bd4d994 commit 52edcc2

File tree

5 files changed

+4
-93
lines changed

5 files changed

+4
-93
lines changed

docs/src/reference/change_log.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ We also use this change log to document new features that maintain backward comp
55

66
## New features since last version update
77

8+
## v15 (5 December 2024)
9+
10+
- Remove `run_pangolin` configuration option from the workflow, since the pangoLEARN tool that this enabled has been deprecated. [PR 1164](https://github.com/nextstrain/ncov/pull/1164)
11+
812
## v14 (23 October 2024)
913

1014
- 23 October 2024: Update workflow to use Nextclade v3. This includes the removal of unused mutation summary script and rules that expected Nextclade v2 outputs. Dropping the mutation summary rules removed the need for the full alignment rule `align` to produce the insertions and translations outputs, so they have been removed. The `build_align` rule no longer produces a separate `insertions.tsv` since insertions are now included in the `nextclade_qc.tsv`. [PR 1160](https://github.com/nextstrain/ncov/pull/1160)

docs/src/reference/workflow-config-file.rst

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -728,13 +728,6 @@ crowding_penalty
728728
729729
.. _title-1:
730730

731-
run_pangolin
732-
------------
733-
734-
- type: boolean
735-
- description: Enable annotation of Pangolin lineages for a given build's subsampled sequences.
736-
- default: ``false``
737-
738731
.. _workflow-config-mask:
739732

740733
mask

scripts/make_pangolin_node_data.py

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

workflow/envs/nextstrain.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,4 @@ dependencies:
88
- epiweeks=2.1.2
99
- iqtree=2.2.0.3
1010
- nextclade=3.9.0
11-
- pangolin=3.1.20
12-
- pangolearn=2022.01.20
1311
- python>=3.8*

workflow/snakemake_rules/main_workflow.smk

Lines changed: 0 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -702,55 +702,6 @@ rule filter:
702702
--output-log {output.filter_log} 2>&1 | tee {log};
703703
"""
704704

705-
if "run_pangolin" in config and config["run_pangolin"]:
706-
rule run_pangolin:
707-
message:
708-
"""
709-
Running pangolin to assign lineage labels to samples. Includes putative lineage definitions by default.
710-
Please remember to update your installation of pangolin regularly to ensure the most up-to-date classifications.
711-
"""
712-
input:
713-
alignment = "results/{build_name}/aligned.fasta",
714-
output:
715-
lineages = "results/{build_name}/pangolineages.csv",
716-
params:
717-
outdir = "results/{build_name}",
718-
csv_outfile = "pangolineages.csv",
719-
node_data_outfile = "pangolineages.json"
720-
log:
721-
"logs/pangolin_{build_name}.txt"
722-
conda: config["conda_environment"]
723-
threads: 1
724-
resources:
725-
mem_mb=3000
726-
benchmark:
727-
"benchmarks/pangolineages_{build_name}.txt"
728-
shell: ## once pangolin fully supports threads, add `--threads {threads}` to the below (existing pango cli param)
729-
r"""
730-
pangolin {input.alignment}\
731-
--outdir {params.outdir} \
732-
--outfile {params.csv_outfile} 2>&1 | tee {log}\
733-
"""
734-
735-
rule make_pangolin_node_data:
736-
input:
737-
lineages = rules.run_pangolin.output.lineages
738-
output:
739-
node_data = "results/{build_name}/pangolineages.json"
740-
log:
741-
"logs/pangolin_export_{build_name}.txt"
742-
conda: config["conda_environment"]
743-
resources:
744-
mem_mb=3000
745-
benchmark:
746-
"benchmarks/make_pangolin_node_data_{build_name}.txt"
747-
shell:
748-
r"""
749-
python3 scripts/make_pangolin_node_data.py \
750-
--pangolineages {input.lineages} \
751-
--node_data_outfile {output.node_data} 2>&1 | tee {log}\
752-
"""
753-
754705
# TODO: This will probably not work for build names like "country_usa" where we need to know the country is "USA".
755706
rule adjust_metadata_regions:
756707
message:
@@ -1308,9 +1259,6 @@ def _get_node_data_by_wildcards(wildcards):
13081259
rules.calculate_epiweeks.output.node_data,
13091260
]
13101261

1311-
if "run_pangolin" in config and config["run_pangolin"]:
1312-
inputs.append(rules.make_pangolin_node_data.output.node_data)
1313-
13141262
# Convert input files from wildcard strings to real file names.
13151263
inputs = [input_file.format(**wildcards_dict) for input_file in inputs]
13161264

0 commit comments

Comments
 (0)