# HG changeset patch
# User eduardo
# Date 1491689847 14400
# Node ID 79d6bb2e6a5d0e50450b40b66fd0e85d2ef686d5
# Parent  072ab1b781d87679f0227c92cc646422bf257382
planemo upload for repository https://github.com/galaxyproject/tools-iuc/tree/master/tools/mergegffs commit b370006ad76357c5f9014e0af87205737197ace2

diff -r 072ab1b781d8 -r 79d6bb2e6a5d mergegffs.py
--- a/mergegffs.py	Sat Apr 08 15:29:36 2017 -0400
+++ b/mergegffs.py	Sat Apr 08 18:17:27 2017 -0400
@@ -13,6 +13,7 @@
         parser.add_argument('-m','--genemap', help="mapping of genes to transcripts")
         parser.add_argument('-p','--peptides',required=True, help="peptide prediction gff")
         parser.add_argument('-b','--blastp', help="blastp outfmt6 results for peptides")
+        parser.add_argument('-x','--blastx', help="blastx outfmt6 results for transcripts")
         parser.add_argument('-f','--pfam', help="hmmer results for peptides")
         parser.add_argument('-t','--tmhmm', help="tmhmm results for peptides")
         parser.add_argument('-s','--signalP', help="signalP results for peptides")
diff -r 072ab1b781d8 -r 79d6bb2e6a5d mergegffs.xml
--- a/mergegffs.xml	Sat Apr 08 15:29:36 2017 -0400
+++ b/mergegffs.xml	Sat Apr 08 18:17:27 2017 -0400
@@ -74,12 +74,12 @@
     </outputs>
     <tests>
         <test>
-            <param name="gff" ftype="gff" value="Trinity.fasta.transdecoder.gff3" />
-            <param name="blastp" ftype="tabular" value="swissprot.blastp.outfmt6" />
-            <param name="blastx" ftype="tabular" value="swissprot.blastx.outfmt6" />
-            <param name="hmmscan" ftype="txt" value="TrinotatePFAM.out" />
-            <param name="tmhmm" ftype="tabular" value="tmhmm.out" />
-            <param name="signalp" ftype="tabular" value="signalp.out" />
+            <param name="gff" value="Trinity.fasta.transdecoder.gff3" />
+            <param name="blastp"  value="swissprot.blastp.outfmt6" />
+            <param name="blastx"  value="swissprot.blastx.outfmt6" />
+            <param name="hmmscan"  value="TrinotatePFAM.out" />
+            <param name="tmhmm"  value="tmhmm.out" />
+            <param name="signalp"  value="signalp.out" />
             <param name="keep_sqlite" value="false" />
             <output name="output" file="output.gff" />
         </test>