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 3.1.0 #679

Merged
merged 36 commits into from
Oct 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
b512be5
Bump versions
jfy133 Aug 27, 2024
2c3987a
Merge pull request #658 from nf-core/postrelease-bump
jfy133 Aug 27, 2024
df02613
Update GTDBTk to v2.4.0
dialvarezs Sep 8, 2024
e4fa8a9
Changelog
dialvarezs Sep 8, 2024
5580375
Prettier
dialvarezs Sep 8, 2024
080eac6
Bump GTDB release version, better changelog
jfy133 Sep 9, 2024
f11d9ae
Add support for pre-supplying bowtie2 host index
jfy133 Sep 9, 2024
4dd9519
Merge pull request #664 from dialvarezs/dev-gtdbtk
jfy133 Sep 10, 2024
fb4eb51
Merge pull request #665 from nf-core/bowtie2-index
jfy133 Sep 10, 2024
ca8ba9d
Improve condition so SPLIT_FASTQ skipped if only concoct selected as …
jfy133 Sep 11, 2024
9fc4153
Update subworkflows/local/binning.nf
jfy133 Sep 12, 2024
fcdb518
Update subworkflows/local/binning.nf
jfy133 Sep 12, 2024
43c5b93
Merge pull request #667 from nf-core/concoct-only-fix
jfy133 Sep 12, 2024
9d9e4ed
Fix module failure when no bins
jfy133 Sep 13, 2024
a60f2e7
Address comments via ofifical module update
jfy133 Sep 16, 2024
a19738b
Merge pull request #669 from nf-core/fix-gtdbtk
dialvarezs Sep 16, 2024
b19d4d3
Utilise missing GTDBK parameters, rename pplacer scratch due to subop…
jfy133 Sep 18, 2024
1059e36
Update CHANGELOG
jfy133 Sep 18, 2024
46f16c4
Merge branch 'dev' into gtdbtk-missing-params
jfy133 Sep 18, 2024
a3ce46a
Specify they are parameters
jfy133 Sep 18, 2024
5fefcb1
Merge branch 'gtdbtk-missing-params' of github.com:nf-core/mag into g…
jfy133 Sep 18, 2024
459f418
Typo fixes after review from @harper357
jfy133 Sep 20, 2024
6183ef0
REname scratchoff to more intiuitive name to match behaviour
jfy133 Sep 20, 2024
3b19943
Fix missing GTDBTk files in outdir
jfy133 Sep 20, 2024
bfc2c0b
Update CHANGELOG.md
jfy133 Sep 20, 2024
48a3698
Merge pull request #673 from nf-core/missing-gtdbtk-files
jfy133 Sep 20, 2024
aa1f3d9
Add exit code 12 to spades(hybrid), and standardise errorStrategy format
jfy133 Sep 23, 2024
c57286b
Merge branch 'dev' into gtdbtk-missing-params
jfy133 Sep 23, 2024
32298dd
Merge pull request #671 from nf-core/gtdbtk-missing-params
jfy133 Sep 23, 2024
868cec1
Apply suggestions from code review
jfy133 Sep 24, 2024
f7865e5
Merge pull request #676 from nf-core/spades-ec-12
jfy133 Sep 24, 2024
ce9e541
Bump version for release
jfy133 Oct 2, 2024
63ce1cb
Harshil align
jfy133 Oct 2, 2024
e3b3b16
Merge pull request #678 from nf-core/release-dump
jfy133 Oct 2, 2024
375c018
Apply suggestions from code review
jfy133 Oct 3, 2024
a4d80ac
Update CHANGELOG.md
jfy133 Oct 3, 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
28 changes: 28 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,34 @@
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.1.0 [2024-10-04]

### `Added`

- [#665](https://github.com/nf-core/mag/pull/648) - Add support for supplying pre-made bowtie host reference index (requested by @simone-pignotti, added by @jfy133)
- [#670](https://github.com/nf-core/mag/pull/670) - Added `--gtdbtk_pplacer_useram` to run GTDBTk in memory mode rather than write to disk (requested by @harper357, fixed by @jfy133)

### `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)
- [#676](https://github.com/nf-core/mag/pull/676) - Added exit code 12 to valid SPAdes retry codes, due to OOM errors from spades-hammer (reported by @bawee, fix by @jfy133)

### `Fixed`

- [#667](https://github.com/nf-core/mag/pull/667) - Fix pipeline crashing if only CONCOCT selected during binning (reported and fixed by @jfy133)
- [#670](https://github.com/nf-core/mag/pull/670) - Re-add missing GTDBTk parameters into GTDBTk module (reported by harper357, fixed by @jfy133)
- [#672](https://github.com/nf-core/mag/pull/673) - Fix GTDB-Tk per-sample TSV files not being published in output directory (reported by @jhayer, fix by @jfy133)

### `Dependencies`

| Tool | Previous version | New version |
| ------ | ---------------- | ----------- |
| GTDBTk | 2.3.2 | 2.4.0 |

### `Deprecated`

- [#670](https://github.com/nf-core/mag/pull/670) - Deprecated `--gtdbtk_pplacer_scratch` due to unintuitive usage (reported by harper357, fixed by @jfy133)

## 3.0.3 [2024-08-27]

### `Added`
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.3" target="_blank">nf-core/mag</a>
This report has been generated by the <a href="https://github.com/nf-core/mag/releases/tag/3.1.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/3.0.3/docs/output" target="_blank">documentation</a>.
<a href="https://nf-co.re/mag/3.1.0/docs/output" target="_blank">documentation</a>.
report_section_order:
"nf-core-mag-methods-description":
order: -1000
Expand Down
10 changes: 5 additions & 5 deletions bin/summary_gtdbtk.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
10 changes: 5 additions & 5 deletions conf/base.config
Original file line number Diff line number Diff line change
Expand Up @@ -123,30 +123,30 @@ process {
cpus = { check_megahit_cpus (8, task.attempt ) }
memory = { check_max (40.GB * task.attempt, 'memory' ) }
time = { check_max (16.h * task.attempt, 'time' ) }
errorStrategy = { task.exitStatus in [143,137,104,134,139,250] ? 'retry' : 'finish' }
errorStrategy = { task.exitStatus in ((130..145) + 104 + 250) ? 'retry' : 'finish' }
}
//SPAdes returns error(1) if it runs out of memory (and for other reasons as well...)!
//exponential increase of memory and time with attempts, keep number of threads to enable reproducibility
withName: SPADES {
cpus = { check_spades_cpus (10, task.attempt) }
memory = { check_max (64.GB * (2**(task.attempt-1)), 'memory' ) }
time = { check_max (24.h * (2**(task.attempt-1)), 'time' ) }
errorStrategy = { task.exitStatus in [143,137,21,1] ? 'retry' : 'finish' }
errorStrategy = { task.exitStatus in ((130..145) + 104 + 21 + 12 + 1) ? 'retry' : 'finish' }
maxRetries = 5
}
withName: SPADESHYBRID {
cpus = { check_spadeshybrid_cpus (10, task.attempt) }
memory = { check_max (64.GB * (2**(task.attempt-1)), 'memory' ) }
time = { check_max (24.h * (2**(task.attempt-1)), 'time' ) }
errorStrategy = { task.exitStatus in [143,137,21,1] ? 'retry' : 'finish' }
errorStrategy = { task.exitStatus in ((130..145) + 104 + 21 + 12 + 1) ? 'retry' : 'finish' }
maxRetries = 5
}
//returns exit code 247 when running out of memory
withName: BOWTIE2_ASSEMBLY_ALIGN {
cpus = { check_max (2 * task.attempt, 'cpus' ) }
memory = { check_max (8.GB * task.attempt, 'memory' ) }
time = { check_max (8.h * task.attempt, 'time' ) }
errorStrategy = { task.exitStatus in [143,137,104,134,139,247] ? 'retry' : 'finish' }
errorStrategy = { task.exitStatus in ((130..145) + 104 + 247) ? 'retry' : 'finish' }
}
withName: METABAT2_METABAT2 {
cpus = { check_max (8 * task.attempt, 'cpus' ) }
Expand All @@ -168,6 +168,6 @@ process {

withName: DASTOOL_DASTOOL {
// if SCGs not found, bins cannot be assigned and DAS_tool will die with exit status 1
errorStrategy = { task.exitStatus in [143,137,104,134,139] ? 'retry' : task.exitStatus == 1 ? 'ignore' : 'finish' }
errorStrategy = { task.exitStatus in ((130..145) + 104) ? 'retry' : task.exitStatus == 1 ? 'ignore' : 'finish' }
}
}
Loading
Loading