Skip to content

Commit d7cd968

Browse files
committed
Fix #922
1 parent 61020e1 commit d7cd968

File tree

7 files changed

+31
-23
lines changed

7 files changed

+31
-23
lines changed

CHANGELOG.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,12 @@
33
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
44
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
55

6-
## [[3.11](https://github.com/nf-core/rnaseq/releases/tag/3.11)] - 2023-01-05
6+
## [[3.10.1](https://github.com/nf-core/rnaseq/releases/tag/3.10.1)] - 2023-01-05
77

88
### Enhancements & fixes
99

1010
- [[#919](https://github.com/nf-core/rnaseq/issues/919)] - Salmon quant not run after FastQ subsampling if index not provided
11+
- [[#922](https://github.com/nf-core/rnaseq/issues/922)] - Passing TrimGalore `--hardtrim3` / `--hardtrim5` via custom config raises missing output filename error
1112

1213
## [[3.10](https://github.com/nf-core/rnaseq/releases/tag/3.10)] - 2022-12-21
1314

modules.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@
192192
},
193193
"trimgalore": {
194194
"branch": "master",
195-
"git_sha": "c8e35eb2055c099720a75538d1b8adb3fb5a464c",
195+
"git_sha": "72ffbd7128015a1d4b65b95ff8d37be8fee2f981",
196196
"installed_by": ["fastq_fastqc_umitools_trimgalore"]
197197
},
198198
"ucsc/bedclip": {
@@ -265,7 +265,7 @@
265265
},
266266
"fastq_fastqc_umitools_trimgalore": {
267267
"branch": "master",
268-
"git_sha": "b51a69e30973c71950225c817ad07a3337d22c40",
268+
"git_sha": "72ffbd7128015a1d4b65b95ff8d37be8fee2f981",
269269
"installed_by": ["subworkflows"]
270270
},
271271
"fastq_subsample_fq_salmon": {

modules/nf-core/trimgalore/main.nf

Lines changed: 6 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

modules/nf-core/trimgalore/meta.yml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nextflow.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ manifest {
254254
description = """RNA sequencing analysis pipeline for gene/isoform quantification and extensive quality control."""
255255
mainScript = 'main.nf'
256256
nextflowVersion = '!>=22.10.1'
257-
version = '3.11'
257+
version = '3.10.1'
258258
doi = 'https://doi.org/10.5281/zenodo.1400710'
259259
}
260260

subworkflows/nf-core/fastq_fastqc_umitools_trimgalore/main.nf

Lines changed: 9 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

workflows/rnaseq.nf

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -270,16 +270,20 @@ workflow RNASEQ {
270270
ch_filtered_reads = FASTQ_FASTQC_UMITOOLS_TRIMGALORE.out.reads
271271
if (!params.skip_trimming) {
272272
ch_filtered_reads
273-
.join(FASTQ_FASTQC_UMITOOLS_TRIMGALORE.out.trim_log)
273+
.join(FASTQ_FASTQC_UMITOOLS_TRIMGALORE.out.trim_log, remainder: true)
274274
.map {
275275
meta, reads, trim_log ->
276-
if (!meta.single_end) {
277-
trim_log = trim_log[-1]
276+
if (trim_log) {
277+
if (!meta.single_end) {
278+
trim_log = trim_log[-1]
279+
}
280+
num_reads = WorkflowRnaseq.getTrimGaloreReadsAfterFiltering(trim_log)
281+
[ meta, reads, num_reads ]
282+
} else {
283+
[ meta, reads, params.min_trimmed_reads + 1 ]
278284
}
279-
num_reads = WorkflowRnaseq.getTrimGaloreReadsAfterFiltering(trim_log)
280-
[ meta, reads, num_reads ]
281285
}
282-
.set { ch_num_trimmed_reads }
286+
.set { ch_num_trimmed_reads }
283287

284288
ch_num_trimmed_reads
285289
.map { meta, reads, num_reads -> if (num_reads > params.min_trimmed_reads) [ meta, reads ] }

0 commit comments

Comments
 (0)