Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Enhancements and fixes

- [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
- [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))
- [PR #1656](https://github.com/nf-core/rnaseq/pull/1656) - Bump version after release 3.22.1
- [PR #1658](https://github.com/nf-core/rnaseq/pull/1658) - Bump nf-core/multiqc module to 1.33
Expand Down
4 changes: 2 additions & 2 deletions bin/deseq2_qc.r
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ if (is.null(opt$count_file)){
################################################
################################################

count.table <- read.delim(file=opt$count_file,header=TRUE, row.names=NULL)
count.table <- read.delim(file=opt$count_file,header=TRUE, row.names=NULL, check.names=FALSE)
rownames(count.table) <- count.table[,opt$id_col]
count.table <- count.table[,opt$count_col:ncol(count.table),drop=FALSE]
colnames(count.table) <- gsub(opt$sample_suffix,"",colnames(count.table))
Expand All @@ -76,7 +76,7 @@ samples.vec <- colnames(count.table)
name_components <- strsplit(samples.vec, "_")
n_components <- length(name_components[[1]])
decompose <- n_components!=1 && all(sapply(name_components, length)==n_components)
coldata <- data.frame(samples.vec, sample=samples.vec, row.names=1)
coldata <- data.frame(sample=samples.vec, row.names=samples.vec)
if (decompose) {
groupings <- as.data.frame(lapply(1:n_components, function(i) sapply(name_components, "[[", i)))
n_distinct <- sapply(groupings, function(grp) length(unique(grp)))
Expand Down
2 changes: 1 addition & 1 deletion modules.json
Original file line number Diff line number Diff line change
Expand Up @@ -269,7 +269,7 @@
},
"tximeta/tximport": {
"branch": "master",
"git_sha": "d205ebc03abc530a984d844ab57373f566967ac8",
"git_sha": "9ef7553c32b02bc33ecb962b5f07a8cb16b2117c",
"installed_by": ["modules", "quantify_pseudo_alignment"]
},
"ucsc/bedclip": {
Expand Down
8 changes: 6 additions & 2 deletions modules/nf-core/tximeta/tximport/meta.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

57 changes: 50 additions & 7 deletions modules/nf-core/tximeta/tximport/templates/tximport.r

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

106 changes: 102 additions & 4 deletions modules/nf-core/tximeta/tximport/tests/main.nf.test

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading