Skip to content

Commit 3b470b9

Browse files
committed
Local syntax fixes from #1551
1 parent eace2bd commit 3b470b9

File tree

2 files changed

+9
-12
lines changed
  • modules/local/star_align_igenomes
  • subworkflows/local/utils_nfcore_rnaseq_pipeline

2 files changed

+9
-12
lines changed

modules/local/star_align_igenomes/main.nf

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ process STAR_ALIGN_IGENOMES {
3636
script:
3737
def args = task.ext.args ?: ''
3838
def prefix = task.ext.prefix ?: "${meta.id}"
39-
def reads1 = [], reads2 = []
39+
def reads1 = []
40+
def reads2 = []
4041
meta.single_end ? [reads].flatten().each{reads1 << it} : reads.eachWithIndex{ v, ix -> ( ix & 1 ? reads2 : reads1) << v }
4142
def ignore_gtf = star_ignore_sjdbgtf ? '' : "--sjdbGTFfile $gtf"
4243
def seq_platform = seq_platform ? "'PL:$seq_platform'" : ""

subworkflows/local/utils_nfcore_rnaseq_pipeline/main.nf

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
// Subworkflow with functionality specific to the nf-core/rnaseq pipeline
33
//
44

5-
import groovy.json.JsonSlurper
6-
75
/*
86
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
97
IMPORT FUNCTIONS / MODULES / SUBWORKFLOWS
@@ -80,10 +78,6 @@ workflow PIPELINE_INITIALISATION {
8078
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
8179
*/
8280

83-
def pass_mapped_reads = [:]
84-
def pass_trimmed_reads = [:]
85-
def pass_strand_check = [:]
86-
8781
workflow PIPELINE_COMPLETION {
8882

8983
take:
@@ -99,6 +93,10 @@ workflow PIPELINE_COMPLETION {
9993
strand_status // map: pass/fail status per sample for strandedness check
10094

10195
main:
96+
def pass_mapped_reads = [:]
97+
def pass_trimmed_reads = [:]
98+
def pass_strand_check = [:]
99+
102100
summary_params = paramsSummaryMap(workflow, parameters_schema: "nextflow_schema.json")
103101
def multiqc_reports = multiqc_report.toList()
104102

@@ -117,8 +115,6 @@ workflow PIPELINE_COMPLETION {
117115
id, status -> pass_strand_check[id] = status
118116
}
119117

120-
def multiqc_report_list = multiqc_report.toList()
121-
122118
//
123119
// Completion email and summary
124120
//
@@ -135,7 +131,7 @@ workflow PIPELINE_COMPLETION {
135131
)
136132
}
137133

138-
rnaseqSummary(monochrome_logs=monochrome_logs, pass_mapped_reads=pass_mapped_reads, pass_trimmed_reads=pass_trimmed_reads, pass_strand_check=pass_strand_check)
134+
rnaseqSummary(monochrome_logs, pass_mapped_reads, pass_trimmed_reads, pass_strand_check)
139135

140136
if (hook_url) {
141137
imNotification(summary_params, hook_url)
@@ -301,15 +297,15 @@ def validateInputParameters() {
301297

302298
// Check rRNA databases for sortmerna
303299
if (params.remove_ribo_rna) {
304-
ch_ribo_db = file(params.ribo_database_manifest)
300+
def ch_ribo_db = file(params.ribo_database_manifest)
305301
if (ch_ribo_db.isEmpty()) {
306302
error("File provided with --ribo_database_manifest is empty: ${ch_ribo_db.getName()}!")
307303
}
308304
}
309305

310306
// Check if file with list of fastas is provided when running BBSplit
311307
if (!params.skip_bbsplit && !params.bbsplit_index && params.bbsplit_fasta_list) {
312-
ch_bbsplit_fasta_list = file(params.bbsplit_fasta_list)
308+
def ch_bbsplit_fasta_list = file(params.bbsplit_fasta_list)
313309
if (ch_bbsplit_fasta_list.isEmpty()) {
314310
error("File provided with --bbsplit_fasta_list is empty: ${ch_bbsplit_fasta_list.getName()}!")
315311
}

0 commit comments

Comments
 (0)