# HG changeset patch
# User rdvelazquez
# Date 1559917281 14400
# Node ID 186972ed2a1506f5761a8472ded9f05b16a3ac76
# Parent  410942662a67c06a6f8fadb5a803ebc3646cc21f
planemo upload for repository https://github.com/galaxyproject/tools-iuc/tree/master/tools/hyphy/ commit 6c73b2e4c05bdddaef2026feb1073c1b0b4aa12e-dirty

diff -r 410942662a67 -r 186972ed2a15 hyphy_relax.xml
--- a/hyphy_relax.xml	Mon Feb 18 15:16:35 2019 -0500
+++ b/hyphy_relax.xml	Fri Jun 07 10:21:21 2019 -0400
@@ -1,40 +1,32 @@
 <?xml version="1.0"?>
-<tool id="hyphy_relax" name="HyPhy-RELAX" version="@VERSION@+galaxy0">
+<tool id="hyphy_relax" name="HyPhy-RELAX" version="2.5.0+galaxy0">
   <description>Detect relaxed selection in a codon-based
   phylogenetic framework</description>
   <macros>
     <import>macros.xml</import>
   </macros>
   <expand macro="requirements"/>
-  <expand macro="version_command"/>
   <command detect_errors="exit_code"><![CDATA[
-      #if $treeAnnotations == "2":
-        ln -s '$input_file' relax_input.fa &&
-        ln -s '$input_nhx' relax_input.nhx &&
-        echo $gencodeid > tool_params &&
-        echo `pwd`/relax_input.fa >> tool_params &&
-        echo `pwd`/relax_input.nhx >> tool_params &&
-        echo '3' >> tool_params &&
-        echo '2' >> tool_params &&
-        echo '$analysisType' >> tool_params &&
-        @HYPHY_INVOCATION@ \$HYPHY_LIB/TemplateBatchFiles/SelectionAnalyses/RELAX.bf > '$relax_log'
-      #else:
-        ln -s '$input_file' relax_input.fa &&
-        ln -s '$input_nhx' relax_input.nhx &&
-        echo $gencodeid > tool_params &&
-        echo `pwd`/relax_input.fa >> tool_params &&
-        echo `pwd`/relax_input.nhx >> tool_params &&
-        echo '2' >> tool_params &&
-        echo '$analysisType' >> tool_params &&
-        @HYPHY_INVOCATION@ \$HYPHY_LIB/TemplateBatchFiles/SelectionAnalyses/RELAX.bf > '$relax_log'
-      #end if
+      ln -s '$input_file' relax_input.fa &&
+      ln -s '$input_nhx' relax_input.nhx &&
+      @HYPHY_INVOCATION@ relax
+        --alignment `pwd`/relax_input.fa
+        --tree `pwd`/relax_input.nhx
+        --models '$analysisType'
+        #if $treeAnnotations == "2":
+          --test TEST
+          --reference REFERENCE
+        #else:
+          --test TEST
+        #end if
+        > '$relax_log'
     ]]></command>
   <inputs>
     <expand macro="inputs"/>
     <expand macro="gencode"/>
     <param name="analysisType" type="select" label="Analysis Type">
-      <option value="1">All</option>
-      <option value="2">Minimal</option>
+      <option value="All">All</option>
+      <option value="Minimal">Minimal</option>
     </param>
     <param name="treeAnnotations" type="select" label="Tree Annotations">
       <option value="1">TEST only</option>
diff -r 410942662a67 -r 186972ed2a15 macros.xml
--- a/macros.xml	Mon Feb 18 15:16:35 2019 -0500
+++ b/macros.xml	Fri Jun 07 10:21:21 2019 -0400
@@ -6,50 +6,43 @@
   </xml>
   <xml name="gencode">
     <param name="gencodeid" type="select" label="Genetic code">
-      <option value="1">Universal code</option>
-      <option value="2">Vertebrate mitochondrial DNA code</option>
-      <option value="3">Yeast mitochondrial DNA code</option>
-      <option value="4">Mold, Protozoan and Coelenterate mt; Mycloplasma/Spiroplasma</option>
-      <option value="5">Invertebrate mitochondrial DNA code</option>
-      <option value="6">Ciliate, Dasycladacean and Hexamita Nuclear code</option>
-      <option value="7">Echinoderm mitochondrial DNA code</option>
-      <option value="8">Euplotid Nuclear code</option>
-      <option value="9">Alternative Yeast Nuclear code</option>
-      <option value="10">Ascidian mitochondrial DNA code</option>
-      <option value="11">Flatworm mitochondrial DNA code</option>
-      <option value="12">Blepharisma Nuclear code</option>
+      <option value="Universal">Universal code</option>
+      <option value="Vertebrate-mtDNA">Vertebrate mitochondrial DNA code</option>
+      <option value="Yeast-mtDNA">Yeast mitochondrial DNA code</option>
+      <option value="Mold-Protozoan-mtDNA">Mold, Protozoan and Coelenterate mt; Mycloplasma/Spiroplasma</option>
+      <option value="Invertebrate-mtDNA">Invertebrate mitochondrial DNA code</option>
+      <option value="Ciliate-Nuclear">Ciliate, Dasycladacean and Hexamita Nuclear code</option>
+      <option value="Echinoderm-mtDNA">Echinoderm mitochondrial DNA code</option>
+      <option value="Euplotid-Nuclear">Euplotid Nuclear code</option>
+      <option value="Alt-Yeast-Nuclear">Alternative Yeast Nuclear code</option>
+      <option value="Ascidian-mtDNA">Ascidian mitochondrial DNA code</option>
+      <option value="Flatworm-mtDNA,">Flatworm mitochondrial DNA code</option>
+      <option value="Blepharisma-Nuclear">Blepharisma Nuclear code</option>
     </param>
   </xml>
   <xml name="branches">
     <param name="branches" type="select" label="Set of branches to test">
-      <option value="1">All branches</option>
-      <option value="2">Internal branches</option>
-      <option value="3">Leaf branches</option>
-      <option value="4">Unlabeled branches</option>
+      <option value="All">All branches</option>
+      <option value="Internal">Internal branches</option>
+      <option value="Leaves">Leaf branches</option>
+      <option value="'Unlabeled-branches'">Unlabeled branches</option>
     </param>
   </xml>
-  <xml name="version_command">
-    <version_command>HYPHYMP --version | tail -n 1 | awk '{print $1}'</version_command>
-  </xml>
   <xml name="citations">
     <citations>
       <citation type="doi">10.1093/bioinformatics/bti079</citation>
       <yield/>
     </citations>
   </xml>
-  <token name="@VERSION@">2.3.14</token>
+  <token name="@VERSION@">2.5.0</token>
   <xml name="requirements">
     <requirements>
       <requirement type="package" version="@VERSION@">hyphy</requirement>
       <yield/>
     </requirements>
   </xml>
-  <token name="@HYPHY_ENVIRONMENT@"><![CDATA[export HYPHY=`which HYPHYMP` &&
+  <token name="@HYPHY_ENVIRONMENT@"><![CDATA[export HYPHY=`which hyphy` &&
 export HYPHY_PATH=`dirname \$HYPHY` &&
 export HYPHY_LIB=`readlink -f \$HYPHY_PATH/../lib/hyphy` &&]]></token>
-  <token name="@HYPHY_INVOCATION@"><![CDATA[@HYPHY_ENVIRONMENT@ cat tool_params | HYPHYMP LIBPATH=\$HYPHY_LIB ]]></token>
-  <token name="@HYPHYMPI_INVOCATION@"><![CDATA[export HYPHYMPI=`which HYPHYMPI` &&
-export HYPHYMPI_PATH=`dirname \$HYPHYMPI` &&
-export HYPHYMPI_LIB=`readlink -f \$HYPHYMPI_PATH/../lib/hyphy` &&
-cat tool_params | mpirun -np \${GALAXY_SLOTS:-2} HYPHYMPI LIBPATH=\$HYPHYMPI_LIB ]]></token>
+  <token name="@HYPHY_INVOCATION@"><![CDATA[@HYPHY_ENVIRONMENT@ cat tool_params | hyphy LIBPATH=\$HYPHY_LIB ]]></token>
 </macros>