Skip to content

Commit 0da4e0a

Browse files
authored
Merge branch 'dev' into tx2gene-deterministic-resume
2 parents 9f3b17b + 9b04429 commit 0da4e0a

24 files changed

Lines changed: 58 additions & 57 deletions

.github/workflows/nf-test-gpu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
5959
nf-test-gpu:
6060
needs: [get-shards]
61-
runs-on: "runs-on=${{ github.run_id }}/family=g5.2xlarge/image=ubuntu24-gpu-x64"
61+
runs-on: "runs-on=${{ github.run_id }}/family=g5.2xlarge+g6.2xlarge/image=ubuntu24-gpu-x64"
6262
name: "GPU Test | ${{ matrix.profile }} | ${{ matrix.shard }} | ${{ matrix.NXF_VER }} | ${{ matrix.filters }}"
6363
env:
6464
NXF_VER: ${{ matrix.NXF_VER }}

CHANGELOG.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
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))
2727
- [PR #1875](https://github.com/nf-core/rnaseq/pull/1875) - Select the tx2gene sample deterministically in `quant_tximport_summarizedexperiment` so the `CUSTOM_TX2GENE` cache survives `-resume` (nf-core/modules#12166)
2828
- [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
29+
- [PR #1884](https://github.com/nf-core/rnaseq/pull/1884) - Update `trimgalore` module to 2.3.0
2930

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

conf/arm.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ process {
273273
}
274274

275275
withName: 'TRIMGALORE' {
276-
container = { workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? 'https://community-cr-prod.seqera.io/docker/registry/v2/blobs/sha256/e2/e23b3b324ac8b49a691ba4e74359846850ea082630e13b8ef0bc0392665efc33/data' : 'community.wave.seqera.io/library/trim-galore:2.1.0--7df2aae1e1928c85' }
276+
container = { workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? 'https://community-cr-prod.seqera.io/docker/registry/v2/blobs/sha256/06/0603053a9577911611d7b23a623f29959586c33792e6484d396e26cf09552fd9/data' : 'community.wave.seqera.io/library/trim-galore:2.3.0--41c957a42f06d443' }
277277
}
278278

279279
withName: 'TXIMETA_TXIMPORT' {

modules.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@
349349
},
350350
"trimgalore": {
351351
"branch": "master",
352-
"git_sha": "0991b1032cccfcd9245ef59c6e56d6092ac0b3e7",
352+
"git_sha": "2a30bfb6a1b4667692d734e33e000a3bd1d74a0d",
353353
"installed_by": ["fastq_fastqc_umitools_trimgalore", "modules"]
354354
},
355355
"tximeta/tximport": {

modules/nf-core/trimgalore/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/trimgalore/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/trimgalore/tests/main.nf.test.snap

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

tests/contaminant_screening_input.nf.test.snap

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
"samtools": "1.23.1"
3535
},
3636
"TRIMGALORE": {
37-
"trimgalore": "2.1.0"
37+
"trimgalore": "2.3.0"
3838
},
3939
"UNTAR_KRAKEN_DB": {
4040
"untar": 1.34
@@ -139,7 +139,7 @@
139139
"samtools": "1.23.1"
140140
},
141141
"TRIMGALORE": {
142-
"trimgalore": "2.1.0"
142+
"trimgalore": "2.3.0"
143143
},
144144
"UNTAR_HISAT2_INDEX": {
145145
"untar": 1.34
@@ -236,7 +236,7 @@
236236
"samtools": "1.23.1"
237237
},
238238
"TRIMGALORE": {
239-
"trimgalore": "2.1.0"
239+
"trimgalore": "2.3.0"
240240
},
241241
"UNTAR_KRAKEN_DB": {
242242
"untar": 1.34
@@ -425,7 +425,7 @@
425425
"subread": "2.0.6"
426426
},
427427
"TRIMGALORE": {
428-
"trimgalore": "2.1.0"
428+
"trimgalore": "2.3.0"
429429
},
430430
"TXIMETA_TXIMPORT": {
431431
"bioconductor-tximeta": "1.20.1"
@@ -1814,7 +1814,7 @@
18141814
"subread": "2.0.6"
18151815
},
18161816
"TRIMGALORE": {
1817-
"trimgalore": "2.1.0"
1817+
"trimgalore": "2.3.0"
18181818
},
18191819
"TXIMETA_TXIMPORT": {
18201820
"bioconductor-tximeta": "1.20.1"
@@ -3107,7 +3107,7 @@
31073107
"samtools": "1.23.1"
31083108
},
31093109
"TRIMGALORE": {
3110-
"trimgalore": "2.1.0"
3110+
"trimgalore": "2.3.0"
31113111
},
31123112
"UNTAR_KRAKEN_DB": {
31133113
"untar": 1.34

tests/default.nf.test.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
"star": "2.7.11b"
4040
},
4141
"TRIMGALORE": {
42-
"trimgalore": "2.1.0"
42+
"trimgalore": "2.3.0"
4343
},
4444
"UNTAR_SALMON_INDEX": {
4545
"untar": 1.34
@@ -238,7 +238,7 @@
238238
"subread": "2.0.6"
239239
},
240240
"TRIMGALORE": {
241-
"trimgalore": "2.1.0"
241+
"trimgalore": "2.3.0"
242242
},
243243
"TXIMETA_TXIMPORT": {
244244
"bioconductor-tximeta": "1.20.1"

tests/featurecounts_group_type.nf.test.snap

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"star": "2.7.11b"
3737
},
3838
"TRIMGALORE": {
39-
"trimgalore": "2.1.0"
39+
"trimgalore": "2.3.0"
4040
},
4141
"UNTAR_SALMON_INDEX": {
4242
"untar": 1.34
@@ -162,7 +162,7 @@
162162
"star": "2.7.11b"
163163
},
164164
"TRIMGALORE": {
165-
"trimgalore": "2.1.0"
165+
"trimgalore": "2.3.0"
166166
},
167167
"TXIMETA_TXIMPORT": {
168168
"bioconductor-tximeta": "1.20.1"

0 commit comments

Comments
 (0)