--- a/dram_annotate.xml	Fri Feb 09 21:36:50 2024 +0000
+++ b/dram_annotate.xml	Fri Aug 23 08:17:55 2024 +0000
@@ -1,10 +1,11 @@
-<tool id="dram_annotate" name="DRAM annotate" version="@TOOL_VERSION@+galaxy1" profile="@PROFILE@">
+<tool id="dram_annotate" name="DRAM annotate" version="@TOOL_VERSION@+galaxy0" profile="@PROFILE@">
     <description>metagenome-assembled-genomes (MAGs)</description>
     <macros>
         <import>macros.xml</import>
     </macros>
     <expand macro="bio_tools"/>
-    <expand macro="requirements"/>
+    <expand macro="requirements">
+    </expand>   
     <expand macro="stdio"/>
     <command detect_errors="exit_code"><![CDATA[
 #import os
@@ -13,6 +14,13 @@
 #set input_fasta_file_name = $os.path.splitext($os.path.basename(str($input_fasta)))[0]
 #set output_gbk_file_name = $input_fasta_file_name + '.gbk'
 
+#if str($custom_hmm_dbs_cond.custom_dbs_hmm) == 'yes':
+    #for count, additional_db in enumerate($custom_hmm_dbs_cond.custom_hmm_dbs):
+        ln -s '$additional_db.custom_hmm_loc' ${count}.hmm &&
+    #end for
+#end if
+
+
 DRAM.py annotate
 --input_fasta '$input_fasta'
 --output_dir 'output_dir'
@@ -29,9 +37,9 @@
     #end for
 #end if
 #if str($custom_hmm_dbs_cond.custom_dbs_hmm) == 'yes':
-    #for additional_db in $custom_hmm_dbs_cond.custom_hmm_dbs:
+    #for count, additional_db in enumerate($custom_hmm_dbs_cond.custom_hmm_dbs):
         --custom_hmm_name '$additional_db.custom_hmm_name'
-        --custom_hmm_loc '$additional_db.custom_hmm_loc'
+        --custom_hmm_loc ${count}.hmm
         #if $additional_db.custom_hmm_cutoffs_loc:
             --custom_hmm_cutoffs_loc '$additional_db.custom_hmm_cutoffs_loc'
         #end if
@@ -53,15 +61,15 @@
     ]]></command>
     <inputs>
         <param argument="--input_fasta" type="data" format="fasta,fasta.gz" label="FASTA file"/>
-        <param argument="--min_contig_size" type="integer" value="2500" min="0" label="Minimum contig size to be used for gene prediction"/>
-        <param argument="--prodigal_mode" type="select" label="Select mode of prodigal to use for gene calling" help="Single mode requires genomes which are high quality with low contamination and long contigs (average length >3 Kbp)">
+        <param argument="--min_contig_size" type="integer" min="0" value="2500" label="Minimum contig size to be used for gene prediction"/>
+        <param argument="--prodigal_mode" type="select" label="Select mode of prodigal to use for gene calling" help="Single mode requires genomes which are high quality with low contamination and long contigs (average length &gt;3 Kbp)">
             <option value="single" selected="true">single</option>
             <option value="meta">meta</option>
             <option value="train">train</option>
         </param>
-        <param argument="--trans_table" type="integer" value="11" min="1" max="25" label="Translation table for prodigal to use for gene calling"/>
-        <param argument="--bit_score_threshold" type="integer" value="60" min="1" label="Minimum bitScore of search to retain hits"/>
-        <param argument="--rbh_bit_score_threshold" type="integer" value="350" min="1" label="Minimum bitScore of reverse best hits to retain hits"/>
+        <param argument="--trans_table" type="integer" min="1" max="25" value="11" label="Translation table for prodigal to use for gene calling"/>
+        <param argument="--bit_score_threshold" type="integer" min="1" value="60" label="Minimum bitScore of search to retain hits"/>
+        <param argument="--rbh_bit_score_threshold" type="integer" min="1" value="350" label="Minimum bitScore of reverse best hits to retain hits"/>
         <param argument="--kofam_use_dbcan2_thresholds" type="boolean" truevalue="--kofam_use_dbcan2_thresholds" falsevalue="" checked="false" label="Use dbcan2 suggested HMM cutoffs for KOfam annotation instead of KOfam recommended cutoffs?"/>
         <conditional name="custom_fasta_dbs_cond">
             <param name="custom_dbs_fasta" type="select" label="Specify additional fasta files against which to annotate?">
@@ -156,8 +164,7 @@
                 </assert_contents>
             </output>
         </test>
-        <!-- These settings require a db which doesn't exist in the test environment -->
-        <test expect_failure="true">
+        <test>
             <param name="input_fasta" value="input_annotate1.fasta.gz" ftype="fasta.gz"/>
             <param name="custom_dbs_fasta" value="yes"/>
             <repeat name="custom_fasta_dbs">
@@ -170,9 +177,19 @@
                 <param name="custom_hmm_loc" value="annotate_custom.hmm" ftype="hmm3"/>
             </repeat>
             <param name="prodigal_mode" value="meta"/>
-            <assert_stderr>
-                <has_text text="returned non-zero exit status"/>
-            </assert_stderr>
+            <output name="output_genbank">
+                <assert_contents>
+                    <has_text text="LOCUS"/>
+                    <has_text text="gc_cont"/>
+                </assert_contents>
+            </output>
+            <output name="output_annotations">
+                <assert_contents>
+                    <has_text text="fasta"/>
+                    <has_text text="gene_position"/>
+                    <has_n_columns n="9"/>
+                </assert_contents>
+            </output>
         </test>
     </tests>
     <help>

--- a/macros.xml	Fri Feb 09 21:36:50 2024 +0000
+++ b/macros.xml	Fri Aug 23 08:17:55 2024 +0000
@@ -1,5 +1,5 @@
 <macros>
-    <token name="@TOOL_VERSION@">1.3.5</token>
+    <token name="@TOOL_VERSION@">1.5.0</token>
     <!-- token name="@VERSION_SUFFIX@">0</token -->
     <token name="@PROFILE@">20.09</token>
     <xml name="bio_tools">
@@ -10,6 +10,7 @@
     <xml name="requirements">
         <requirements>
             <requirement type="package" version="@TOOL_VERSION@">dram</requirement>
+            <yield/>
         </requirements>
     </xml>
     <xml name="stdio">