Merge pull request #4849 from mtekman/iqtree

Add IQtree datatypes
galaxyproject · Nov 8, 2017 · 3b4b97a · 3b4b97a
2 parents 855ea1a + e347aed
commit 3b4b97a
Show file tree

Hide file tree

Showing 3 changed files with 341 additions and 0 deletions.
diff --git a/config/datatypes_conf.xml.sample b/config/datatypes_conf.xml.sample
@@ -341,6 +341,8 @@
     <datatype extension="phyloxml" type="galaxy.datatypes.xml:Phyloxml" display_in_upload="true" />
     <datatype extension="nhx" type="galaxy.datatypes.data:Newick" display_in_upload="true" />
     <datatype extension="nex" type="galaxy.datatypes.data:Nexus" display_in_upload="true" />
+    <datatype extension="iqtree" type="galaxy.datatypes.text:IQTree" />
+    <datatype extension="mldist" type="galaxy.datatypes.mothur:SquareDistanceMatrix" />
     <!-- Start RGenetics Datatypes -->
     <datatype extension="affybatch" type="galaxy.datatypes.genetics:Affybatch" display_in_upload="true"/>
     <!-- eigenstrat pedigree input file -->
@@ -744,6 +746,7 @@
     <sniffer type="galaxy.datatypes.tabular:Sam"/>
     <sniffer type="galaxy.datatypes.data:Newick"/>
     <sniffer type="galaxy.datatypes.data:Nexus"/>
+    <sniffer type="galaxy.datatypes.text:IQTree"/>
     <sniffer type="galaxy.datatypes.text:Obo"/>
     <sniffer type="galaxy.datatypes.text:Arff"/>
     <sniffer type="galaxy.datatypes.text:Ipynb"/>