Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure pseudoaligner is set if pseudoalignment is not skipped #1124

Merged
merged 13 commits into from
Nov 21, 2023
Merged
18 changes: 14 additions & 4 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,22 @@
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## dev
## [[3.13.2](https://github.com/nf-core/rnaseq/releases/tag/3.13.2)] - 2023-11-21

### Enhancements and fixes
### Credits

Special thanks to the following for their contributions to the release:

- [Jonathan Manning](https://github.com/pinin4fjords)
- [Regina Hertfelder Reynolds](https://github.com/RHReynolds)
- [Matthias Zepper](https://github.com/MatthiasZepper)

### Enhancements & fixes

- [[PR #1126](https://github.com/nf-core/rnaseq/pull/1126)] [[#1125](https://github.com/nf-core/rnaseq/issues/1125)] - Pipeline fails if transcript_fasta not provided and `skip_gtf_filter = true`.
- [[PR #1127](https://github.com/nf-core/rnaseq/pull/1127)] - Enlarge sampling to determine the number of columns in `filter_gtf.py` script.
- [PR #1123](https://github.com/nf-core/rnaseq/pull/1123) - Overhaul tximport.r, output length tables
- [PR #1124](https://github.com/nf-core/rnaseq/pull/1124) - Ensure pseudoaligner is set if pseudoalignment is not skipped
- [PR #1126](https://github.com/nf-core/rnaseq/pull/1126) - Pipeline fails if transcript_fasta not provided and `skip_gtf_filter = true`.
- [PR #1127](https://github.com/nf-core/rnaseq/pull/1127) - Enlarge sampling to determine the number of columns in `filter_gtf.py` script.

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

Expand Down
2 changes: 1 addition & 1 deletion bin/filter_gtf.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ def tab_delimited(file: str) -> float:
def filter_gtf(fasta: str, gtf_in: str, filtered_gtf_out: str, skip_transcript_id_check: bool) -> None:
"""Filter GTF file based on FASTA sequence names."""
if tab_delimited(gtf_in) != 8:
raise ValueError("Invalid GTF file: Expected nine tab-separated columns.")
raise ValueError("Invalid GTF file: Expected 9 tab-separated columns.")

seq_names_in_genome = extract_fasta_seq_names(fasta)
logger.info(f"Extracted chromosome sequence names from {fasta}")
Expand Down
3 changes: 1 addition & 2 deletions conf/modules.config
Original file line number Diff line number Diff line change
Expand Up @@ -1087,7 +1087,6 @@ if (!params.skip_multiqc) {

if (!params.skip_pseudo_alignment && params.pseudo_aligner == 'salmon') {
process {

withName: '.*:QUANTIFY_PSEUDO_ALIGNMENT:SALMON_QUANT' {
ext.args = { params.extra_salmon_quant_args ?: '' }
publishDir = [
Expand All @@ -1112,7 +1111,7 @@ if (!params.skip_pseudo_alignment && params.pseudo_aligner == 'kallisto') {
}
}

if (!params.skip_pseudo_alignment) {
if (!params.skip_pseudo_alignment && params.pseudo_aligner) {
process {
withName: '.*:QUANTIFY_PSEUDO_ALIGNMENT:TX2GENE' {
publishDir = [
Expand Down
2 changes: 1 addition & 1 deletion nextflow.config
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ manifest {
description = """RNA sequencing analysis pipeline for gene/isoform quantification and extensive quality control."""
mainScript = 'main.nf'
nextflowVersion = '!>=23.04.0'
version = '3.13.1'
version = '3.13.2'
doi = 'https://doi.org/10.5281/zenodo.1400710'
}

Expand Down
5 changes: 2 additions & 3 deletions workflows/rnaseq.nf
Original file line number Diff line number Diff line change
Expand Up @@ -816,9 +816,8 @@ workflow RNASEQ {
//
ch_pseudo_multiqc = Channel.empty()
ch_pseudoaligner_pca_multiqc = Channel.empty()
ch_pseudoaligner_clustering_multiqc = Channel.empty()

if (!params.skip_pseudo_alignment) {
ch_pseudoaligner_clustering_multiqc = Channel.empty()
if (!params.skip_pseudo_alignment && params.pseudo_aligner) {

if (params.pseudo_aligner == 'salmon') {
ch_pseudo_index = PREPARE_GENOME.out.salmon_index
Expand Down
Loading