Skip to content

Commit 82badec

Browse files
authored
Merge pull request #1849 from nf-core/tidy-up-1845
Tidy-up batch: docs, schema, configs, single trivial correctness fix
2 parents 9606be0 + 035fd22 commit 82badec

9 files changed

Lines changed: 21 additions & 201 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
1111

1212
- [PR #1844](https://github.com/nf-core/rnaseq/pull/1844) - Bump version to 3.27.0dev after release 3.26.0; flip the MultiQC report links and RO-Crate URL/version back to dev
1313
- [PR #1848](https://github.com/nf-core/rnaseq/pull/1848) - Align `actions/checkout` SHA in `nf-test-arm.yml` and `nf-test-gpu.yml` with the template-derived `nf-test.yml` (`v6`) ([#1847](https://github.com/nf-core/rnaseq/issues/1847))
14+
- [PR #1849](https://github.com/nf-core/rnaseq/pull/1849) - Tidy-up batch addressing [#1845](https://github.com/nf-core/rnaseq/issues/1845): README/schema clarifications, `&``&&` in three guards, deduplicated `withName` blocks, and removal of the unmaintained `bin/fastq_dir_to_samplesheet.py` (use [nf-core/fetchngs](https://nf-co.re/fetchngs) for samplesheet generation)
1415

1516
## [[3.26.0](https://github.com/nf-core/rnaseq/releases/tag/3.26.0)] - 2026-05-07
1617

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,10 @@
4747
1. [`RSeQC`](http://rseqc.sourceforge.net/)
4848
2. [`Qualimap`](http://qualimap.bioinfo.cipf.es/)
4949
3. [`dupRadar`](https://bioconductor.org/packages/release/bioc/html/dupRadar.html)
50-
4. [`Preseq`](http://smithlabresearch.org/software/preseq/)
50+
4. [`Preseq`](http://smithlabresearch.org/software/preseq/) (_disabled by default; enable with `--skip_preseq false`_)
5151
5. [`DESeq2`](https://bioconductor.org/packages/release/bioc/html/DESeq2.html)
52-
6. Contamination detection on selected screening reads (unaligned by default); _optional_
52+
6. Or, _experimental_: [`RustQC`](https://github.com/seqeralabs/rustqc) as a single-pass alternative to RSeQC, Qualimap, dupRadar, Preseq, and SAMtools stats (enable with `--use_rustqc`; recommend trialling on pilot data first).
53+
7. Contamination detection on selected screening reads (unaligned by default); _optional_
5354
1. [`Kraken2`](https://ccb.jhu.edu/software/kraken2/) -> [`Bracken`](https://ccb.jhu.edu/software/bracken/)
5455
2. [`Sylph`](https://sylph-docs.github.io/)
5556
15. Pseudoalignment and quantification ([`Salmon`](https://combine-lab.github.io/salmon/) or ['Kallisto'](https://pachterlab.github.io/kallisto/); _optional_)

bin/fastq_dir_to_samplesheet.py

Lines changed: 0 additions & 178 deletions
This file was deleted.

conf/modules/align_star.config

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,6 @@ process {
135135

136136
args.join(' ')
137137
}
138-
}
139-
140-
withName: '.*ALIGN_STAR:STAR_ALIGN|.*ALIGN_STAR:SENTIEON_STAR_ALIGN|.*ALIGN_STAR:PARABRICKS_RNA_FQ2BAM' {
141138
publishDir = [
142139
[
143140
path: { "${params.outdir}/${task.ext.publish_prefix}${params.aligner}/log" },

conf/modules/featurecounts.config

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,4 @@ process {
1010
mode: params.publish_dir_mode
1111
]
1212
}
13-
14-
withName: 'CUSTOM_MULTIQCCUSTOMBIOTYPE' {
15-
publishDir = [
16-
path: { "${params.outdir}/${task.ext.publish_prefix}${params.aligner}/featurecounts" },
17-
mode: params.publish_dir_mode,
18-
saveAs: { filename -> filename.equals('versions.yml') ? null : filename }
19-
]
20-
}
2113
}

modules/local/deseq2_qc/main.nf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,8 @@ process DESEQ2_QC {
7272
7373
mkdir size_factors
7474
touch size_factors/${prefix}.size_factors.RData
75+
# One per-sample size_factors file per data column in $counts; the
76+
# module test snaps these names so the stub must mirror real-run output.
7577
for i in `head $counts -n 1 | cut -f3-`;
7678
do
7779
touch size_factors/\${i}.size_factors.RData

nextflow_schema.json

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -550,13 +550,13 @@
550550
},
551551
"kallisto_quant_fraglen": {
552552
"type": "integer",
553-
"description": "In single-end mode Kallisto requires an estimated fragment length. Specify a default value for that here. TODO: use existing RSeQC results to do this dynamically.",
553+
"description": "In single-end mode Kallisto requires an estimated fragment length (in base pairs). Specify a default value for that here.",
554554
"default": 200,
555555
"fa_icon": "fas fa-ruler-horizontal"
556556
},
557557
"kallisto_quant_fraglen_sd": {
558558
"type": "integer",
559-
"description": "In single-end mode, Kallisto requires an estimated standard error for fragment length. Specify a default value for that here. TODO: use existing RSeQC results to do this dynamically.",
559+
"description": "In single-end mode, Kallisto requires an estimated standard error for fragment length (in base pairs). Specify a default value for that here.",
560560
"default": 200,
561561
"fa_icon": "fas fa-sort-amount-up-alt"
562562
},
@@ -802,26 +802,31 @@
802802
},
803803
"skip_dupradar": {
804804
"type": "boolean",
805+
"default": false,
805806
"fa_icon": "fas fa-fast-forward",
806-
"description": "Skip dupRadar."
807+
"description": "Skip dupRadar. Has no effect under `--use_rustqc` (experimental)."
807808
},
808809
"skip_qualimap": {
809810
"type": "boolean",
811+
"default": false,
810812
"fa_icon": "fas fa-fast-forward",
811-
"description": "Skip Qualimap."
813+
"description": "Skip Qualimap. Has no effect under `--use_rustqc` (experimental)."
812814
},
813815
"skip_rseqc": {
814816
"type": "boolean",
817+
"default": false,
815818
"fa_icon": "fas fa-fast-forward",
816-
"description": "Skip RSeQC."
819+
"description": "Skip RSeQC. Has no effect under `--use_rustqc` (experimental)."
817820
},
818821
"skip_biotype_qc": {
819822
"type": "boolean",
823+
"default": false,
820824
"fa_icon": "fas fa-fast-forward",
821-
"description": "Skip additional featureCounts process for biotype QC."
825+
"description": "Skip additional featureCounts process for biotype QC. Has no effect under `--use_rustqc` (experimental)."
822826
},
823827
"skip_deseq2_qc": {
824828
"type": "boolean",
829+
"default": false,
825830
"fa_icon": "fas fa-fast-forward",
826831
"description": "Skip DESeq2 PCA and heatmap plotting."
827832
},

0 commit comments

Comments
 (0)