Skip to content

Commit 50f20da

Browse files
committed
fix: new snakefmt directive order
1 parent 20a6fc9 commit 50f20da

4 files changed

Lines changed: 39 additions & 40 deletions

File tree

workflow/Snakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,6 @@ onerror:
6666
# target rules
6767
# -----------------------------------------------------
6868
rule all:
69+
default_target: True
6970
input:
7071
get_final_input,
71-
default_target: True

workflow/rules/annotate.smk

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ rule get_fasta:
33
get_fasta,
44
output:
55
fasta="results/annotation/pgap/prepare_files/{sample}/genome.fasta",
6-
conda:
7-
"../envs/base.yml"
86
log:
97
"results/annotation/pgap/prepare_files/logs/{sample}_get_fasta.log",
8+
conda:
9+
"../envs/base.yml"
1010
shell:
1111
"INPUT=$(realpath {input}); "
1212
"ln -s ${{INPUT}} {output}; "
@@ -19,6 +19,8 @@ rule prepare_yaml_files:
1919
output:
2020
input_yaml="results/annotation/pgap/prepare_files/{sample}/input.yaml",
2121
submol_yaml="results/annotation/pgap/prepare_files/{sample}/submol.yaml",
22+
log:
23+
"results/annotation/pgap/prepare_files/logs/{sample}_prepare_yaml_files.log",
2224
conda:
2325
"../envs/base.yml"
2426
params:
@@ -28,8 +30,6 @@ rule prepare_yaml_files:
2830
submol=config["pgap"]["prepare_yaml_files"]["submol"],
2931
sample="{sample}",
3032
pd_samples=samples,
31-
log:
32-
"results/annotation/pgap/prepare_files/logs/{sample}_prepare_yaml_files.log",
3333
script:
3434
"../scripts/prepare_yaml_files.py"
3535

@@ -44,18 +44,18 @@ rule annotate_pgap:
4444
output:
4545
gff="results/annotation/pgap/{sample}/{sample}.gff",
4646
fasta="results/annotation/pgap/{sample}/{sample}.fna",
47+
log:
48+
"results/annotation/pgap/logs/{sample}_pgap.log",
4749
conda:
4850
"../envs/base.yml"
49-
message:
50-
"""--- Running PGAP annotation for sample {wildcards.sample} ---"""
51+
threads: 1
5152
params:
5253
pgap=config["pgap"]["bin"],
5354
use_yaml_config=config["pgap"]["use_yaml_config"],
5455
species=lambda wc: samples.loc[wc.sample]["species"],
5556
outdir=lambda wc, output: os.path.dirname(output[0]),
56-
threads: 1
57-
log:
58-
"results/annotation/pgap/logs/{sample}_pgap.log",
57+
message:
58+
"""--- Running PGAP annotation for sample {wildcards.sample} ---"""
5959
shell:
6060
"rm -rf {params.outdir}; "
6161
"if [ {params.use_yaml_config} == 'True' ]; then "
@@ -83,10 +83,11 @@ rule annotate_prokka:
8383
output:
8484
gff="results/annotation/prokka/{sample}/{sample}.gff",
8585
fasta="results/annotation/prokka/{sample}/{sample}.fna",
86+
log:
87+
"results/annotation/prokka/logs/{sample}_prokka.log",
8688
conda:
8789
"../envs/prokka.yml"
88-
message:
89-
"""--- Running PROKKA annotation for sample {wildcards.sample} ---"""
90+
threads: workflow.cores * 0.25
9091
params:
9192
prefix=lambda wc: wc.sample,
9293
locustag=lambda wc: samples.loc[wc.sample]["id_prefix"],
@@ -95,9 +96,8 @@ rule annotate_prokka:
9596
strain=lambda wc: samples.loc[wc.sample]["strain"],
9697
outdir=lambda wc, output: os.path.dirname(output[0]),
9798
extra=config["prokka"]["extra"],
98-
threads: workflow.cores * 0.25
99-
log:
100-
"results/annotation/prokka/logs/{sample}_prokka.log",
99+
message:
100+
"""--- Running PROKKA annotation for sample {wildcards.sample} ---"""
101101
shell:
102102
"""
103103
prokka \
@@ -123,17 +123,17 @@ rule get_bakta_db:
123123
"none": directory("results/annotation/bakta/database/custom"),
124124
},
125125
),
126+
log:
127+
"results/annotation/bakta/database/db.log",
126128
conda:
127129
"../envs/bakta.yml"
128-
message:
129-
"""--- Getting BAKTA database for annotation ---"""
130+
threads: workflow.cores * 0.25
130131
params:
131132
download_db=config["bakta"]["download_db"],
132133
existing_db=config["bakta"]["existing_db"],
133134
outdir=lambda wc, output: os.path.dirname(output[0]),
134-
threads: workflow.cores * 0.25
135-
log:
136-
"results/annotation/bakta/database/db.log",
135+
message:
136+
"""--- Getting BAKTA database for annotation ---"""
137137
shell:
138138
"""
139139
if [ {params.download_db} != 'none' ]; then
@@ -156,20 +156,20 @@ rule annotate_bakta:
156156
output:
157157
gff="results/annotation/bakta/{sample}/{sample}.gff",
158158
fasta="results/annotation/bakta/{sample}/{sample}.fna",
159+
log:
160+
"results/annotation/bakta/logs/{sample}_bakta.log",
159161
conda:
160162
"../envs/bakta.yml"
161-
message:
162-
"""--- Running BAKTA annotation for sample {wildcards.sample} ---"""
163+
threads: workflow.cores * 0.25
163164
params:
164165
prefix=lambda wc: wc.sample,
165166
locustag=lambda wc: format_bakta_locustag(samples.loc[wc.sample]["id_prefix"]),
166167
species=lambda wc: samples.loc[wc.sample]["species"],
167168
strain=lambda wc: samples.loc[wc.sample]["strain"],
168169
outdir=lambda wc, output: os.path.dirname(output[0]),
169170
extra=config["bakta"]["extra"],
170-
threads: workflow.cores * 0.25
171-
log:
172-
"results/annotation/bakta/logs/{sample}_bakta.log",
171+
message:
172+
"""--- Running BAKTA annotation for sample {wildcards.sample} ---"""
173173
shell:
174174
"""
175175
bakta \

workflow/rules/common.smk

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import re
44
from snakemake import logging
55
from snakemake.utils import validate
66

7-
87
# read sample sheet
98
samples = (
109
pd.read_csv(config["samplesheet"], sep=",", dtype={"sample": str})

workflow/rules/qc.smk

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,11 @@ rule quast:
33
fasta=get_quast_fasta,
44
output:
55
report="results/qc/quast/{tool}/report.txt",
6+
log:
7+
"results/qc/quast/{tool}/quast.log",
68
conda:
79
"../envs/quast.yml"
8-
message:
9-
"""--- Running QUAST quality check for all assemblies ---"""
10+
threads: 4
1011
params:
1112
outdir=lambda wc, output: os.path.dirname(output.report),
1213
ref_fasta=(
@@ -20,9 +21,8 @@ rule quast:
2021
else []
2122
),
2223
extra=config["quast"]["extra"],
23-
threads: 4
24-
log:
25-
"results/qc/quast/{tool}/quast.log",
24+
message:
25+
"""--- Running QUAST quality check for all assemblies ---"""
2626
shell:
2727
"""
2828
quast \
@@ -43,15 +43,15 @@ rule prepare_panaroo:
4343
output:
4444
fasta="results/qc/panaroo/{tool}/prepare/{sample}.fna",
4545
gff="results/qc/panaroo/{tool}/prepare/{sample}.gff",
46+
log:
47+
"results/qc/panaroo/{tool}/prepare/{sample}.log",
4648
conda:
4749
"../envs/panaroo.yml"
48-
message:
49-
"""--- Prepare input files for pan-genome alignment ---"""
5050
params:
5151
remove_source=config["panaroo"]["remove_source"],
5252
remove_feature=config["panaroo"]["remove_feature"],
53-
log:
54-
"results/qc/panaroo/{tool}/prepare/{sample}.log",
53+
message:
54+
"""--- Prepare input files for pan-genome alignment ---"""
5555
shell:
5656
"""
5757
echo 'Preparing annotation for Panaroo:' > {log};
@@ -70,16 +70,16 @@ rule panaroo:
7070
fasta=get_panaroo_fasta,
7171
output:
7272
stats="results/qc/panaroo/{tool}/summary_statistics.txt",
73+
log:
74+
"results/qc/panaroo/{tool}/panaroo.log",
7375
conda:
7476
"../envs/panaroo.yml"
75-
message:
76-
"""--- Running PANAROO to create pangenome from all annotations ---"""
77+
threads: 4
7778
params:
7879
outdir=lambda wc, output: os.path.dirname(output.stats),
7980
extra=config["panaroo"]["extra"],
80-
threads: 4
81-
log:
82-
"results/qc/panaroo/{tool}/panaroo.log",
81+
message:
82+
"""--- Running PANAROO to create pangenome from all annotations ---"""
8383
shell:
8484
"""
8585
printf '%s\n' {input.gff} | \

0 commit comments

Comments
 (0)