Skip to content

Commit 16a47fc

Browse files
authored
Merge pull request #117 from fmalmeida/116-integron_finder_2gff-terminated-with-an-error
Fix issues #116
2 parents 9fe20e5 + 1a434c7 commit 16a47fc

4 files changed

Lines changed: 13 additions & 9 deletions

File tree

.zenodo.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"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>",
33
"license": "other-open",
44
"title": "fmalmeida/bacannot: A generic but comprehensive bacterial annotation pipeline",
5-
"version": "v3.3",
5+
"version": "v3.3.2",
66
"upload_type": "software",
77
"creators": [
88
{

markdown/CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
The tracking for changes started in v2.1
44

5+
## v3.3.2 [09-February-2024]
6+
7+
* [[#116](https://github.com/fmalmeida/bacannot/issues/116)] -- Small update to avoid having `integron_finder` gbks with start position as 0, since it breaks conversion to gff.
8+
59
## v3.3.1 [29-October-2023]
610

711
* [[#111](https://github.com/fmalmeida/bacannot/issues/111)] -- Updated `falmeida-py` package version to fix problem with missing key for Summary.

modules/MGEs/integron_finder_2gff.nf

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ process INTEGRON_FINDER_2GFF {
1212
script:
1313
def args = task.ext.args ?: ''
1414
"""
15+
# fix 0-based sequences
16+
sed -e 's/ 0\\.\\./ 1\\.\\./g' -e 's/complement(0\\.\\./complement(1\\.\\./g' $gbk > fixed.gbk
17+
1518
# convert to gff if available
16-
touch ${prefix}_integrons.gff ;
17-
for gbk in \$(ls *.gbk) ; do
18-
conda run -n perl bp_genbank2gff3 \$gbk -o - | \
19-
grep 'integron_id' | \
20-
sed 's|ID=.*integron_id=|ID=|g' | \
21-
sed 's/GenBank/Integron_Finder/g' >> ${prefix}_integrons.gff
22-
done
19+
conda run -n perl bp_genbank2gff3 fixed.gbk -o - | \\
20+
grep 'integron_id' | \\
21+
sed 's|ID=.*integron_id=|ID=|g' | \\
22+
sed 's/GenBank/Integron_Finder/g' >> ${prefix}_integrons.gff
2323
"""
2424
}

nextflow.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ manifest {
108108
homePage = "https://github.com/fmalmeida/bacannot"
109109
mainScript = "main.nf"
110110
nextflowVersion = "!>=22.10.1"
111-
version = '3.3'
111+
version = '3.3.2'
112112
}
113113

114114
// Function to ensure that resource requirements don't go beyond

0 commit comments

Comments
 (0)