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

Migrate BUSCO to nf-core module #730

Open
wants to merge 29 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
f85d7b0
Migrate to nf-core BUSCO module (WIP)
dialvarezs Dec 12, 2024
25b72f1
Several busco-related fixes
dialvarezs Dec 12, 2024
db88a3c
More fixes
dialvarezs Dec 12, 2024
091a54a
Fixes in combine_tables script
dialvarezs Dec 12, 2024
4a22358
Add more cpus to busco, and fix comparison in combine_tables
dialvarezs Dec 12, 2024
bd22078
Exclude failed BUSCO bins from GTDB-Tk, update changelog
dialvarezs Dec 12, 2024
9512e95
Save busco downloaded db
dialvarezs Dec 12, 2024
9cc1d74
Remove 'BUSCO_SAVE_DOWNLOAD' from conf/modules
dialvarezs Dec 12, 2024
46d19b1
Merge remote-tracking branch 'upstream/dev' into dev-busco
dialvarezs Dec 15, 2024
edf4192
Merge cleanup and fixes
dialvarezs Dec 15, 2024
6f200ef
Define busco_lineage
dialvarezs Dec 15, 2024
9702a87
Updade nf-core busco module
dialvarezs Dec 15, 2024
abc1760
Remove unneded config
dialvarezs Dec 15, 2024
a44eb56
Fix busco channels and namespace in summary script
dialvarezs Dec 16, 2024
37dbeed
Merge remote-tracking branch 'origin/dev' into dev-busco
dialvarezs Jan 2, 2025
53dc7d3
Merge remote-tracking branch 'upstream/dev' into dev-busco
dialvarezs Jan 2, 2025
eed82db
Replace local combine_tsv module by nf-core csvtk/concat
dialvarezs Jan 2, 2025
299ff59
Fix changelog
dialvarezs Jan 2, 2025
89c7455
Update nf-core checkm2/databasedownload
dialvarezs Jan 2, 2025
c1d0552
Fix tiara
dialvarezs Jan 2, 2025
0b81462
Linting fixes
dialvarezs Jan 2, 2025
f93e007
Add ids to channel used by CONCAT_BINQC_TSV
dialvarezs Jan 2, 2025
07905a8
Update csvtk/concat module
dialvarezs Jan 8, 2025
1671aca
Fix gtdb usage of qc summary
dialvarezs Jan 8, 2025
3d4ba8b
Update tests to bacteria odb12
dialvarezs Jan 8, 2025
d60ae40
Last fixes to get gtdb and bin summary working
dialvarezs Jan 8, 2025
135e703
Fix comment
dialvarezs Jan 8, 2025
44306da
busco_clean deprecation cleanup
dialvarezs Jan 8, 2025
f71249b
Minor busco tweaks
dialvarezs Jan 8, 2025
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
11 changes: 10 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### `Added`

- [#730](https://github.com/nf-core/mag/pull/730) - Migrated from local BUSCO module to nf-core one (added by @dialvarezs)

### `Changed`

### `Fixed`

### `Dependencies`

### `Dependencies`
| Tool | Previous version | New version |
| ----- | ---------------- | ----------- |
| BUSCO | 5.4.3 | 5.8.2 |
| csvtk | | 0.31.0 |

### `Deprecated`

- [#730](https://github.com/nf-core/mag/pull/730) - Deprecated `--busco_clean` due to not being supported in the nf-core BUSCO module

## 3.3.0 [2024-12-19]

Expand Down
9 changes: 7 additions & 2 deletions bin/combine_tables.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import argparse
import sys
import warnings

import pandas as pd

Expand Down Expand Up @@ -110,10 +111,14 @@ def main(args=None):

if args.binqc_summary and args.binqc_tool == "busco":
busco_results = pd.read_csv(args.binqc_summary, sep="\t")
if not bins.equals(busco_results["GenomeBin"].sort_values().reset_index(drop=True)):
busco_bins = set(busco_results["Input_file"])

if set(bins) != busco_bins and len(busco_bins.intersection(set(bins))) > 0:
warnings.warn("Bins in BUSCO summary do not match bins in bin depths summary")
elif len(busco_bins.intersection(set(bins))) == 0:
sys.exit("Bins in BUSCO summary do not match bins in bin depths summary!")
results = pd.merge(
results, busco_results, left_on="bin", right_on="GenomeBin", how="outer"
results, busco_results, left_on="bin", right_on="Input_file", how="outer"
) # assuming depths for all bins are given

if args.binqc_summary and args.binqc_tool == "checkm":
Expand Down
166 changes: 0 additions & 166 deletions bin/run_busco.sh

This file was deleted.

Loading
Loading