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 - v1.1.0 - British Beans on Toast #268

Merged
merged 107 commits into from
Apr 27, 2023
Merged
Changes from 1 commit
Commits
Show all changes
107 commits
Select commit Hold shift + click to select a range
1de7055
Post release version bump [skip ci]
jasmezz Feb 27, 2023
2ca1444
Merge pull request #232 from nf-core/post-release
jasmezz Feb 27, 2023
470ec8a
New Bakta db type + switch off unnecessary flags
jasmezz Mar 1, 2023
e0ff6f2
Update bakta
jasmezz Mar 3, 2023
b9dd77e
Update light database flag
jasmezz Mar 3, 2023
1c96469
Update changelog
jasmezz Mar 3, 2023
f567267
Update changelog
jasmezz Mar 3, 2023
9b4148f
Fix PR number in Changelog
jasmezz Mar 3, 2023
8eeb180
Reactivate DeepARG database downloading and tests as server is back up
jfy133 Mar 8, 2023
df33ef2
Update CHANGELOG
jfy133 Mar 8, 2023
4b58737
Add dedicated AMP database downloading module
jfy133 Mar 8, 2023
9caa017
update CHANGELOG
jfy133 Mar 8, 2023
fae2e83
Heart of darkness
jfy133 Mar 8, 2023
ff783fc
Merge pull request #237 from nf-core/reactivate-deeparg
jfy133 Mar 8, 2023
479708f
Apply suggestions from code review
jasmezz Mar 8, 2023
fc51f69
Apply suggestions from code review
jfy133 Mar 8, 2023
9f05ac4
Merge branch 'dev' into bakta-update
jasmezz Mar 8, 2023
7b32bd6
fix macrel faa input
Darcy220606 Mar 8, 2023
b965e86
added the changes to changelog.md
Darcy220606 Mar 8, 2023
2fdec25
compress ampcombi_complete_summary.csv
louperelo Mar 9, 2023
4233056
update changelog.md and output.md
louperelo Mar 9, 2023
d7bf348
clean up code
louperelo Mar 9, 2023
1afdcf1
Merge branch 'dev' into zip_ampcombi
louperelo Mar 9, 2023
fadd013
fix linting error
louperelo Mar 9, 2023
d667ebb
Merge branch 'zip_ampcombi' of https://github.com/louperelo/funcscan …
louperelo Mar 9, 2023
8995705
fix method_description_template.yml
louperelo Mar 9, 2023
41ce8f3
Apply suggestions from code review
jasmezz Mar 10, 2023
3bebde1
[automated] Fix linting with Prettier
nf-core-bot Mar 10, 2023
86c11b0
Suggestion from PR review [skip ci]
jasmezz Mar 10, 2023
b7fb255
Merge pull request #235 from nf-core/bakta-update
jasmezz Mar 10, 2023
b331ccd
Merge branch 'dev' into ampcombi-dl-local
louperelo Mar 16, 2023
c2c0237
Merge pull request #240 from nf-core/ampcombi-dl-local
louperelo Mar 16, 2023
8ad1cda
Merge branch 'dev' into fix_macrel_faa
jfy133 Mar 17, 2023
225d501
Merge pull request #243 from louperelo/zip_ampcombi
louperelo Mar 20, 2023
cab24bd
Update workflow files
jasmezz Mar 27, 2023
d524831
Update changelog
jasmezz Mar 27, 2023
063db6f
Need some commit to re-start GHA
jasmezz Mar 27, 2023
48bb940
Add bakta to CI tests
jasmezz Mar 27, 2023
30c0f7c
Update changelog
jasmezz Mar 27, 2023
5573fca
Merge pull request #248 from nf-core/fix-error-messages
jasmezz Mar 28, 2023
ec137ee
Add Pyrodigal + docs + update other modules
jasmezz Mar 28, 2023
69b34b5
Update changelog
jasmezz Mar 28, 2023
598f7ff
Updating schema, modules.config, docs + CI tests
jasmezz Mar 29, 2023
c8ca2b7
Merge branch 'nf-core:master' into fix_macrel_faa
Darcy220606 Mar 29, 2023
5c7c489
Updating citations
jasmezz Mar 29, 2023
55240a5
Merge branch 'dev' into fix_macrel_faa
Darcy220606 Mar 29, 2023
7448a4a
Apply suggestions from code review
jasmezz Mar 29, 2023
d354927
option to save json
Darcy220606 Mar 29, 2023
b156ac8
Update prodigal + workflow
jasmezz Mar 29, 2023
e575b05
Update changelog
jasmezz Mar 29, 2023
5457020
Need another commit to trigger CI tests
jasmezz Mar 29, 2023
b409f39
Fix PR number in changelog
jasmezz Mar 29, 2023
32cf7ea
Merge pull request #249 from nf-core/bakta-ci
jasmezz Mar 29, 2023
fac328d
Merge branch 'dev' into pyrodigal
jasmezz Apr 3, 2023
4b5f36d
Merge pull request #251 from nf-core/pyrodigal
jasmezz Apr 3, 2023
39edecc
Commit suggestions from code review [skip ci]
jasmezz Apr 3, 2023
9e7166d
Merge branch 'dev' into prodigal-update
jasmezz Apr 3, 2023
66b9a11
Merge pull request #253 from nf-core/prodigal-update
jasmezz Apr 3, 2023
75b32b8
Bump macrel version to 1.2.0
Darcy220606 Apr 5, 2023
749dac6
harshels alignments in amp.nf :)
Darcy220606 Apr 5, 2023
c51412b
update changelog and output.md
Darcy220606 Apr 13, 2023
1bca438
Update nextflow_schema.json
Darcy220606 Apr 13, 2023
6bed019
Merge branch 'dev' into rgi_json_save
Darcy220606 Apr 13, 2023
23197b3
Update changelog with macrel version
Darcy220606 Apr 13, 2023
6b34f55
Update CHANGELOG.md
Darcy220606 Apr 13, 2023
3b21dab
Merge branch 'nf-core:master' into rgi_json_save
Darcy220606 Apr 14, 2023
7d1b977
Add reviewer suggestions
Darcy220606 Apr 14, 2023
6c6ab7d
Merge pull request #242 from Darcy220606/fix_macrel_faa
Darcy220606 Apr 14, 2023
91c9f8c
Merge pull request #252 from Darcy220606/rgi_json_save
Darcy220606 Apr 14, 2023
23b8afe
Added function to scan whole antiSMASH directory
jasmezz Apr 17, 2023
0e08545
Merge branch 'dev' into combgc_new_input_param
jasmezz Apr 17, 2023
399dd3f
Update changelog
jasmezz Apr 17, 2023
d369b71
Fix bug causing crash with non-antismash input
jasmezz Apr 18, 2023
b7ae84e
Tweak default resources based on feedback from @alexhbnr and @Darcy22…
jfy133 Apr 20, 2023
31c448d
UYpdate CHANGELOG
jfy133 Apr 20, 2023
4409049
Update CHANGELOG.md
jfy133 Apr 20, 2023
f5d9955
Update conf/base.config
jfy133 Apr 20, 2023
859ef8e
Update conf/base.config
jfy133 Apr 20, 2023
e128692
Update CHANGELOG.md
jfy133 Apr 20, 2023
9f17de2
Harshil align™️
jfy133 Apr 20, 2023
cddbf59
Merge branch 'resource-optimisations-2' of github.com:nf-core/funcsca…
jfy133 Apr 20, 2023
f2748a8
Apply suggestions from code review [skip ci]
jasmezz Apr 20, 2023
b088681
Merge branch 'combgc_new_input_param' of github.com:nf-core/funcscan …
jasmezz Apr 20, 2023
ef19045
Merge pull request #259 from nf-core/resource-optimisations-2
jfy133 Apr 20, 2023
ae9a8fe
Fix linting [skip ci]
jasmezz Apr 21, 2023
bc76195
Merge pull request #258 from nf-core/combgc_new_input_param
jasmezz Apr 21, 2023
f6b2e37
Revert "ComBGC: Add functionality to screen whole sample directory (a…
jasmezz Apr 21, 2023
c955fac
Merge pull request #261 from nf-core/revert-258-combgc_new_input_param
jasmezz Apr 21, 2023
9986687
Fix linting [skip ci]
jasmezz Apr 21, 2023
e381fbe
Merge branch 'dev' into combgc_new_input_param
jasmezz Apr 21, 2023
a94a363
Update changelog [skip ci]
jasmezz Apr 21, 2023
a0021ee
Merge pull request #262 from nf-core/combgc_new_input_param
jasmezz Apr 21, 2023
98185bb
Deactivate amplify in full test config
jasmezz Apr 25, 2023
5a9cb8b
Update changelog
jasmezz Apr 25, 2023
7b018f0
Merge pull request #263 from nf-core/fulltest-skip-amplify
jasmezz Apr 25, 2023
7da350c
Release version bump + fix tiny process name issue
jasmezz Apr 26, 2023
66bc7e4
Update changelog
jasmezz Apr 26, 2023
7b17f18
Add Pyrodigal to README.md
jasmezz Apr 26, 2023
2612d58
Merge branch 'dev' into release-version-bump
jasmezz Apr 26, 2023
9991bf7
Fixes Icon font issue, updates workflow to include Pyrodigal, updates…
jfy133 Apr 26, 2023
68e5edf
text to path
jfy133 Apr 26, 2023
cefbc28
Whoopsie wrong DPI
jfy133 Apr 26, 2023
11bb42a
Merge pull request #267 from nf-core/graphics-updates
jfy133 Apr 26, 2023
6d4100c
Merge branch 'dev' into release-version-bump
jasmezz Apr 26, 2023
c20cffc
Merge pull request #266 from nf-core/release-version-bump
jasmezz Apr 26, 2023
5650e19
Apply suggestions from code review
jasmezz Apr 27, 2023
af57abe
Fix linting
jasmezz Apr 27, 2023
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
Prev Previous commit
Next Next commit
Apply suggestions from code review
Co-authored-by: Kevin L. Keys <[email protected]>
Co-authored-by: Daniel Lundin <[email protected]>
3 people authored Apr 27, 2023
commit 5650e1969955d2912b7928e8eafbb74f525b7688
2 changes: 1 addition & 1 deletion bin/ampcombi_download.py
Original file line number Diff line number Diff line change
@@ -68,7 +68,7 @@ def download_DRAMP(db):
"T",
"V",
"W",
",Y",
"Y"
]
new = "".join(i for i in sequence if i in letters)
f.write(">" + id + "\n" + new + "\n")
2 changes: 1 addition & 1 deletion docs/output.md
Original file line number Diff line number Diff line change
@@ -130,7 +130,7 @@ Output Summaries:
</details>

[Pyrodigal](https://github.com/althonos/pyrodigal) annotates whole (meta-)genomes by identifying ORFs in a set of genomic DNA sequences. It produces the same results as [Prodigal](#prodigal) while being more resource-optimized, thus faster. Other than Prodigal, Pyrodigal cannot produce output in GenBank format. The output is used by some of the functional screening tools.
[Pyrodigal](https://github.com/althonos/pyrodigal) annotates whole (meta-)genomes by identifying ORFs in a set of genomic DNA sequences. It produces the same results as [Prodigal](#prodigal) while being more resource-optimized, thus faster. Unlike Prodigal, Pyrodigal cannot produce output in GenBank format. The output is used by some of the functional screening tools.

#### Prokka

4 changes: 2 additions & 2 deletions docs/usage.md
Original file line number Diff line number Diff line change
@@ -82,7 +82,7 @@ To prevent entire pipeline failures due to a single 'bad sample', nf-core/funcsc
When the annotation is run with Prokka, the resulting `.gbk` file passed to antiSMASH may produce the error `translation longer than location allows` and end the pipeline run. This Prokka bug has been reported before (see [discussion on GitHub](https://github.com/antismash/antismash/discussions/450)) and is not likely to be fixed soon.

> ⚠️ If antiSMASH is run for BGC detection, we recommend to **not** run Prokka for annotation but instead use the default annotation tool (Pyrodigal) or switch to Prodigal, or Bakta (the latter to bacteria only!).
> ⚠️ If antiSMASH is run for BGC detection, we recommend to **not** run Prokka for annotation but instead use the default annotation tool (Pyrodigal) or switch to Prodigal, or (for bacteria only!) Bakta.
## Databases and reference files

@@ -100,7 +100,7 @@ As a reference, we will describe below where and how you can obtain databases an

nf-core/funcscan offers multiple tools for annotating input sequences. Bakta is a new tool touted as a bacteria-only successor to the well-established Prokka.

To supply the preferred Bakta database (and not have the pipeline download at every new run), use the flag `--annotation_bakta_db_localpath`. The full or light Bakta database must be downloaded from the Bakta Zenodo archive, the link of which can be found on the [Bakta GitHub repository](https://github.com/oschwengers/bakta#database-download).
To supply the preferred Bakta database (and not have the pipeline download it for every new run), use the flag `--annotation_bakta_db_localpath`. The full or light Bakta database must be downloaded from the Bakta Zenodo archive, the link of which can be found on the [Bakta GitHub repository](https://github.com/oschwengers/bakta#database-download).

Once downloaded this must be untarred:

6 changes: 3 additions & 3 deletions nextflow.config
Original file line number Diff line number Diff line change
@@ -27,9 +27,9 @@ params {
annotation_prodigal_forcenonsd = false

annotation_pyrodigal_singlemode = false
annotation_pyrodigal_closed = false
annotation_pyrodigal_transtable = 11
annotation_pyrodigal_forcenonsd = false
annotation_pyrodigal_closed = false
annotation_pyrodigal_transtable = 11
annotation_pyrodigal_forcenonsd = false

annotation_bakta_db_localpath = null
annotation_bakta_db_downloadtype = 'full'