Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add IQtree datatypes #4849

Merged
merged 12 commits into from Nov 8, 2017
Merged

Add IQtree datatypes #4849

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f3e06cc
iqtree and mldist datatypes
mtekman Oct 24, 2017
b8ce7b5
added binary file checkers and line count limits
mtekman Oct 28, 2017
f993ace
Merge branch 'dev' of github.com:galaxyproject/galaxy into iqtree
mtekman Nov 2, 2017
5cf6452
vastly simplified iqtree datatypes
mtekman Nov 2, 2017
94a77f7
removed obsolete sniffer and test data
mtekman Nov 3, 2017
97fc49d
removed unoverriden methods in subclass, empty lines
mtekman Nov 3, 2017
00ca4f3
quickfix to read
mtekman Nov 4, 2017
d9607ce
vastly simplified iqtree datatypes
mtekman Nov 2, 2017
77c4ccc
Merge branch 'iqtree' of github.com:mtekman/galaxy into iqtree
mtekman Nov 6, 2017
5b594ae
moved from data to text
mtekman Nov 6, 2017
4bca1a7
Merge branch 'dev' of github.com:galaxyproject/galaxy into iqtree
mtekman Nov 6, 2017
e347aed
fix to datatype and sniffer
mtekman Nov 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions config/datatypes_conf.xml.sample
View file
Open in desktop
Expand Up @@ -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 -->
Expand Down Expand Up @@ -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"/>
Expand Down