Skip to content

Commit 0f6fec6

Browse files
committed
Merge branch 'ensure_notnull_pseudo' of github.com:nf-core/rnaseq into ensure_notnull_pseudo
2 parents 0a675cf + e1a5cca commit 0f6fec6

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

CHANGELOG.md

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

1010
- [PR #1123](https://github.com/nf-core/rnaseq/pull/1123) - Overhaul tximport.r, output length tables
1111
- [PR #1124](https://github.com/nf-core/rnaseq/pull/1124) - Ensure pseudoaligner is set if pseudoalignment is not skipped
12+
- [PR #1126](https://github.com/nf-core/rnaseq/pull/1126) - Fixes error when transcript_fasta not provided and skip_gtf_filter set to true
13+
- [#1125](https://github.com/nf-core/rnaseq/issues/1125) - Pipeline fails if transcript_fasta not provided and skip_gtf_filter = true
1214

1315
## [[3.13.1](https://github.com/nf-core/rnaseq/releases/tag/3.13.1)] - 2023-11-17
1416

subworkflows/local/prepare_genome/main.nf

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ workflow PREPARE_GENOME {
4747
rsem_index // directory: /path/to/rsem/index/
4848
salmon_index // directory: /path/to/salmon/index/
4949
kallisto_index // directory: /path/to/kallisto/index/
50-
hisat2_index // directory: /path/to/hisat2/index/
50+
hisat2_index // directory: /path/to/hisat2/index/
5151
bbsplit_index // directory: /path/to/rsem/index/
5252
gencode // boolean: whether the genome is from GENCODE
5353
is_aws_igenome // boolean: whether the genome files are from AWS iGenomes
@@ -139,14 +139,13 @@ workflow PREPARE_GENOME {
139139
} else {
140140
ch_transcript_fasta = Channel.value(file(transcript_fasta))
141141
}
142-
if (gencode) {
142+
if (gencode) {
143143
PREPROCESS_TRANSCRIPTS_FASTA_GENCODE ( ch_transcript_fasta )
144144
ch_transcript_fasta = PREPROCESS_TRANSCRIPTS_FASTA_GENCODE.out.fasta
145145
ch_versions = ch_versions.mix(PREPROCESS_TRANSCRIPTS_FASTA_GENCODE.out.versions)
146146
}
147147
} else {
148148
ch_transcript_fasta = MAKE_TRANSCRIPTS_FASTA ( ch_fasta, ch_gtf ).transcript_fasta
149-
ch_versions = ch_versions.mix(GTF_FILTER.out.versions)
150149
ch_versions = ch_versions.mix(MAKE_TRANSCRIPTS_FASTA.out.versions)
151150
}
152151

@@ -268,7 +267,7 @@ workflow PREPARE_GENOME {
268267
ch_versions = ch_versions.mix(SALMON_INDEX.out.versions)
269268
}
270269
}
271-
270+
272271
//
273272
// Uncompress Kallisto index or generate from scratch if required
274273
//

0 commit comments

Comments
 (0)