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

2.4 release version bump #500

Merged
merged 7 commits into from
Sep 1, 2023
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
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
3 changes: 2 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
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).

## 2.4.0dev - [date]
## 2.4.0 - 2023-09-07

### `Added`

Expand All @@ -25,6 +25,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- [#444](https://github.com/nf-core/mag/pull/444) - Moved BUSCO bash code to script (by @jfy133)
- [#428](https://github.com/nf-core/mag/pull/429) - Update to nf-core 2.9 `TEMPLATE` (by @jfy133)
- [#437](https://github.com/nf-core/mag/pull/429) - `--gtdb` parameter is split into `--skip_gtdbtk` and `--gtdb_db` to allow finer control over GTDB database retrieval (fix by @jfy133)
- [#500](https://github.com/nf-core/mag/pull/500) - Temporarily disabled downstream processing of both refined and raw bins due to bug (by @jfy133)

### `Fixed`

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/2.4.0dev" target="_blank">nf-core/mag</a>
This report has been generated by the <a href="https://github.com/nf-core/mag/2.4.0" 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/2.4.0dev/output" target="_blank">documentation</a>.
<a href="https://nf-co.re/mag/2.4.0/output" target="_blank">documentation</a>.
report_section_order:
"nf-core-mag-methods-description":
order: -1000
Expand Down
2 changes: 1 addition & 1 deletion conf/modules.config
Original file line number Diff line number Diff line change
Expand Up @@ -621,7 +621,7 @@ process {
[
path: { "${params.outdir}/GenomeBinning/MaxBin2/bins/" },
mode: params.publish_dir_mode,
pattern: '*/*.fa.gz'
pattern: '*.fa.gz'
],
]
}
Expand Down
3 changes: 2 additions & 1 deletion conf/test_binrefinement.config
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ params {
skip_gtdbtk = true
refine_bins_dastool = true
refine_bins_dastool_threshold = 0
postbinning_input = 'both'
// TODO not using 'both' until #489 merged
postbinning_input = 'refined_bins_only'
busco_clean = true
}
2 changes: 1 addition & 1 deletion nextflow.config
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ manifest {
description = """Assembly, binning and annotation of metagenomes"""
mainScript = 'main.nf'
nextflowVersion = '!>=23.04.0'
version = '2.4.0dev'
version = '2.4.0'
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is an harshil unworthy indent

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't blame me! Blame tools!!!!

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, made by tools & requires manual correction. I gave up on that :D

doi = '10.1093/nargab/lqac007'
}

Expand Down
12 changes: 6 additions & 6 deletions nextflow_schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -522,23 +522,23 @@
},
"gtdbtk_min_completeness": {
"type": "number",
"default": 50,
"default": 50.0,
"description": "Min. bin completeness (in %) required to apply GTDB-tk classification.",
"help_text": "Completeness assessed with BUSCO analysis (100% - %Missing). Must be greater than 0 (min. 0.01) to avoid GTDB-tk errors. If too low, GTDB-tk classification results can be impaired due to not enough marker genes!",
"minimum": 0.01,
"maximum": 100
},
"gtdbtk_max_contamination": {
"type": "number",
"default": 10,
"default": 10.0,
"description": "Max. bin contamination (in %) allowed to apply GTDB-tk classification.",
"help_text": "Contamination approximated based on BUSCO analysis (%Complete and duplicated). If too high, GTDB-tk classification results can be impaired due to contamination!",
"minimum": 0,
"maximum": 100
},
"gtdbtk_min_perc_aa": {
"type": "number",
"default": 10,
"default": 10.0,
"description": "Min. fraction of AA (in %) in the MSA for bins to be kept.",
"minimum": 0,
"maximum": 100
Expand All @@ -552,7 +552,7 @@
},
"gtdbtk_pplacer_cpus": {
"type": "number",
"default": 1,
"default": 1.0,
"description": "Number of CPUs used for the by GTDB-Tk run tool pplacer.",
"help_text": "A low number of CPUs helps to reduce the memory required/reported by GTDB-Tk. See also the [GTDB-Tk documentation](https://ecogenomics.github.io/GTDBTk/faq.html#gtdb-tk-reaches-the-memory-limit-pplacer-crashes)."
},
Expand Down Expand Up @@ -807,8 +807,8 @@
"type": "string",
"default": "raw_bins_only",
"description": "Specify which binning output is sent for downstream annotation, taxonomic classification, bin quality control etc.",
"help_text": "`raw_bins_only`: only bins (and unbinned contigs) from the binners.\n`refined_bins_only`: only bins (and unbinned contigs) from the bin refinement step .\n`both`: bins and unbinned contigs from both the binning and bin refinement steps.",
"enum": ["raw_bins_only", "refined_bins_only", "both"]
"help_text": "`raw_bins_only`: only bins (and unbinned contigs) from the binners.\n`refined_bins_only`: only bins (and unbinned contigs) from the bin refinement step .\n\n ~~`both`: bins and unbinned contigs from both the binning and bin refinement steps.~~ `both` option is disabled in v2.4 due a bug that will be fixed in a later release.",
"enum": ["raw_bins_only", "refined_bins_only"]
},
"run_gunc": {
"type": "boolean",
Expand Down
10 changes: 6 additions & 4 deletions workflows/mag.nf
Original file line number Diff line number Diff line change
Expand Up @@ -765,10 +765,12 @@ workflow MAG {
} else if ( params.postbinning_input == 'refined_bins_only' ) {
ch_input_for_postbinning_bins = ch_refined_bins
ch_input_for_postbinning_bins_unbins = ch_refined_bins.mix(ch_refined_unbins)
} else if ( params.postbinning_input == 'both' ) {
ch_all_bins = ch_binning_results_bins.mix(ch_refined_bins)
ch_input_for_postbinning_bins = ch_all_bins
ch_input_for_postbinning_bins_unbins = ch_all_bins.mix(ch_binning_results_unbins).mix(ch_refined_unbins)
// TODO REACTIVATE ONCE PR #489 IS READY!
// TODO RE-ADD BOTH TO SCHEMA ONCE RE-ADDING
// } else if ( params.postbinning_input == 'both' ) {
// ch_all_bins = ch_binning_results_bins.mix(ch_refined_bins)
// ch_input_for_postbinning_bins = ch_all_bins
// ch_input_for_postbinning_bins_unbins = ch_all_bins.mix(ch_binning_results_unbins).mix(ch_refined_unbins)
}
} else {
ch_input_for_postbinning_bins = ch_binning_results_bins
Expand Down
Loading