Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release PR for 3.0.3 #656

Merged
merged 38 commits into from
Aug 27, 2024
Merged
Show file tree
Hide file tree
Changes from 37 commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
127e394
Post release bump
jfy133 Jul 4, 2024
65c4fd8
Merge pull request #636 from nf-core/postreleasebump
jfy133 Jul 4, 2024
3b95035
only make bin depths plots for cases w >2 samples and >2 bins
d-callan Jul 18, 2024
8082972
Update gtdbtk.nf
prototaxites Aug 1, 2024
deab007
Update gtdbtk.nf
prototaxites Aug 1, 2024
5b9c4f1
Update CHANGELOG.md
prototaxites Aug 2, 2024
8f4147f
Fix code that combines assembly and sample IDs for checking
prototaxites Aug 2, 2024
86412f0
Update changelog
prototaxites Aug 2, 2024
a4adc3d
Merge pull request #646 from prototaxites/fix_gtdb_dir_input
jfy133 Aug 3, 2024
3668376
Merge branch 'dev' into fix_match
prototaxites Aug 5, 2024
f143707
Update CHANGELOG.md
prototaxites Aug 6, 2024
098c192
Update subworkflows/local/utils_nfcore_mag_pipeline/main.nf
prototaxites Aug 6, 2024
3b509ed
Update CHANGELOG.md
prototaxites Aug 6, 2024
6ebc119
Merge pull request #648 from prototaxites/fix_match
prototaxites Aug 6, 2024
66a0af4
clarify when clustered heatmaps will be produced as outputs
d-callan Aug 9, 2024
f7c8aca
add bug fix 639 to changelog
d-callan Aug 9, 2024
bd3e813
[automated] Fix code linting
nf-core-bot Aug 10, 2024
6445d78
Merge branch 'dev' into fix-638
jfy133 Aug 15, 2024
83f1fe7
Add @d-callan and other recent code contributors
jfy133 Aug 15, 2024
f79135c
Add other third wave of developer leads to authors
jfy133 Aug 15, 2024
b708160
[automated] Fix code linting
nf-core-bot Aug 15, 2024
e7ebbfa
Update subworkflows/local/depths.nf
jfy133 Aug 15, 2024
36cfd42
Update LICENSE to include more recent contributors
jfy133 Aug 15, 2024
171ea0d
Merge pull request #639 from nf-core/fix-638
jfy133 Aug 16, 2024
5851a1d
replaced old MultiQC containers with nf-core/ubuntu:20.04
harper357 Aug 16, 2024
bd0ef3b
Update CHANGELOG
jfy133 Aug 20, 2024
993ac6d
Update nextflow_schema.json
amizeranschi Aug 20, 2024
225257b
Merge pull request #652 from nf-core/amizeranschi-patch-1
amizeranschi Aug 20, 2024
6a40905
Merge pull request #651 from harper357/container_sync
jfy133 Aug 21, 2024
364b3ee
Fix GUNC overwriting of raw output files
jfy133 Aug 21, 2024
dd7ae6c
Merge pull request #653 from nf-core/fix-gunc-overwriting
jfy133 Aug 22, 2024
2971376
Remove unused module
jfy133 Aug 22, 2024
25ce9b1
Fix linting
jfy133 Aug 22, 2024
70e647c
Remove reference to CUSTOM_DUMPSOFTWAREVERSONS in base.config
jfy133 Aug 22, 2024
1a425b5
Merge pull request #654 from nf-core/remove-old-module
jfy133 Aug 22, 2024
5972c67
Dump versions for release
jfy133 Aug 22, 2024
a3c3471
Merge pull request #655 from nf-core/bump-version
jfy133 Aug 22, 2024
f629418
Update CHANGELOG.md
jfy133 Aug 27, 2024
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
19 changes: 19 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,25 @@
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## 3.0.3 [2024-08-23]
jfy133 marked this conversation as resolved.
Show resolved Hide resolved

### `Added`

### `Changed`

### `Fixed`

- [#648](https://github.com/nf-core/mag/pull/648) - Fix sample ID/assembly ID check failure when no IDs match (reported by @zackhenny, fix by @prototaxites)
- [#646](https://github.com/nf-core/mag/pull/646) - GTDB-Tk directory input now creates a value channel so it runs for all entries to the process and not just the first (reported by @amizeranschi, fix by @prototaxites).
- [#639](https://github.com/nf-core/mag/pull/639) - Fix pipeline failure when a sample produces only a single bin (fix by @d-callan)
- [#651](https://github.com/nf-core/mag/pull/651) - Replace base container for bash only modules to reduce number of containers in pipeline (reported and fixed by @harper357)
- [#652](https://github.com/nf-core/mag/pull/652) - Fix documentation typo in using user-defined assembly parameters (reported and fixed by @amizeranschi)
- [#653](https://github.com/nf-core/mag/pull/653) - Fix overwriting of per-bin 'raw' GUNC RUN output files (multi-bin summary tables not affected) (reported by @zackhenny and fixed by @jfy133)

### `Dependencies`

### `Deprecated`

## 3.0.2 [2024-07-04]

### `Added`
Expand Down
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) Hadrien Gourlé, Daniel Straub, Sabrina Krakau
Copyright (c) Hadrien Gourlé, Daniel Straub, Sabrina Krakau, James A. Fellows Yates, Maxime Borry

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
15 changes: 13 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,14 +77,25 @@ When group-wise co-assembly is enabled, `SPAdes` is run on accordingly pooled re

## Credits

nf-core/mag was written by [Hadrien Gourlé](https://hadriengourle.com) at [SLU](https://slu.se), [Daniel Straub](https://github.com/d4straub) and [Sabrina Krakau](https://github.com/skrakau) at the [Quantitative Biology Center (QBiC)](http://qbic.life). [James A. Fellows Yates](https://github.com/jfy133) and [Maxime Borry](https://github.com/maxibor) at the [Max Planck Institute for Evolutionary Anthropology](https://www.eva.mpg.de) joined in version 2.2.0. More recent contributors include [Jim Downie](https://github.com/prototaxites) and [Carson Miller](https://github.com/CarsonJM).
nf-core/mag was written by [Hadrien Gourlé](https://hadriengourle.com) at [SLU](https://slu.se), [Daniel Straub](https://github.com/d4straub) and [Sabrina Krakau](https://github.com/skrakau) at the [Quantitative Biology Center (QBiC)](http://qbic.life). [James A. Fellows Yates](https://github.com/jfy133) and [Maxime Borry](https://github.com/maxibor) at the [Max Planck Institute for Evolutionary Anthropology](https://www.eva.mpg.de) joined in version 2.2.0.

Other code contributors include:

- [Antonia Schuster](https://github.com/AntoniaSchuster)
- [Alexander Ramos](https://github.com/alxndrdiaz)
- [Carson Miller](https://github.com/CarsonJM)
- [Daniel Lundin](https://github.com/erikrikarddaniel)
- [Danielle Callan](https://github.com/d-callan)
- [Gregory Sprenger](https://github.com/gregorysprenger)
- [Jim Downie](https://github.com/prototaxites)
- [Phil Palmer](https://github.com/PhilPalmer)
- [@willros](https://github.com/willros)

Long read processing was inspired by [caspargross/HybridAssembly](https://github.com/caspargross/HybridAssembly) written by Caspar Gross [@caspargross](https://github.com/caspargross)

We thank the following people for their extensive assistance in the development of this pipeline:

- [Alexander Peltzer](https://github.com/apeltzer)
- [Antonia Schuster](https://github.com/antoniaschuster)
- [Phil Ewels](https://github.com/ewels)
- [Gisela Gabernet](https://github.com/ggabernet)
- [Harshil Patel](https://github.com/drpatelh)
Expand Down
4 changes: 2 additions & 2 deletions assets/multiqc_config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
report_comment: >
This report has been generated by the <a href="https://github.com/nf-core/mag/releases/tag/3.0.2" target="_blank">nf-core/mag</a>
This report has been generated by the <a href="https://github.com/nf-core/mag/releases/tag/3.0.3" target="_blank">nf-core/mag</a>
analysis pipeline. For information about how to interpret these results, please see the
<a href="https://nf-co.re/mag/3.0.2/docs/output" target="_blank">documentation</a>.
<a href="https://nf-co.re/mag/3.0.3/docs/output" target="_blank">documentation</a>.
report_section_order:
"nf-core-mag-methods-description":
order: -1000
Expand Down
4 changes: 0 additions & 4 deletions conf/base.config
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,6 @@ process {
maxRetries = 2
}

withName:CUSTOM_DUMPSOFTWAREVERSIONS {
cache = false
}

withName: BOWTIE2_HOST_REMOVAL_BUILD {
cpus = { check_max (10 * task.attempt, 'cpus' ) }
memory = { check_max (20.GB * task.attempt, 'memory' ) }
Expand Down
4 changes: 2 additions & 2 deletions conf/modules.config
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ process {
// Make sure to keep directory in sync with gunc_qc.nf
withName: 'GUNC_RUN' {
publishDir = [
path: { "${params.outdir}/GenomeBinning/QC/GUNC/raw/${meta.assembler}-${meta.binner}-${meta.domain}-${meta.refinement}-${meta.id}" },
path: { "${params.outdir}/GenomeBinning/QC/GUNC/raw/${meta.assembler}-${meta.binner}-${meta.domain}-${meta.refinement}-${meta.id}/${fasta.baseName}/" },
mode: params.publish_dir_mode,
saveAs: { filename -> filename.equals('versions.yml') ? null : filename }
]
Expand All @@ -456,7 +456,7 @@ process {
// Make sure to keep directory in sync with gunc_qc.nf
withName: 'GUNC_MERGECHECKM' {
publishDir = [
path: { "${params.outdir}/GenomeBinning/QC/GUNC/checkmmerged/${meta.assembler}-${meta.binner}-${meta.domain}-${meta.refinement}-${meta.id}" },
path: { "${params.outdir}/GenomeBinning/QC/GUNC/checkmmerged/${meta.assembler}-${meta.binner}-${meta.domain}-${meta.refinement}-${meta.id}/${checkm_file.baseName}" },
mode: params.publish_dir_mode,
saveAs: { filename -> filename.equals('versions.yml') ? null : filename }
]
Expand Down
6 changes: 3 additions & 3 deletions docs/output.md
Original file line number Diff line number Diff line change
Expand Up @@ -454,7 +454,7 @@ For each bin or refined bin the median sequencing depth is computed based on the
- `GenomeBinning/depths/bins/`
- `bin_depths_summary.tsv`: Summary of bin sequencing depths for all samples. Depths are available for samples mapped against the corresponding assembly, i.e. according to the mapping strategy specified with `--binning_map_mode`. Only for short reads.
- `bin_refined_depths_summary.tsv`: Summary of sequencing depths for refined bins for all samples, if refinement was performed. Depths are available for samples mapped against the corresponding assembly, i.e. according to the mapping strategy specified with `--binning_map_mode`. Only for short reads.
- `[assembler]-[binner]-[sample/group]-binDepths.heatmap.png`: Clustered heatmap showing bin abundances of the assembly across samples. Bin depths are transformed to centered log-ratios and bins as well as samples are clustered by Euclidean distance. Again, sample depths are available according to the mapping strategy specified with `--binning_map_mode`.
- `[assembler]-[binner]-[sample/group]-binDepths.heatmap.png`: Clustered heatmap showing bin abundances of the assembly across samples. Bin depths are transformed to centered log-ratios and bins as well as samples are clustered by Euclidean distance. Again, sample depths are available according to the mapping strategy specified with `--binning_map_mode`. If a sample produces only a single bin, a heatmap will not be provided.

</details>

Expand Down Expand Up @@ -565,9 +565,9 @@ If the parameter `--save_checkm_reference` is set, additionally the used the Che
- `[gunc-database].dmnd`
- `GUNC/`
- `raw/`
- `[assembler]-[binner]-[domain]-[refinement]-[sample/group]/GUNC_checkM.merged.tsv`: Per sample GUNC [output](https://grp-bork.embl-community.io/gunc/output.html) containing with taxonomic and completeness QC statistics.
- `[assembler]-[binner]-[domain]-[refinement]-[sample/group]/[fasta input file name]/GUNC_checkM.merged.tsv`: Per sample GUNC [output](https://grp-bork.embl-community.io/gunc/output.html) containing with taxonomic and completeness QC statistics.
- `checkmmerged/`
- `[assembler]-[binner]-[domain]-[refinement]-[sample/group]/GUNC.progenomes_2.1.maxCSS_level.tsv`: Per sample GUNC output merged with output from [CheckM](#checkm)
- `[assembler]-[binner]-[domain]-[refinement]-[sample/group]/[checkm input file name]/GUNC.progenomes_2.1.maxCSS_level.tsv`: Per sample GUNC output merged with output from [CheckM](#checkm)

</details>

Expand Down
5 changes: 0 additions & 5 deletions modules.json
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,6 @@
"git_sha": "baa30accc6c50ea8a98662417d4f42ed18966353",
"installed_by": ["fasta_binning_concoct"]
},
"custom/dumpsoftwareversions": {
"branch": "master",
"git_sha": "8ec825f465b9c17f9d83000022995b4f7de6fe93",
"installed_by": ["modules"]
},
"dastool/dastool": {
"branch": "master",
"git_sha": "911696ea0b62df80e900ef244d7867d177971f73",
Expand Down
7 changes: 3 additions & 4 deletions modules/local/adjust_maxbin2_ext.nf
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@ process ADJUST_MAXBIN2_EXT {
tag "${meta.assembler}-${meta.id}"
label 'process_low'

// Using container from multiqc since it'll be included anyway
conda "bioconda::multiqc=1.12"
conda "conda-forge::sed=4.7"
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'https://depot.galaxyproject.org/singularity/multiqc:1.12--pyhdfd78af_0' :
'biocontainers/multiqc:1.12--pyhdfd78af_0' }"
'https://depot.galaxyproject.org/singularity/ubuntu:20.04' :
'nf-core/ubuntu:20.04' }"

input:
tuple val(meta), path(bins)
Expand Down
7 changes: 3 additions & 4 deletions modules/local/rename_postdastool.nf
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@ process RENAME_POSTDASTOOL {
tag "${meta.assembler}-${meta.id}"
label 'process_low'

// Using container from multiqc since it'll be included anyway
conda "bioconda::multiqc=1.12"
conda "conda-forge::sed=4.7"
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'https://depot.galaxyproject.org/singularity/multiqc:1.12--pyhdfd78af_0' :
'biocontainers/multiqc:1.12--pyhdfd78af_0' }"
'https://depot.galaxyproject.org/singularity/ubuntu:20.04' :
'nf-core/ubuntu:20.04' }"

input:
tuple val(meta), path(bins)
Expand Down
7 changes: 3 additions & 4 deletions modules/local/rename_predastool.nf
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,10 @@ process RENAME_PREDASTOOL {
tag "${meta.assembler}-${meta.binner}-${meta.id}"
label 'process_low'

// Using container from multiqc since it'll be included anyway
conda "bioconda::multiqc=1.12"
conda "conda-forge::sed=4.7"
container "${ workflow.containerEngine == 'singularity' && !task.ext.singularity_pull_docker_container ?
'https://depot.galaxyproject.org/singularity/multiqc:1.12--pyhdfd78af_0' :
'biocontainers/multiqc:1.12--pyhdfd78af_0' }"
'https://depot.galaxyproject.org/singularity/ubuntu:20.04' :
'nf-core/ubuntu:20.04' }"

input:
tuple val(meta), path(bins)
Expand Down
7 changes: 0 additions & 7 deletions modules/nf-core/custom/dumpsoftwareversions/environment.yml

This file was deleted.

24 changes: 0 additions & 24 deletions modules/nf-core/custom/dumpsoftwareversions/main.nf

This file was deleted.

37 changes: 0 additions & 37 deletions modules/nf-core/custom/dumpsoftwareversions/meta.yml

This file was deleted.

This file was deleted.

43 changes: 0 additions & 43 deletions modules/nf-core/custom/dumpsoftwareversions/tests/main.nf.test

This file was deleted.

Loading
Loading