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

Adding option for using bakta #58

Merged
merged 34 commits into from
Sep 9, 2022
Merged

Adding option for using bakta #58

merged 34 commits into from
Sep 9, 2022

Conversation

fmalmeida
Copy link
Owner

This PR will host modifications required to add an option to run bakta instead of prokka for primary annotation if desired.

fmalmeida and others added 7 commits November 19, 2021 09:30
* adding checkIfExists rules to input loading

* Update build.sh

* fixed report if else statement

* updated version and changelog

* fix example samplesheet url

* Create nf-core-bacannot-compare_logo_dark.png

* Update phigaro.nf

* Update CHANGELOG.md

* Update CHANGELOG.md
@fmalmeida fmalmeida linked an issue Jul 6, 2022 that may be closed by this pull request
@fmalmeida fmalmeida added the enhancement New feature or request label Jul 6, 2022
@fmalmeida fmalmeida deleted the branch develop August 29, 2022 20:49
@fmalmeida fmalmeida closed this Aug 29, 2022
@fmalmeida fmalmeida reopened this Sep 2, 2022
@fmalmeida
Copy link
Owner Author

  • requires running at least two annotations to evaluate how final results look like, so changes can be merged

@fmalmeida fmalmeida marked this pull request as ready for review September 2, 2022 09:46
@fmalmeida
Copy link
Owner Author

All tests passed

@fmalmeida fmalmeida merged commit 847eb30 into develop Sep 9, 2022
@fmalmeida fmalmeida deleted the bakta branch September 9, 2022 14:56
fmalmeida added a commit that referenced this pull request Sep 9, 2022
* update hmmer to working version with PGAP

* update hmmer to working version with PGAP (#59) (#60)

* Adding option for using `bakta` (#58)

* first bakta addition test

* Fixing error when phigaro output was empty (#55) (#56)

* adding checkIfExists rules to input loading

* Update build.sh

* fixed report if else statement

* updated version and changelog

* fix example samplesheet url

* Create nf-core-bacannot-compare_logo_dark.png

* Update phigaro.nf

* Update CHANGELOG.md

* Update CHANGELOG.md

* Update .gitignore

* Update bacannot.nf

* workflow runs from top to bottom

* workflow correctly working

* changing version manifest

* explaining how to use bakta

* adding variables to generic annotation

* adding victors backup db

* report_general understands bakta

* report_resistance understands bakta

* update hmmer to working version with PGAP

* update hmmer to working version with PGAP (#59)

* update hmmer to working version with PGAP (#59) (#60)

* Update resfinder2gff.py

* Update addBedtoolsIntersect.R

* Update addBedtoolsIntersect.R

* Update addBedtoolsIntersect.R

* Update addBedtoolsIntersect.R

* Update docker.config

* download db if not available

* Update merge_annotations.nf

* Update merge_annotations.nf

* update process label

* Update merge_annotations.nf

* fix docker file ownerships

* added retry label for bakta

* update changelog
fmalmeida added a commit that referenced this pull request Dec 19, 2022
* update hmmer to working version with PGAP

* update hmmer to working version with PGAP (#59) (#60)

* Adding option for using `bakta` (#58)

* first bakta addition test

* Fixing error when phigaro output was empty (#55) (#56)

* adding checkIfExists rules to input loading

* Update build.sh

* fixed report if else statement

* updated version and changelog

* fix example samplesheet url

* Create nf-core-bacannot-compare_logo_dark.png

* Update phigaro.nf

* Update CHANGELOG.md

* Update CHANGELOG.md

* Update .gitignore

* Update bacannot.nf

* workflow runs from top to bottom

* workflow correctly working

* changing version manifest

* explaining how to use bakta

* adding variables to generic annotation

* adding victors backup db

* report_general understands bakta

* report_resistance understands bakta

* update hmmer to working version with PGAP

* update hmmer to working version with PGAP (#59)

* update hmmer to working version with PGAP (#59) (#60)

* Update resfinder2gff.py

* Update addBedtoolsIntersect.R

* Update addBedtoolsIntersect.R

* Update addBedtoolsIntersect.R

* Update addBedtoolsIntersect.R

* Update docker.config

* download db if not available

* Update merge_annotations.nf

* Update merge_annotations.nf

* update process label

* Update merge_annotations.nf

* fix docker file ownerships

* added retry label for bakta

* update changelog

* changing to new version

* add falmeida-py scripts to docker

* Create generate_dockers.sh

* Minor improvements for custom database annotation (#67)

* Add step making Blast DB when annotating custom db

Blast database throw error for no alias or index file found for
nucleotide database, when using blastn. Thus, make blast database
before execute blastn to custom database on genome.

* Remove space when generate link in Shiny markdown

Whitespace occurs when generated links for custom database report in
Shiny markdown. Specify seperate string to emtpy string to fix this.

* fix: script was calling an out of bounds value

* handle exceptions and missing values

* increment test profile

* also build for proteins

* Use correct version of customdb_gffs in REPORTS module

Co-authored-by: fmalmeida <[email protected]>

* fixed docker images

* resfinder now uses conda env

* rgi does not have --exclude_nudge anymore

* add circos conf files

* fix indentation

* add circos sub-workflow calling

* add circos tool

* added karyotype and gc_skew modules

* fix indentation

* modules now have a channel suitable for summary generation

* include summary generation module

* update docker image

* add aro index tsv

* add amrfinder2tsv module

* add bacannot json summary generation

* update docker images

* add new modules

* added binaries for circos plot

* update docker files

* add label to module

* finalise modules preparing data for circos

* include whole circos 'pathway' in workflow

* add circos module

* circos plot currently functional

* re-organised circos outputs

* ameliorate default version of circos plot

* fixed docker image

* fixed custom annotation problem in server

* added circos plot with easy_circos

* circos plot properly being generated

* update changelog

* update readme

* update documentation

* fix tool name

* fix dir

* update indentation

* fixed schema

* add pipefail

* fix docker image

Co-authored-by: Cy <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add bakta
1 participant