diff --git a/CHANGELOG.md b/CHANGELOG.md index 18ddc29e..63515e3f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,10 +9,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### `Changed` +- [#664](https://github.com/nf-core/mag/pull/664) - Update GTDBTk to latest version, with updated column names, update GTDB to release 220 (by @dialvarezs) + ### `Fixed` ### `Dependencies` +| Tool | Previous version | New version | +| ------ | ---------------- | ----------- | +| GTDBTk | 2.3.2 | 2.4.0 | + ### `Deprecated` ## 3.0.3 [2024-08-27] diff --git a/bin/summary_gtdbtk.py b/bin/summary_gtdbtk.py index 7ae43a09..370ea4fa 100755 --- a/bin/summary_gtdbtk.py +++ b/bin/summary_gtdbtk.py @@ -76,11 +76,11 @@ def main(args=None): columns = [ "user_genome", "classification", - "fastani_reference", - "fastani_reference_radius", - "fastani_taxonomy", - "fastani_ani", - "fastani_af", + "closest_genome_reference", + "closest_genome_reference_radius", + "closest_genome_taxonomy", + "closest_genome_ani", + "closest_genome_af", "closest_placement_reference", "closest_placement_radius", "closest_placement_taxonomy", diff --git a/conf/test_full.config b/conf/test_full.config index d7f3365e..9a01bc58 100644 --- a/conf/test_full.config +++ b/conf/test_full.config @@ -22,7 +22,7 @@ params { //centrifuge_db = "s3://ngi-igenomes/test-data/mag/p_compressed+h+v.tar.gz" kraken2_db = "s3://ngi-igenomes/test-data/mag/minikraken_8GB_202003.tgz" cat_db = "s3://ngi-igenomes/test-data/mag/CAT_prepare_20210107.tar.gz" - // gtdb_db = "s3://ngi-igenomes/test-data/mag/gtdbtk_r214_data.tar.gz" + // gtdb_db = "s3://ngi-igenomes/test-data/mag/gtdbtk_r214_data.tar.gz" ## This should be updated to release 220, once we get GTDB-Tk working again skip_gtdbtk = true // TODO TEMPORARY: deactivate SPAdes due to incompatibility of container with fusion file system diff --git a/modules.json b/modules.json index 0cab4e4e..b17f7dc3 100644 --- a/modules.json +++ b/modules.json @@ -124,7 +124,7 @@ }, "gtdbtk/classifywf": { "branch": "master", - "git_sha": "0735b6d2b509cbb5cf71d15fda819cd7392722fe", + "git_sha": "06c8865e36741e05ad32ef70ab3fac127486af48", "installed_by": ["modules"] }, "gunc/downloaddb": { diff --git a/modules/nf-core/gtdbtk/classifywf/environment.yml b/modules/nf-core/gtdbtk/classifywf/environment.yml index 8801269e..500531ea 100644 --- a/modules/nf-core/gtdbtk/classifywf/environment.yml +++ b/modules/nf-core/gtdbtk/classifywf/environment.yml @@ -1,7 +1,5 @@ -name: gtdbtk_classifywf channels: - conda-forge - bioconda - - defaults dependencies: - - bioconda::gtdbtk=2.3.2 + - bioconda::gtdbtk=2.4.0 diff --git a/modules/nf-core/gtdbtk/classifywf/main.nf b/modules/nf-core/gtdbtk/classifywf/main.nf index 14dd28a4..9fc7a32d 100644 --- a/modules/nf-core/gtdbtk/classifywf/main.nf +++ b/modules/nf-core/gtdbtk/classifywf/main.nf @@ -5,8 +5,8 @@ process GTDBTK_CLASSIFYWF { // WARN: Version information not provided by tool on CLI. Please update version string below when bumping container versions. conda "${moduleDir}/environment.yml" container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ? - 'https://depot.galaxyproject.org/singularity/gtdbtk:2.3.2--pyhdfd78af_0' : - 'biocontainers/gtdbtk:2.3.2--pyhdfd78af_0' }" + 'https://depot.galaxyproject.org/singularity/gtdbtk:2.4.0--pyhdfd78af_1' : + 'biocontainers/gtdbtk:2.4.0--pyhdfd78af_1' }" input: tuple val(meta), path("bins/*") diff --git a/nextflow.config b/nextflow.config index 85be4905..8338e9f3 100644 --- a/nextflow.config +++ b/nextflow.config @@ -87,7 +87,7 @@ params { cat_official_taxonomy = false save_cat_db = false skip_gtdbtk = false - gtdb_db = "https://data.ace.uq.edu.au/public/gtdb/data/releases/release214/214.1/auxillary_files/gtdbtk_r214_data.tar.gz" + gtdb_db = "https://data.ace.uq.edu.au/public/gtdb/data/releases/release220/220.0/auxillary_files/gtdbtk_package/full_package/gtdbtk_r220_data.tar.gz" gtdb_mash = null gtdbtk_min_completeness = 50.0 gtdbtk_max_contamination = 10.0 diff --git a/nextflow_schema.json b/nextflow_schema.json index 35e85825..219d6724 100644 --- a/nextflow_schema.json +++ b/nextflow_schema.json @@ -537,7 +537,7 @@ "gtdb_db": { "type": "string", "description": "Specify the location of a GTDBTK database. Can be either an uncompressed directory or a `.tar.gz` archive. If not specified will be downloaded for you when GTDBTK or binning QC is not skipped.", - "default": "https://data.ace.uq.edu.au/public/gtdb/data/releases/release214/214.1/auxillary_files/gtdbtk_r214_data.tar.gz" + "default": "https://data.ace.uq.edu.au/public/gtdb/data/releases/release220/220.0/auxillary_files/gtdbtk_package/full_package/gtdbtk_r220_data.tar.gz" }, "gtdb_mash": { "type": "string",