Skip to content

Commit 343e52f

Browse files
authored
Merge pull request #811 from drpatelh/fixes
Fix #798, #799, #802
2 parents 88f61f0 + 3b806fe commit 343e52f

File tree

7 files changed

+35
-19
lines changed

7 files changed

+35
-19
lines changed

CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
99

1010
- [[#764](https://github.com/nf-core/rnaseq/issues/764)] - Test fails when using GCP due to missing tools in the basic biocontainer
1111
- [[#791](https://github.com/nf-core/rnaseq/issues/791)] - Add outputs for umitools dedup summary stats
12+
- [[#798](https://github.com/nf-core/rnaseq/issues/798)] - Decompress transcript fasta error
13+
- [[#799](https://github.com/nf-core/rnaseq/issues/799)] - Issue with using `--retain_unpaired` with the `FASTQC_UMITOOLS_TRIMGALORE:TRIMGALORE` module
14+
- [[#802](https://github.com/nf-core/rnaseq/issues/802)] - `--bam_csi_index` error generated if `--skip_alignment` specified
1215
- [[#808](https://github.com/nf-core/rnaseq/issues/808)] - Auto-detect usage of Illumina iGenomes reference
1316
- Updated pipeline template to [nf-core/tools 2.3.2](https://github.com/nf-core/tools/releases/tag/2.3.2)
1417

modules.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
"git_sha": "e745e167c1020928ef20ea1397b6b4d230681b4d"
104104
},
105105
"trimgalore": {
106-
"git_sha": "e745e167c1020928ef20ea1397b6b4d230681b4d"
106+
"git_sha": "85ec13ff1fc2196c5a507ea497de468101baabed"
107107
},
108108
"ucsc/bedclip": {
109109
"git_sha": "e745e167c1020928ef20ea1397b6b4d230681b4d"

modules/nf-core/modules/trimgalore/main.nf

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

modules/nf-core/modules/trimgalore/meta.yml

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

subworkflows/local/prepare_genome.nf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ workflow PREPARE_GENOME {
106106
//
107107
if (params.transcript_fasta) {
108108
if (params.transcript_fasta.endsWith('.gz')) {
109-
ch_transcript_fasta = GUNZIP_TRANSCRIPT_FASTA ( [:], params.transcript_fasta ).gunzip.map { it[1] }
109+
ch_transcript_fasta = GUNZIP_TRANSCRIPT_FASTA ( [ [:], params.transcript_fasta ] ).gunzip.map { it[1] }
110110
ch_versions = ch_versions.mix(GUNZIP_TRANSCRIPT_FASTA.out.versions)
111111
} else {
112112
ch_transcript_fasta = file(params.transcript_fasta)

subworkflows/nf-core/fastqc_umitools_trimgalore.nf

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

workflows/rnaseq.nf

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,10 +177,12 @@ workflow RNASEQ {
177177
ch_versions = ch_versions.mix(PREPARE_GENOME.out.versions)
178178

179179
// Check if contigs in genome fasta file > 512 Mbp
180-
PREPARE_GENOME
181-
.out
182-
.fai
183-
.map { WorkflowRnaseq.checkMaxContigSize(it, log) }
180+
if (!params.skip_alignment) {
181+
PREPARE_GENOME
182+
.out
183+
.fai
184+
.map { WorkflowRnaseq.checkMaxContigSize(it, log) }
185+
}
184186

185187
//
186188
// SUBWORKFLOW: Read in samplesheet, validate and stage input files

0 commit comments

Comments
 (0)