# HG changeset patch
# User iuc
# Date 1727963234 0
# Node ID 65b382bf9b7c534590ce7a93fefbad897687ccf9
# Parent  385a965c6f874746c3e2da8ae8e2b3f5027b0ed6
planemo upload for repository https://github.com/galaxyproject/tools-iuc/tree/master/tools/khmer commit 238d0992c63de53623c4fc05eec8bd8d67001997

diff -r 385a965c6f87 -r 65b382bf9b7c abundance-dist-single.xml
--- a/abundance-dist-single.xml	Mon Jun 17 11:47:33 2024 +0000
+++ b/abundance-dist-single.xml	Thu Oct 03 13:47:14 2024 +0000
@@ -2,11 +2,11 @@
     <description>
         Calculate abundance distribution of k-mers
     </description>
-    <expand macro="bio_tools"/>
     <macros>
         <token name="@BINARY@">abundance-dist-single.py</token>
         <import>macros.xml</import>
     </macros>
+    <expand macro="bio_tools"/>
     <expand macro="requirements" />
     <expand macro="stdio" />
     <expand macro="version" />
@@ -35,27 +35,27 @@
         <expand macro="tableinputs" />
     </inputs>
     <outputs>
-        <data name="optional_output_countgraph" format="oxlicg" label="${tool.name} on ${on_string} k-mer countgraph">
+        <data name="optional_output_countgraph" format="oxlicg" label="${tool.name} on ${on_string}: k-mer countgraph">
             <filter>save_countgraph == True</filter>
         </data>
         <expand macro="abundance-histogram-output" />
     </outputs>
     <tests>
-        <test>
+        <test expect_num_outputs="1">
             <param name="input_sequence_filename" value="test-abund-read-2.fa" />
             <param name="type" value="specific" />
             <param name="tablesize_specific" value="1e7" />
             <param name="n_tables" value="2" />
             <param name="ksize" value="17" />
             <param name="no_zero" value="false" />
-            <output name="output_histogram_filename" ftype="txt">
+            <output name="output_histogram_filename" ftype="csv">
                 <assert_contents>
                     <has_text text="1,96,96,0.98" />
                     <has_text text="1001,2,98,1.0" />
                 </assert_contents>
             </output>
         </test>
-        <test>
+        <test expect_num_outputs="2">
             <param name="input_sequence_filename" value="test-abund-read-2.fq.gz" />
             <param name="type" value="specific" />
             <param name="tablesize_specific" value="1e7" />
@@ -63,12 +63,18 @@
             <param name="ksize" value="17" />
             <param name="no_zero" value="false" />
             <param name="bigcount" value="false" />
-            <output name="output_histogram_filename" ftype="txt">
+            <param name="save_countgraph" value="true"/>
+            <output name="output_histogram_filename" ftype="csv">
                 <assert_contents>
                     <has_text text="1,96,96,0.98" />
                     <has_text text="255,2,98,1.0" />
                 </assert_contents>
             </output>
+            <output name="optional_output_countgraph">
+                <assert_contents>
+                    <has_size size="1k"/>
+                </assert_contents>
+            </output>
         </test>
 
     </tests>
@@ -80,6 +86,7 @@
 `-b` will be about 1.15x the product of the `-x` and
 `-N` numbers.
 
+@ABUNDANCE_HISTOGRAM_OUTPUT_HELP@
 
 @HELP_FOOTER@
 ]]>
diff -r 385a965c6f87 -r 65b382bf9b7c macros.xml
--- a/macros.xml	Mon Jun 17 11:47:33 2024 +0000
+++ b/macros.xml	Thu Oct 03 13:47:14 2024 +0000
@@ -1,6 +1,6 @@
 <macros>
     <token name="@TOOL_VERSION@">3.0.0a3</token>
-    <token name="@VERSION_SUFFIX@">2</token>
+    <token name="@VERSION_SUFFIX@">3</token>
     <token name="@PROFILE@">20.01</token>
     <xml name="bio_tools">
         <xrefs>
@@ -34,7 +34,7 @@
 #end if
 ]]>
     </token>
-    <token name="@THREADS@">--threads \${GALAXY_SLOTS:-4}</token>
+    <token name="@THREADS@">--threads "\${GALAXY_SLOTS:-4}"</token>
     <xml name="tableinputs">
         <conditional name="parameters">
             <param name="type" type="select" label="Advanced Parameters"
@@ -43,7 +43,7 @@
                 <option value="specific">Show</option>
             </param>
             <when value="simple">
-                <param argument="" name="tablesize" type="select" label="Sample Type" display="radio">
+                <param argument="--max-tablesize" name="tablesize" type="select" label="Sample Type" display="radio">
                     <option value="1e9" selected="true">Microbial Genome</option>
                     <option value="2e9">Animal Transcriptome</option>
                     <option value="4e9">Small Animal Genome or Low-Diversity Metagenome</option>
@@ -51,8 +51,8 @@
                 </param>
             </when>
             <when value="specific">
-                <param argument="--ksize" name="ksize" type="integer" value="20" label="k-mer size" help="k-mer size to use" />
-                <param argument="--n_tables" name="n_tables" type="integer" min="1" value="4" label="n_tables" help="number of tables to use" />
+                <param argument="--ksize" type="integer" value="20" label="k-mer size" help="k-mer size to use" />
+                <param argument="--n_tables" type="integer" min="1" value="4" label="n_tables" help="number of tables to use" />
                 <param argument="--max-tablesize" name="tablesize_specific" type="text" value="1000000.0"
                     label="tablesize" help="(--max-tablesize) upper bound on the tablesize to use" />
             </when>
@@ -90,11 +90,13 @@
             help="The abundances of the k-mers in the input nucleotide sequence file will be calculated using the kmer counts in this k-mer countgraph." />
     </xml>
     <xml name="abundance-histogram-output">
-        <data name="output_histogram_filename" format="txt"
-            label="${tool.name} on ${on_string}: k-mer abundance histogram. The
-                columns are: (1) k-mer abundance, (2) k-mer count, (3)
-                cumulative count, (4) fraction of total distinct k-mers." />
+        <data name="output_histogram_filename" format="csv"
+            label="${tool.name} on ${on_string}: k-mer abundance histogram" />
     </xml>
+    <token name="@ABUNDANCE_HISTOGRAM_OUTPUT_HELP@"><![CDATA[
+ The columns  of the k-mer abundance histogram are: (1) k-mer abundance, (2) k-mer count, (3) cumulative count, (4) fraction of total distinct k-mers.
+]]></token>
+
     <xml name="output_sequences" token_extension="">
         <collection name="sequences" type="list">
             <discover_datasets pattern="(?P&lt;name&gt;.*)\.(?P&lt;ext&gt;fast[aq](\.gz)?)\.@EXTENSION@" directory="output" />