Merge branch 'mentalist_v0.2' into master

WGS-TB · Mar 24, 2018 · 3140ca2 · 3140ca2
2 parents ebe974e + 66ffcb4
commit 3140ca2
Show file tree

Hide file tree

Showing 7 changed files with 35 additions and 17 deletions.
diff --git a/conda/meta.yaml b/conda/meta.yaml
@@ -1,13 +1,13 @@
 {% set name = "MentaLiST" %}
-{% set version = "0.2.1" %}
+{% set version = "0.2.2" %}
 
 package:
   name: {{ name|lower }}
   version: {{ version }}
 
 source:
   git_url: https://github.com/WGS-TB/MentaLiST.git
-  git_rev: v0.2.1
+  git_rev: v0.2.2
 
 build:
   skip: True  # [osx]

diff --git a/galaxy/data_managers/data_manager_conf.xml b/galaxy/data_managers/data_manager_conf.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <data_managers>
-  <data_manager tool_file="data_manager_mentalist_build_db/data_manager/mentalist_build_db.xml" id="mentalist_build_db" version="master">
+  <data_manager tool_file="data_manager_mentalist_build_db/data_manager/mentalist_build_db.xml" id="mentalist_build_db" version="0.2.2">
     <data_table name="mentalist_databases">
       <output>
         <column name="value" />
@@ -15,7 +15,7 @@
       </output>
     </data_table>
   </data_manager>
-  <data_manager tool_file="data_manager_mentalist_download_cgmlst/data_manager/mentalist_download_cgmlst.xml" id="mentalist_download_cgmlst" version="master">
+  <data_manager tool_file="data_manager_mentalist_download_cgmlst/data_manager/mentalist_download_cgmlst.xml" id="mentalist_download_cgmlst" version="0.2.2">
     <data_table name="mentalist_databases">
       <output>
         <column name="value" />
@@ -30,7 +30,7 @@
       </output>
     </data_table>
   </data_manager>
-  <data_manager tool_file="data_manager_mentalist_download_pubmlst/data_manager/mentalist_download_pubmlst.xml" id="mentalist_download_pubmlst" version="master">
+  <data_manager tool_file="data_manager_mentalist_download_pubmlst/data_manager/mentalist_download_pubmlst.xml" id="mentalist_download_pubmlst" version="0.2.2">
     <data_table name="mentalist_databases">
       <output>
         <column name="value" />
@@ -45,7 +45,7 @@
       </output>
     </data_table>
   </data_manager>
-  <data_manager tool_file="data_manager_mentalist_download_enterobase/data_manager/mentalist_download_enterobase.xml" id="mentalist_download_enterobase" version="master">
+  <data_manager tool_file="data_manager_mentalist_download_enterobase/data_manager/mentalist_download_enterobase.xml" id="mentalist_download_enterobase" version="0.2.2">
     <data_table name="mentalist_databases">
       <output>
         <column name="value" />

diff --git a/galaxy/data_managers/data_manager_mentalist_build_db/data_manager/mentalist_build_db.xml b/galaxy/data_managers/data_manager_mentalist_build_db/data_manager/mentalist_build_db.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<tool id="mentalist_build_db" name="MentaLiST Build DB" tool_type="manage_data" version="0.2.1">
+<tool id="mentalist_build_db" name="MentaLiST Build DB" tool_type="manage_data" version="0.2.2">
   <requirements>
-    <requirement type="package" version="0.2.1">mentalist</requirement>
+    <requirement type="package" version="0.2.2">mentalist</requirement>
   </requirements>
   <command detect_errors="exit_code">
   <![CDATA[

diff --git a/...anagers/data_manager_mentalist_download_cgmlst/data_manager/mentalist_download_cgmlst.xml b/...anagers/data_manager_mentalist_download_cgmlst/data_manager/mentalist_download_cgmlst.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<tool id="mentalist_download_cgmlst" name="MentaLiST Download from cgMLST" tool_type="manage_data" version="0.2.1">
+<tool id="mentalist_download_cgmlst" name="MentaLiST Download from cgMLST" tool_type="manage_data" version="0.2.2">
   <requirements>
-    <requirement type="package" version="0.2.1">mentalist</requirement>
+    <requirement type="package" version="0.2.2">mentalist</requirement>
   </requirements>
   <command detect_errors="exit_code">
     <![CDATA[

diff --git a/...data_manager_mentalist_download_enterobase/data_manager/mentalist_download_enterobase.xml b/...data_manager_mentalist_download_enterobase/data_manager/mentalist_download_enterobase.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<tool id="mentalist_download_enterobase" name="MentaLiST Download from Enterobase" tool_type="manage_data" version="0.2.1">
+<tool id="mentalist_download_enterobase" name="MentaLiST Download from Enterobase" tool_type="manage_data" version="0.2.2">
   <requirements>
-    <requirement type="package" version="0.2.1">mentalist</requirement>
+    <requirement type="package" version="0.2.2">mentalist</requirement>
   </requirements>
   <command detect_errors="exit_code">
     <![CDATA[

diff --git a/...agers/data_manager_mentalist_download_pubmlst/data_manager/mentalist_download_pubmlst.xml b/...agers/data_manager_mentalist_download_pubmlst/data_manager/mentalist_download_pubmlst.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
-<tool id="mentalist_download_pubmlst" name="MentaLiST Download from pubMLST" tool_type="manage_data" version="0.2.1">
+<tool id="mentalist_download_pubmlst" name="MentaLiST Download from pubMLST" tool_type="manage_data" version="0.2.2">
   <requirements>
-    <requirement type="package" version="0.2.1">mentalist</requirement>
+    <requirement type="package" version="0.2.2">mentalist</requirement>
   </requirements>
   <command detect_errors="exit_code">
     <![CDATA[

diff --git a/galaxy/tools/mentalist_call/mentalist_call.xml b/galaxy/tools/mentalist_call/mentalist_call.xml
@@ -1,6 +1,6 @@
-<tool id="mentalist_call" name="MentaLiST MLST Analysis" version="0.2.1">
+<tool id="mentalist_call" name="MentaLiST MLST Analysis" version="0.2.2">
   <requirements>
-    <requirement type="package" version="0.2.1">mentalist</requirement>
+    <requirement type="package" version="0.2.2">mentalist</requirement>
   </requirements>
   <edam_operations>
     <edam_operation>operation_3840</edam_operation>
@@ -10,6 +10,10 @@
     call
     -o '$output_file'
     --db '$kmer_db.fields.path'
+    --mutation_threshold '$mutation_threshold'
+    --kt '$kmer_threshold'
+    $output_votes
+    $output_special
     #if $input_type.sPaired == "paired":
        -s $input_type.pInput1.name $input_type.pInput1 $input_type.pInput2
     #elif $input_type.sPaired == "collections":
@@ -35,9 +39,23 @@
 	<validator type="no_options" message="No MentaLiST databases are available" />
       </options>
     </param>
+    <param name="mutation_threshold" type="integer" label="Mutation threshold"
+	   help="Maximum number of mutations when looking for novel alleles."
+	   value="6" min="1" max="25" />
+    <param name="kmer_threshold" type="integer" label="Kmer threshold"
+	   help="Minimum number of times a kmer is seen to be considered present in the sample."
+	   value="10" min="1" max="25" />
+    <parapm name="output_votes" type="boolean" label="Output votes"
+	    argument="--output_votes" truevalue="--output_votes" falsevalue=""
+	    help="Outputs the results for the original voting algorithm" />
+    <param name="output_special" type="boolean" label="Output special"
+	   argument="--output_special" truevalue="--output_special" falsevalue=""
+	   help="Outputs a fasta file with the alleles from special cases such as incomplete coverage, novel and multiple alleles." />
+
   </inputs>
   <outputs>
-    <data name="output_file" format="tabular"/>
+    <data name="output_file" format="tabular" />
+    <data name="coverage_file" format="tabular" />
   </outputs>
   <help><![CDATA[
   ]]></help>