From 99397fad74d3e47c27073f44e36300d43f48a181 Mon Sep 17 00:00:00 2001
From: lecorguille <lecorguille@users.noreply.github.com>
Date: Fri, 24 Feb 2017 13:54:52 +0100
Subject: [PATCH 1/2] add the mzData datatype

---
 config/datatypes_conf.xml.sample   | 1 +
 lib/galaxy/datatypes/proteomics.py | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/config/datatypes_conf.xml.sample b/config/datatypes_conf.xml.sample
index 2bd89eacc75..59acb3c7c92 100644
--- a/config/datatypes_conf.xml.sample
+++ b/config/datatypes_conf.xml.sample
@@ -218,6 +218,7 @@
     <datatype extension="mgf" type="galaxy.datatypes.proteomics:Mgf" display_in_upload="true" />
     <datatype extension="wiff" type="galaxy.datatypes.proteomics:Wiff" display_in_upload="true" />
     <datatype extension="mzxml" type="galaxy.datatypes.proteomics:MzXML" mimetype="application/xml" display_in_upload="true" />
+    <datatype extension="mzdata" type="galaxy.datatypes.proteomics:MzData" mimetype="application/xml" display_in_upload="true" />
     <datatype extension="ms2" type="galaxy.datatypes.proteomics:Ms2" display_in_upload="true" />
     <datatype extension="mzq" type="galaxy.datatypes.proteomics:MzQuantML" mimetype="application/xml" display_in_upload="true" />
     <datatype extension="mz.sqlite" type="galaxy.datatypes.binary:MzSQlite" mimetype="application/octet-stream" display_in_upload="true" />
diff --git a/lib/galaxy/datatypes/proteomics.py b/lib/galaxy/datatypes/proteomics.py
index 2bf02043848..7a2d99bbbca 100644
--- a/lib/galaxy/datatypes/proteomics.py
+++ b/lib/galaxy/datatypes/proteomics.py
@@ -151,6 +151,13 @@ class MzXML(ProteomicsXml):
     blurb = "mzXML Mass Spectrometry data"
     root = "mzXML"
 
+class MzData(ProteomicsXml):
+    """mzData data"""
+    edam_format = "format_3245"
+    file_ext = "mzdata"
+    blurb = "mzData Mass Spectrometry data"
+    root = "mzData"
+
 
 class MzIdentML(ProteomicsXml):
     edam_format = "format_3247"

From 036df2ac2003ab378f6a0227e4642d980639a5ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Gr=C3=BCning?= <bjoern@gruenings.eu>
Date: Fri, 24 Feb 2017 15:39:19 +0100
Subject: [PATCH 2/2] Fix linting

---
 lib/galaxy/datatypes/proteomics.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/galaxy/datatypes/proteomics.py b/lib/galaxy/datatypes/proteomics.py
index 7a2d99bbbca..de6229b81f9 100644
--- a/lib/galaxy/datatypes/proteomics.py
+++ b/lib/galaxy/datatypes/proteomics.py
@@ -151,6 +151,7 @@ class MzXML(ProteomicsXml):
     blurb = "mzXML Mass Spectrometry data"
     root = "mzXML"
 
+
 class MzData(ProteomicsXml):
     """mzData data"""
     edam_format = "format_3245"