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

Fix pyrodigal channels, update ampcombi docs #300

Merged
merged 3 commits into from
Aug 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- [#296](https://github.com/nf-core/funcscan/pull/296) Fixed empty output when saving prodigal annotations. (reported by @louperelo, fix by @jasmezz)
- [#297](https://github.com/nf-core/funcscan/pull/297) Added check for empty annotation files prior going into screening. (❤️ to @alexhbnr for requesting, added by @jfy133)
- [#299](https://github.com/nf-core/funcscan/pull/299) Fixed pigz error with symlinks in Pyrodigal. (by @jasmezz)
- [#300](https://github.com/nf-core/funcscan/pull/300) Fixed wrong Pyrodigal channels being submitted to antiSMASH. (reported by Till Bayer, fix by @jasmezz)

### `Dependencies`

Expand Down
4 changes: 2 additions & 2 deletions nextflow_schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -522,8 +522,8 @@
"properties": {
"amp_ampcombi_db": {
"type": "string",
"description": "Path to AMPcombi reference database directory.",
"help_text": "Path to the folder containing the reference database files:\n1. a fasta file with a `.fasta` file extension\n2. the corresponding table with with functional and taxonomic classifications in `.tsv` file extension.\n\nFor more information check AMPcombi [documentation](https://github.com/Darcy220606/AMPcombi).",
"description": "Path to AMPcombi reference database directory (DRAMP).",
"help_text": "AMPcombi uses the 'general AMPs' dataset of the (DRAMP database)[http://dramp.cpu-bioinfor.org/downloads/] for taxonomic classification. If you have a local version of it, you can provide the path to the folder containing the reference database files:\n1. a fasta file with a `.fasta` file extension\n2. the corresponding table with with functional and taxonomic classifications in `.tsv` file extension.\n\nFor more information check AMPcombi [documentation](https://github.com/Darcy220606/AMPcombi).",
"default": "None",
"fa_icon": "fas fa-address-book"
},
Expand Down
4 changes: 2 additions & 2 deletions workflows/funcscan.nf
Original file line number Diff line number Diff line change
Expand Up @@ -195,8 +195,8 @@ workflow FUNCSCAN {
GUNZIP_PYRODIGAL_GFF ( PYRODIGAL.out.gff )
ch_versions = ch_versions.mix(PYRODIGAL.out.versions)
ch_annotation_faa = GUNZIP_PYRODIGAL_FAA.out.gunzip
ch_annotation_fna = GUNZIP_PYRODIGAL_FAA.out.gunzip
ch_annotation_gff = GUNZIP_PYRODIGAL_FAA.out.gunzip
ch_annotation_fna = GUNZIP_PYRODIGAL_FNA.out.gunzip
ch_annotation_gff = GUNZIP_PYRODIGAL_GFF.out.gunzip
ch_annotation_gbk = Channel.empty() // Pyrodigal doesn't produce GBK
} else if ( params.annotation_tool == "prokka" ) {
PROKKA ( ch_prepped_input, [], [] )
Expand Down