Skip to content

Commit 8b75e75

Browse files
committed
Merge remote-tracking branch 'upstream/dev' into feat/improve-configs
2 parents e61074a + 3bdae3e commit 8b75e75

31 files changed

Lines changed: 3389 additions & 307 deletions

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3434
- [#1062](https://github.com/nf-core/mag/pull/1062) - Remove grouping to prevent bin QC blocking by waiting for all binners (by @dialvarezs)
3535
- [#1063](https://github.com/nf-core/mag/pull/1063) - Run ALE with `--metagenome` and disable its per-base output by default (by @dialvarezs)
3636
- [#1065](https://github.com/nf-core/mag/pull/1065) - Improved efficiency by removing usage of per-bin GUNZIP module for bins and unbinned contigs and allowing gzip support for all modules (by @dialvarezs)
37+
- [#1066](https://github.com/nf-core/mag/pull/1066) - Improved efficiency by removing channel "locks" on Seqkit, QUAST, and GTDB-Tk (by @dialvarezs)
38+
- [#1070](https://github.com/nf-core/mag/pull/1070) - Update BUSCO nf-core module (by @dialvarezs)
3739

3840
### `Fixed`
3941

@@ -47,18 +49,21 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
4749
- [#1031](https://github.com/nf-core/mag/pull/1031) - Fix hybrid co-assembly with SPAdes (short & long reads with `--coassemble_group`) (fix by @d4straub)
4850
- [#1049](https://github.com/nf-core/mag/pull/1049) - Fix publishing issue with `gtdbtk/classifywf` (by @dialvarezs)
4951
- [#1058](https://github.com/nf-core/mag/pull/1058) - Make `create_metabinner_bins.py` save gzipped bin files to prevent NFS race condition (by @dialvarezs)
52+
- [#1069](https://github.com/nf-core/mag/pull/1069) - Exclude eukaryotic bins from CheckM2, which only supports bacterial and archaeal genomes (by @dialvarezs)
5053

5154
### `Dependencies`
5255

5356
| Tool | Previous version | New version |
5457
| ------- | ---------------- | ----------- |
58+
| BUSCO | 6.0.0 | 6.1.0 |
5559
| GTDB-Tk | 2.5.2 | 2.7.2 |
5660

5761
### `Deprecated`
5862

5963
- [#908](https://github.com/nf-core/mag/pull/908) - Removed local `quast_bins_summary` in favor of `csvtk/concat` (by @dialvarezs)
6064
- [#1018](https://github.com/nf-core/mag/pull/1018) - Remove `mag_depths_plot` local module (by @dialvarezs)
6165
- [#1018](https://github.com/nf-core/mag/pull/1018) - Deprecated `--gtdbtk_skip_aniscreen` in favor of `--gtdbtk_place_species` (by @dialvarezs)
66+
- [#1067](https://github.com/nf-core/mag/pull/1066) - Deprecated `--skip_metaeuk` as it has no effect, MetaEuk is gated by `--metaeuk_db` / `--metaeuk_mmseqs_db` (by @dialvarezs)
6267

6368
## 5.4.2 Yellow Frog patch [2026-03-31]
6469

conf/base.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,4 +192,8 @@ process {
192192
cpus = 1
193193
memory = { 1.GB * task.attempt }
194194
}
195+
withName: SEQKIT_STATS {
196+
cpus = 1
197+
memory = { 1.GB * task.attempt }
198+
}
195199
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
process { withName: 'BUSCO_BUSCO' { container = 'modules/nf-core/busco/busco/.conda-lock/linux_amd64-bd-6d1f7006d91892b3_1.txt' } }
12
process { withName: 'FASTQC' { container = 'modules/nf-core/fastqc/.conda-lock/linux_amd64-bd-5cb1a2fa2f18c7c2_1.txt' } }
23
process { withName: 'MULTIQC' { container = 'modules/nf-core/multiqc/.conda-lock/linux_amd64-bd-db7c73dae76bc9e6_1.txt' } }
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
process { withName: 'BUSCO_BUSCO' { container = 'community.wave.seqera.io/library/busco:6.1.0--6d1f7006d91892b3' } }
12
process { withName: 'FASTQC' { container = 'community.wave.seqera.io/library/fastqc:0.12.1--5cb1a2fa2f18c7c2' } }
23
process { withName: 'MULTIQC' { container = 'community.wave.seqera.io/library/multiqc:1.34--db7c73dae76bc9e6' } }
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
process { withName: 'BUSCO_BUSCO' { container = 'https://community-cr-prod.seqera.io/docker/registry/v2/blobs/sha256/96/963bad66c10646cf0adb1967cc462ad04d02789ddbfae4fbb94182291dbddf8c/data' } }
12
process { withName: 'FASTQC' { container = 'https://community-cr-prod.seqera.io/docker/registry/v2/blobs/sha256/f2/f20b021476d1d87658820f971ebecc1e8cdbde0f338eb0d9cea2b0a8fc54a54b/data' } }
23
process { withName: 'MULTIQC' { container = 'https://community-cr-prod.seqera.io/docker/registry/v2/blobs/sha256/1b/1bef8af6be88c5733461959c46ac8ef73d18f65277f62a1695d0e1633054f9c2/data' } }
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
process { withName: 'BUSCO_BUSCO' { container = 'oras://community.wave.seqera.io/library/busco:6.1.0--c7528d5825eb19b5' } }
12
process { withName: 'FASTQC' { container = 'oras://community.wave.seqera.io/library/fastqc:0.12.1--5c4bd442468d75dd' } }
23
process { withName: 'MULTIQC' { container = 'oras://community.wave.seqera.io/library/multiqc:1.34--4fc8657c816047c0' } }

conf/modules.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1040,6 +1040,8 @@ process {
10401040
}
10411041

10421042
withName: SEQKIT_STATS {
1043+
tag = { "${meta.assembler}-${meta.binner}-${meta.id}" }
1044+
ext.prefix = { "${meta.assembler}-${meta.binner}-${meta.id}" }
10431045
ext.args = ""
10441046
maxForks = params.bin_seqkit_stats_max_forks
10451047
publishDir = [enabled: false]

conf/test_alternatives.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,5 @@ params {
5050
skip_comebin = true
5151
skip_metabinner = true
5252
skip_semibin = true
53-
skip_metaeuk = true
5453
megahit_fix_cpu_1 = true
5554
}

conf/test_assembly_input.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ params {
5858
run_gunc = true
5959
gunc_db = params.pipelines_testdata_base_path + 'mag/databases/gunc/ci_test.dmnd'
6060

61-
skip_metaeuk = false
6261
metaeuk_mmseqs_db = 'Kalamari'
6362
}
6463

conf/test_longreadonly_alternatives.config

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,4 @@ params {
5353
skip_comebin = true
5454
skip_metabinner = true
5555
skip_semibin = true
56-
skip_metaeuk = true
5756
}

0 commit comments

Comments
 (0)