Skip to content

Commit 3816d48

Browse files
authored
Merge pull request #1662 from nf-core/dev
Dev -> master for nf-core/rnaseq 3.22.2
2 parents 759dbf1 + a32de4e commit 3816d48

40 files changed

+731
-3293
lines changed

.nf-core.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ template:
2222
name: rnaseq
2323
org: nf-core
2424
outdir: .
25-
version: 3.22.1
25+
version: 3.22.2

CHANGELOG.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,27 @@
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.22.2](https://github.com/nf-core/rnaseq/releases/tag/3.22.2)] - 2025-12-11
7+
8+
### Credits
9+
10+
Special thanks to the following for their contributions to the release:
11+
12+
- [ahwanpandey](https://github.com/ahwanpandey)
13+
- [Graeme Grimes](https://github.com/ggrimes)
14+
- [Pontus Höjer](https://github.com/pontushojer)
15+
16+
### Enhancements and fixes
17+
18+
- [PR #1654](https://github.com/nf-core/rnaseq/pull/1654) - Fix tximport to handle tx2gene files with extra columns from `--gtf_extra_attributes`, and fix sample name mangling in DESeq2 QC
19+
- [PR #1655](https://github.com/nf-core/rnaseq/pull/1655) - Fix duplicate flagstat files in MultiQC report when mark duplicates is enabled ([#1653](https://github.com/nf-core/rnaseq/issues/1653))
20+
- [PR #1656](https://github.com/nf-core/rnaseq/pull/1656) - Bump version after release 3.22.1
21+
- [PR #1659](https://github.com/nf-core/rnaseq/pull/1659) - Fix MultiQC sample name collisions when multiple samples share the same FASTQ filename ([#1657](https://github.com/nf-core/rnaseq/issues/1657))
22+
- [PR #1658](https://github.com/nf-core/rnaseq/pull/1658) - Bump nf-core/multiqc module to 1.33
23+
- [PR #1660](https://github.com/nf-core/rnaseq/pull/1660) - Update MultiQC ARM container to 1.33
24+
- [PR #1648](https://github.com/nf-core/rnaseq/pull/1648) - Reduce duplicate coverage in pipeline tests by adding skip options
25+
- [PR #1661](https://github.com/nf-core/rnaseq/pull/1661) - Bump version to 3.22.2 ahead of release
26+
627
## [[3.22.1](https://github.com/nf-core/rnaseq/releases/tag/3.22.1)] - 2025-12-04
728

829
### Credits

bin/deseq2_qc.r

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ if (is.null(opt$count_file)){
5555
################################################
5656
################################################
5757

58-
count.table <- read.delim(file=opt$count_file,header=TRUE, row.names=NULL)
58+
count.table <- read.delim(file=opt$count_file,header=TRUE, row.names=NULL, check.names=FALSE)
5959
rownames(count.table) <- count.table[,opt$id_col]
6060
count.table <- count.table[,opt$count_col:ncol(count.table),drop=FALSE]
6161
colnames(count.table) <- gsub(opt$sample_suffix,"",colnames(count.table))
@@ -76,7 +76,7 @@ samples.vec <- colnames(count.table)
7676
name_components <- strsplit(samples.vec, "_")
7777
n_components <- length(name_components[[1]])
7878
decompose <- n_components!=1 && all(sapply(name_components, length)==n_components)
79-
coldata <- data.frame(samples.vec, sample=samples.vec, row.names=1)
79+
coldata <- data.frame(sample=samples.vec, row.names=samples.vec)
8080
if (decompose) {
8181
groupings <- as.data.frame(lapply(1:n_components, function(i) sapply(name_components, "[[", i)))
8282
n_distinct <- sapply(groupings, function(grp) length(unique(grp)))

conf/arm.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ process {
109109
}
110110

111111
withName: 'MULTIQC' {
112-
container = { workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? 'https://community-cr-prod.seqera.io/docker/registry/v2/blobs/sha256/c8/c8a4a71510e6ef370a48bb155b32ad1cb00a053431986bae06f97361598c50b3/data' : 'community.wave.seqera.io/library/multiqc:1.31--e89b9d3faf1041af' }
112+
container = { workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? 'https://community-cr-prod.seqera.io/docker/registry/v2/blobs/sha256/78/78b89e91d89e9cc99ad5ade5be311f347838cb2acbfb4f13bc343b170be09ce4/data' : 'community.wave.seqera.io/library/multiqc:1.33--58d7dee710ab3aa8' }
113113
}
114114

115115
withName: 'MULTIQC_CUSTOM_BIOTYPE' {

modules.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@
108108
},
109109
"multiqc": {
110110
"branch": "master",
111-
"git_sha": "e10b76ca0c66213581bec2833e30d31f239dec0b",
111+
"git_sha": "9656d955b700a8707c4a67821ab056f8c1095675",
112112
"installed_by": ["modules"]
113113
},
114114
"picard/markduplicates": {
@@ -269,7 +269,7 @@
269269
},
270270
"tximeta/tximport": {
271271
"branch": "master",
272-
"git_sha": "d205ebc03abc530a984d844ab57373f566967ac8",
272+
"git_sha": "9ef7553c32b02bc33ecb962b5f07a8cb16b2117c",
273273
"installed_by": ["modules", "quantify_pseudo_alignment"]
274274
},
275275
"ucsc/bedclip": {

modules/nf-core/multiqc/environment.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.

modules/nf-core/multiqc/main.nf

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

modules/nf-core/multiqc/meta.yml

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

modules/nf-core/multiqc/tests/custom_prefix.config

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

modules/nf-core/multiqc/tests/main.nf.test

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

0 commit comments

Comments
 (0)