Skip to content

Commit a6de5d6

Browse files
committed
Merge remote-tracking branch 'origin/dev' into update-trimgalore
# Conflicts: # CHANGELOG.md
2 parents fb341a3 + 66ff017 commit a6de5d6

9 files changed

Lines changed: 64 additions & 56 deletions

File tree

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
2424
- [PR #1862](https://github.com/nf-core/rnaseq/pull/1862) - Correct the `docs/usage.md` note to state that `--extra_star_align_args` applies to `--aligner star_rsem`, since STAR runs as a standalone step and RSEM quantifies the resulting BAM ([#1857](https://github.com/nf-core/rnaseq/issues/1857))
2525
- [PR #1864](https://github.com/nf-core/rnaseq/pull/1864) - Bump nf-schema to 2.7.2, fixing boolean CLI parameter validation failures under Nextflow 26.x strict syntax ([#1860](https://github.com/nf-core/rnaseq/issues/1860))
2626
- [PR #1869](https://github.com/nf-core/rnaseq/pull/1869) - Add pipeline validation error when `--use_rustqc` and `--skip_markduplicates` are set together, since RustQC requires duplicate-marked BAM files ([#1865](https://github.com/nf-core/rnaseq/issues/1865))
27+
- [PR #1883](https://github.com/nf-core/rnaseq/pull/1883) - Update the `tximeta/tximport` module ([nf-core/modules#12362](https://github.com/nf-core/modules/pull/12362)): add a `jq` build dependency and set `LC_COLLATE=C` for reproducible gene-level output ordering
2728
- [PR #1884](https://github.com/nf-core/rnaseq/pull/1884) - Update `trimgalore` module to 2.3.0
2829

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

modules.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@
354354
},
355355
"tximeta/tximport": {
356356
"branch": "master",
357-
"git_sha": "77df703775155f3f0f8922f9354501e0289348c2",
357+
"git_sha": "2e17764b67b7613c0a420c3f13d9360c3377bee8",
358358
"installed_by": ["quant_tximport_summarizedexperiment", "quantify_pseudo_alignment"]
359359
},
360360
"ucsc/bedclip": {

modules/nf-core/tximeta/tximport/environment.yml

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

modules/nf-core/tximeta/tximport/main.nf

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

modules/nf-core/tximeta/tximport/templates/tximport.r

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

modules/nf-core/tximeta/tximport/tests/main.nf.test.snap

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

tests/bam_input.nf.test.snap

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1829,11 +1829,11 @@
18291829
"WT_REP2.biotype_counts_mqc.tsv:md5,c04c2936bbfac3bff284f96b7233b158",
18301830
"WT_REP2.biotype_counts_rrna_mqc.tsv:md5,12294618fe44df1e7f39348372dcb481",
18311831
"WT_REP2.featureCounts.tsv:md5,da2c6d621864e2f26958e2c299708c3e",
1832-
"rsem.merged.gene_counts.tsv:md5,060949cead024e393378bec58c82c976",
1833-
"rsem.merged.gene_counts_length_scaled.tsv:md5,8ceb1a2f0662630ad658d565db50c852",
1834-
"rsem.merged.gene_counts_scaled.tsv:md5,fdc2bb1618019953151b053107293543",
1835-
"rsem.merged.gene_lengths.tsv:md5,5b43d4327096c8714351fa3b147ace4b",
1836-
"rsem.merged.gene_tpm.tsv:md5,b4b1a0f093a5be3f43e2a5f583138709",
1832+
"rsem.merged.gene_counts.tsv:md5,43ac77bb055be372ee42deb5ec0199f6",
1833+
"rsem.merged.gene_counts_length_scaled.tsv:md5,58040cecbc89aee6e7b53761bfad19ef",
1834+
"rsem.merged.gene_counts_scaled.tsv:md5,7873cf3b356435d6175ff4821288be0d",
1835+
"rsem.merged.gene_lengths.tsv:md5,6455b4186bdf2e786017724bc00966d8",
1836+
"rsem.merged.gene_tpm.tsv:md5,72aa275645fde43a528e42b254285b32",
18371837
"rsem.merged.transcript_counts.tsv:md5,058a1780f4e0622c0cffb38ff7dcb66a",
18381838
"rsem.merged.transcript_lengths.tsv:md5,abcbf186029d6accc817a5b84a71e650",
18391839
"rsem.merged.transcript_tpm.tsv:md5,2368b7b8e5561ff2d5a0672bb2f0301b",
@@ -1872,7 +1872,7 @@
18721872
"i_data.ctab:md5,7e81ace0a68bfe42482420b7275de195"
18731873
]
18741874
],
1875-
"timestamp": "2026-05-01T16:23:34.874577699",
1875+
"timestamp": "2026-07-15T12:50:56.239252039",
18761876
"meta": {
18771877
"nf-test": "0.9.5",
18781878
"nextflow": "26.04.0"

tests/star_rsem.nf.test.snap

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1237,11 +1237,11 @@
12371237
"RAP1_UNINDUCED_REP2.SJ.out.tab:md5,1eb030549d877ab7fa51fe1d632ffe09",
12381238
"WT_REP1.SJ.out.tab:md5,5292020e46d35c14354f13696bbf0ab0",
12391239
"WT_REP2.SJ.out.tab:md5,3fab08b47b8b3cab91ae91dec8750152",
1240-
"rsem.merged.gene_counts.tsv:md5,91223fb1d835d6bc5140a5e095ad5b3e",
1241-
"rsem.merged.gene_counts_length_scaled.tsv:md5,ec0e98882128ff058169354fd1ccb240",
1242-
"rsem.merged.gene_counts_scaled.tsv:md5,59ec3256b6ecf3c58d9a86c6dfde51fd",
1243-
"rsem.merged.gene_lengths.tsv:md5,acdee55d5bd05d5cc83e4ca029b960b2",
1244-
"rsem.merged.gene_tpm.tsv:md5,8068aa3bb3369b818af7ece24977d8da",
1240+
"rsem.merged.gene_counts.tsv:md5,889e45a0d9cc2e069016305129a13f01",
1241+
"rsem.merged.gene_counts_length_scaled.tsv:md5,84a6fa0aad14b7bee4754af5e677d0b2",
1242+
"rsem.merged.gene_counts_scaled.tsv:md5,e86894ecc50dec68b979191898b7c9f6",
1243+
"rsem.merged.gene_lengths.tsv:md5,273ca6d2b937af63539c088fc4854a8c",
1244+
"rsem.merged.gene_tpm.tsv:md5,fecf349b2d3a267fd91c5cd45e4e8592",
12451245
"rsem.merged.transcript_counts.tsv:md5,535ab7cf11f6efde878283dc722dea0b",
12461246
"rsem.merged.transcript_lengths.tsv:md5,cb304a9c4932075da049cea5fe2a8165",
12471247
"rsem.merged.transcript_tpm.tsv:md5,8fe690a435900ef5a3c1cf639192ac5d",
@@ -1280,7 +1280,7 @@
12801280
"i_data.ctab:md5,7e81ace0a68bfe42482420b7275de195"
12811281
]
12821282
],
1283-
"timestamp": "2026-05-01T16:41:18.904088528",
1283+
"timestamp": "2026-07-15T12:54:17.149160947",
12841284
"meta": {
12851285
"nf-test": "0.9.5",
12861286
"nextflow": "26.04.0"

0 commit comments

Comments
 (0)