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

Wrap up v3.3.3 #121

Merged
merged 55 commits into from
Mar 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
c5fdfbd
Add pre-formatted database (#82)
fmalmeida Feb 8, 2023
548147a
50 add tool integron finder 20 (#87)
fmalmeida Feb 28, 2023
6fff59a
85 prokka module can get after modules stuck if the header file longe…
fmalmeida Mar 3, 2023
36195ff
fix bakta stats parsing
fmalmeida Mar 3, 2023
c178c92
81 add tool mob suite (#90)
fmalmeida Mar 26, 2023
567b2bd
update singularity config
fmalmeida May 4, 2023
dedef45
fixed kofamscan download
fmalmeida May 5, 2023
c2556ee
fix dockerfile
fmalmeida May 6, 2023
a934e4b
Fix unicycler tag
fmalmeida May 6, 2023
8f0d9a5
Merge branch 'dev' of https://github.com/fmalmeida/bacannot into dev
fmalmeida May 6, 2023
460ceac
use only docker images to avoid timeout error
fmalmeida May 7, 2023
f527af2
use docker ocntainer to avoid singularity timeout
fmalmeida May 7, 2023
62e63c5
fixed resfinder for singularity
fmalmeida May 7, 2023
67f9942
fixed docker image
fmalmeida May 7, 2023
a726274
fix gff2sql in singularity
fmalmeida May 8, 2023
a9fa23e
use proper singularity images
fmalmeida May 9, 2023
c470d56
fix singularity image download
fmalmeida May 9, 2023
b0ab903
fixed docker image
fmalmeida May 9, 2023
4c33abf
Add option for prebuilt db download (#94)
fmalmeida May 18, 2023
5c126dc
69 tools to use own docker image (#91)
fmalmeida May 19, 2023
dd9c4f2
update unicycler version (0.5.0--py310h6cc9453_3)
fmalmeida Jul 20, 2023
1ed4a8e
96 error summary for bugfix release (#101)
fmalmeida Jul 26, 2023
9dc44c5
98 include ices and prophage annotation in json summary (#106)
fmalmeida Sep 18, 2023
78d0f4f
100 update pipeline docker images from docker tags to docker shasum (…
fmalmeida Sep 25, 2023
e36f991
107 duplicate reads to unique read names (#109)
fmalmeida Sep 26, 2023
04bb226
update changelog
fmalmeida Sep 26, 2023
520fd3f
Update docs for v3.3 (#110)
fmalmeida Oct 1, 2023
93a62ee
update citation information
fmalmeida Oct 1, 2023
ae51e18
add citation example
fmalmeida Oct 1, 2023
5db913d
Merge branch 'master' of https://github.com/fmalmeida/bacannot into dev
fmalmeida Oct 1, 2023
1c28330
Update CHANGELOG.md
fmalmeida Oct 1, 2023
529d414
111 error on summary step when missing annotationidtxt key (#112)
fmalmeida Oct 29, 2023
880e871
Merge branch 'master' of https://github.com/fmalmeida/bacannot into dev
fmalmeida Oct 29, 2023
ce413c6
Merge branch 'master' of https://github.com/fmalmeida/bacannot into dev
fmalmeida Feb 20, 2024
6975eac
update version
fmalmeida Feb 20, 2024
15f94a2
add new params
fmalmeida Feb 20, 2024
2670dd9
add documentation on new parameters
fmalmeida Feb 22, 2024
89c5cbe
fix typo
fmalmeida Feb 22, 2024
d04cd83
Merge pull request #119 from fmalmeida/118-add-skip-integron-finder-p…
fmalmeida Feb 22, 2024
d0741d6
fix code so that it also runs for singularity
fmalmeida Mar 6, 2024
3fbfc91
fixed installation problem for singularity
fmalmeida Mar 7, 2024
39c3d17
split antismash docker image and modify module to have custom snippet…
fmalmeida Mar 8, 2024
25ad59f
also remove the tar.gz
fmalmeida Mar 8, 2024
a91d4e8
fix misc image
fmalmeida Mar 8, 2024
b756408
update used docker images
fmalmeida Mar 8, 2024
b9b9b69
update docker image
fmalmeida Mar 8, 2024
a68d260
update module
fmalmeida Mar 8, 2024
19dd1fc
try again to use auto-tests
fmalmeida Mar 9, 2024
dd0c344
simplify types
fmalmeida Mar 9, 2024
126d37f
update changelog
fmalmeida Mar 9, 2024
696ab30
fix cli
fmalmeida Mar 9, 2024
80d34ab
it fails to publish, lets resume
fmalmeida Mar 9, 2024
74f5100
add better information on singularity variables
fmalmeida Mar 11, 2024
0cb1b00
fix paths of where versions are stored
fmalmeida Mar 11, 2024
2ff9e2d
update changelog with date
fmalmeida Mar 11, 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
45 changes: 0 additions & 45 deletions .github/workflows/build_kofamscan.yml

This file was deleted.

67 changes: 37 additions & 30 deletions .github/workflows/test_pr_docker.yml
Original file line number Diff line number Diff line change
@@ -1,39 +1,46 @@
name: Testing new PR with docker
on:
pull_request:
branches: master
types: [ ready_for_review, synchronize, reopened ]
branches: [master, dev]
types: [ opened, synchronize, reopened ]

jobs:
run_nextflow:
name: Run pipeline for the upcoming PR
runs-on: ubuntu-latest
env:
DOCKERHUB_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }}
DOCKERHUB_PASS: ${{ secrets.DOCKERHUB_PASS }}


steps:

- name: Check out pipeline code
uses: actions/checkout@v2

- name: Install Nextflow
env:
CAPSULE_LOG: none
run: |
wget -qO- get.nextflow.io | bash
sudo mv nextflow /usr/local/bin/

- name: Clean environment
run: |
sudo rm -rf /usr/local/lib/android # will release about 10 GB if you don't need Android
sudo rm -rf /usr/share/dotnet # will release about 20GB if you don't need .NET

- name: Build bacannot database
run: |
nextflow run main.nf -profile docker --get_dbs --output bacannot_dbs --max_cpus 2 --max_memory '6.GB' --max_time '6.h'
rm -rf bacannot_dbs/antismash_db bacannot_dbs/kofamscan_db bacannot_dbs/prokka_db/PGAP_NCBI.hmm # remove unused in quicktest to diminish size

- name: Run the pipeline
run: |
nextflow run main.nf -profile docker,quicktest --bacannot_db bacannot_dbs

- name: Check out pipeline code
uses: actions/checkout@v2

- name: Install Nextflow
env:
CAPSULE_LOG: none
run: |
wget -qO- get.nextflow.io | bash
sudo mv nextflow /usr/local/bin/

- name: Clean environment
run: |
sudo rm -rf /usr/local/lib/android # will release about 10 GB if you don't need Android
sudo rm -rf /usr/share/dotnet # will release about 20GB if you don't need .NET

- name: Get database
run: |
nextflow run main.nf -profile docker --get_zenodo_db --output ./ --max_memory '6.GB' --max_cpus 2
nextflow run main.nf -profile docker --get_zenodo_db --output ./ --max_memory '6.GB' --max_cpus 2 -resume
nextflow run main.nf -profile docker --get_zenodo_db --output ./ --max_memory '6.GB' --max_cpus 2 -resume
sudo rm -r work .nextflow*
yes | docker system prune

- name: Run quicktest profile
run: |
nextflow run main.nf -profile docker,quicktest --bacannot_db $( realpath ./bac* ) --output ./results --max_memory '6.GB' --max_cpus 2
sudo rm -r work .nextflow*
yes | docker system prune

- name: View results
run: |
sudo apt-get install -y tree
tree ./results
41 changes: 0 additions & 41 deletions .github/workflows/test_pr_singularity.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .zenodo.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"description": "<p>The pipeline</p>\n\n<p>bacannot, is a customisable, easy to use, pipeline that uses state-of-the-art software for comprehensively annotating prokaryotic genomes having only Docker and Nextflow as dependencies. It is able to annotate and detect virulence and resistance genes, plasmids, secondary metabolites, genomic islands, prophages, ICEs, KO, and more, while providing nice an beautiful interactive documents for results exploration.</p>",
"license": "other-open",
"title": "fmalmeida/bacannot: A generic but comprehensive bacterial annotation pipeline",
"version": "v3.3.2",
"version": "v3.3.3",
"upload_type": "software",
"creators": [
{
Expand Down
Loading