Skip to content

Commit 4f88143

Browse files
TomnlTomnl
authored
v1.11.4+galaxy0.2.6 (#26)
* Ensure correct compoundDbPth used * Update link the database schema * Update sql references for docs, version bump * Update instrument type selection * msp_split tool update * update of tests for msp_split * update travis * Update readme
1 parent a164f06 commit 4f88143

File tree

11 files changed

+59
-21
lines changed

11 files changed

+59
-21
lines changed

‎.travis.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ env:
1616
- TEST=tools/msPurity/flagRemove.xml
1717
- TEST=tools/msPurity/frag4feature.xml
1818
- TEST=tools/msPurity/purityX.xml
19-
- TEST=tools/utils/msp_split.xml
19+
- TEST=tools/utils/msp_split/msp_split.xml
2020
- TEST=tools/utils/submit_to_mogi.xml
2121

2222

‎README.rst‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,14 @@ Warning
66
------
77
Proceed with caution these tools are in active development so tools may change! Stable release to Galaxy toolshed coming soon. Currently these tools will only work when the 'tomnl' conda channel is being used with Galaxy.
88

9-
Version v1.11.4-galaxy0.2.5
9+
Version v1.11.4+galaxy0.2.6
1010
------
1111
NOTE: bioconductor-mspurity v1.11.4 only available on 'tomnl' conda channel - to be updated to bioconda soon.
1212

1313
- msPurity
1414
- bioconductor-mspurity v1.11.4
1515
- Galaxy tools
16-
- v0.2.5
16+
- v0.2.6
1717

1818
About
1919
------
@@ -58,6 +58,13 @@ Authors, contributors & contacts
5858

5959
Changes
6060
-------------------------
61+
v1.11.4-galaxy0.2.6:
62+
- submitted to test toolshed (xx)
63+
- Bug fix for createAnnotation database local path
64+
- Update of instrument types for spectral matching
65+
- Update of split_msp tool to handle different MSP types
66+
67+
6168
v1.11.4-galaxy0.2.5:
6269
- submitted to test toolshed (20190913)
6370
- Added ppmInterp parameter to purityA

‎tools/msPurity/combineAnnotations.R‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ if (opt$compoundDbType=='local_config'){
6767
source_local <- function(fname){ argv <- commandArgs(trailingOnly=FALSE); base_dir <- dirname(substring(argv[grep("--file=", argv)], 8)); source(paste(base_dir, fname, sep="/")) }
6868
source_local("dbconfig.R")
6969
}else{
70-
compoundDbType = opt$compoundDbType
70+
compoundDbType = compoundDbType
7171
compoundDbName = NA
7272
compoundDbHost = NA
7373
compoundDbPort = NA
@@ -79,7 +79,7 @@ if (opt$compoundDbType=='local_config'){
7979

8080
summary_output <- msPurity::combineAnnotations(
8181
sm_resultPth = sm_resultPth,
82-
compoundDbPth = opt$compoundDbPth,
82+
compoundDbPth = compoundDbPth,
8383
metfrag_resultPth = opt$metfrag_resultPth,
8484
sirius_csi_resultPth = opt$sirius_csi_resultPth,
8585
probmetab_resultPth = opt$probmetab_resultPth,

‎tools/msPurity/macros.xml‎

Lines changed: 37 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<macros>
33
<token name="@TOOL_VERSION@">1.11.4</token>
4-
<token name="@GALAXY_TOOL_VERSION@">0.2.5</token>
4+
<token name="@GALAXY_TOOL_VERSION@">0.2.6</token>
55

66
<xml name="requirements">
77
<requirements>
@@ -108,7 +108,7 @@
108108
<conditional name="@QL_SHRT@_dbPth_con">
109109
<param name="@QL_SHRT@_dbPth_select" type="select" label="Input" help="@HELP@" >
110110
<option value="sqlite" selected="@USER@" >SQLite database of (LC)-MS/MS data</option>
111-
<option value="local_config" selected="@USER@" >Locally configured MySQL or Postgres database</option>
111+
<option value="local_config" selected="@USER@" >Locally configured SQLite, MySQL or PostgreSQL database</option>
112112
<option value="msPurityData" selected="@MSPURITYDATALIB@" >Prepared database of MassBank, HMDB, LipidBlast and GNPS</option>
113113
</param>
114114
<when value="sqlite">
@@ -248,36 +248,59 @@
248248
<when value="true">
249249
<param name="@QL_SHRT@_instrumentTypes" type="select" multiple="true"
250250
help="" >
251-
<option value="APCI-ITFT">APCI-ITFT</option>
252-
<option value="CE-ESI-TOF" selected="true">CE-ESI-TOF</option>
251+
<option value="APCI-ITFT" selected="true" >APCI-ITFT</option>
252+
<option value="APCI-ITTOF" selected="true" >APCI-ITTOF</option>
253+
<option value="CE-ESI-TOF" selected="true" >CE-ESI-TOF</option>
253254
<option value="CI-B">CI-B</option>
254255
<option value="EI-B">EI-B</option>
255256
<option value="EI-EBEB">EI-EBEB</option>
256-
<option value="ESI-ITFT" selected="true">ESI-ITFT</option>
257-
<option value="ESI-ITTOF" selected="true">ESI-ITTOF</option>
258-
<option value="ESI-QTOF" selected="true">ESI-QTOF</option>
257+
<option value="ESI-ITFT" selected="true" >ESI-ITFT</option>
258+
<option value="ESI-ITTOF" selected="true" >ESI-ITTOF</option>
259+
<option value="ESI-QFT" selected="true" >ESI-QFT</option>
260+
<option value="ESI-QTOF" selected="true" >ESI-QTOF</option>
261+
<option value="ESI-TOF" selected="true" >ESI-TOF</option>
259262
<option value="FAB-B">FAB-B</option>
260-
<option value="FAB-BE-MS">FAB-BE-MS</option>
263+
<option value="FAB-BE">FAB-BE</option>
261264
<option value="FAB-EB">FAB-EB</option>
262265
<option value="FAB-EBEB">FAB-EBEB</option>
266+
<option value="FAB-EBEB">FD-B</option>
263267
<option value="FI-B">FI-B</option>
268+
<option value="Flow-injection QqQ/MS">Flow-injection QqQ/MS</option>
264269
<option value="GC-EI-Q">GC-EI-Q</option>
265270
<option value="GC-EI-QQ">GC-EI-QQ</option>
266271
<option value="GC-EI-TOF">GC-EI-TOF</option>
267-
<option value="LC-APCI-QTOF">LC-APCI-QTOF</option>
272+
<option value="GC-MS">GC-MS</option>
273+
<option value="Hybrid FT">Hybrid FT</option>
274+
<option value="in source CID" selected="true" >in source CID</option>
275+
<option value="In-silico QTOF" selected="true" >In-silico QTOF</option>
276+
<option value="Ion trap" selected="true" >Ion trap</option>
277+
<option value="LC-APCI-ITFT" selected="true" >LC-APCI-ITFT</option>
278+
<option value="LC-APCI-QTOF" selected="true" >LC-APCI-QTOF</option>
279+
<option value="LC-APCI-Q" selected="true">LC-APCI-Q</option>
268280
<option value="LC-APPI-QQ">LC-APPI-QQ</option>
269281
<option value="LC-ESI-IT" selected="true">LC-ESI-IT</option>
270282
<option value="LC-ESI-ITFT" selected="true">LC-ESI-ITFT</option>
271283
<option value="LC-ESI-ITTOF" selected="true">LC-ESI-ITTOF</option>
272-
<option value="LC-ESI-Q">LC-ESI-Q</option>
273-
<option value="LC-ESI-QFT" selected="true" >LC-ESI-QFT</option>
284+
<option value="LC-ESI-Q" selected="true">LC-ESI-Q</option>
285+
<option value="LC-ESI-QFT" selected="true">LC-ESI-QFT</option>
274286
<option value="LC-ESI-QIT" selected="true">LC-ESI-QIT</option>
275287
<option value="LC-ESI-QQ" selected="true">LC-ESI-QQ</option>
276288
<option value="LC-ESI-QTOF" selected="true">LC-ESI-QTOF</option>
277289
<option value="LC-ESI-TOF" selected="true">LC-ESI-TOF</option>
278-
<option value="MALDI-QIT">MALDI-QIT</option>
279-
<option value="MALDI-TOF">MALDI-TOF</option>
280-
<option value="ALDI-TOFTOF">ALDI-TOFTOF</option>
290+
<option value="LC-Q-TOF/MS" selected="true">LC-Q-TOF/MS</option>
291+
<option value="LC-QTOF" selected="true">LC-QTOF</option>
292+
<option value="Linear Ion Trap" selected="true">Linear Ion Trap</option>
293+
<option value="LIT" selected="true">LIT</option>
294+
<option value="MALDI-QIT" selected="true">MALDI-QIT</option>
295+
<option value="MALDI-TOF" selected="true">MALDI-TOF</option>
296+
<option value="MALDI-TOFTOF" selected="true">MALDI-TOFTOF</option>
297+
<option value="orbitrap" selected="true">orbitrap</option>
298+
<option value="QIT" selected="true">QIT</option>
299+
<option value="QIT-FT" selected="true">QIT-FT</option>
300+
<option value="QIT-TOF" selected="true">QIT-TOF</option>
301+
<option value="QqQ" selected="true">QqQ</option>
302+
<option value="Q-TOF" selected="true">Q-TOF</option>
303+
<option value="Quattro_QQQ" selected="true">Quattro_QQQ</option>
281304
<option value="none">None</option>
282305
</param>
283306
<param name="@QL_SHRT@_instrumentTypesUser" type="text" value=""

‎tools/msPurity/spectralMatching.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -174,15 +174,15 @@
174174
<expand macro="sm_input" ql='Query' ql_shrt = "q" user="True" mspuritydatalib="False" msp="False"
175175
help="Query SQLite database - in the standard XCMS msPurity workflow - the output
176176
of msPurity.createDatabase should be used here. However any SQLite database
177-
following the schema of xxx can be used as input"/>
177+
following the schema of as https://bioconductor.org/packages/release/bioc/vignettes/msPurity/inst/doc/msPurity-spectral-database-vignette.html can be used as input"/>
178178
<expand macro="filters" ql="Query" ql_shrt="q"/>
179179
</section>
180180

181181
<section name="Library" title="Library spectra input and filters" expanded="True">
182182
<expand macro="sm_input" ql='Library' ql_shrt = "l" user="False" mspuritydatalib="True" msp="False"
183183
help="Library SQLite database - in the standard XCMS msPurity workflow - a default
184184
database of MassBank, HMDB, LipidBlast and GNPS is used. However any SQLite
185-
database following the schema of xxx can be used as input"/>
185+
database following the schema of https://bioconductor.org/packages/release/bioc/vignettes/msPurity/inst/doc/msPurity-spectral-database-vignette.html can be used as input"/>
186186
<expand macro="filters" ql="Library" ql_shrt="l"/>
187187
</section>
188188

‎tools/utils/msp_split/.shed.yml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
owner: tomnl
2+
remote_repository_url: https://github.com/computational-metabolomics/mspurity-galaxy
3+
homepage_url: https://github.com/computational-metabolomics/mspurity-galaxy
4+
categories: ["Metabolomics"]
5+
description: "[Metabolomics][LC-MS][DIMS][MS/MS] msPurity - R package for precursor ion purity assessments, data processing and spectral matching for LC-MS(/MS) and DI-MS(/MS) data"
6+
auto_tool_repositories:
7+
name_template: "{{ tool_id }}"
8+
description_template: "[Metabolomics][LC-MS][DIMS][MS/MS] msPurity - {{ tool_name }} {{description}}"

‎tools/utils/msp_split.py‎ renamed to ‎tools/utils/msp_split/msp_split.py‎

File renamed without changes.

‎tools/utils/msp_split.xml‎ renamed to ‎tools/utils/msp_split/msp_split.xml‎

File renamed without changes.

‎tools/utils/test-data/file01.msp‎ renamed to ‎tools/utils/msp_split/test-data/file01.msp‎

File renamed without changes.

‎tools/utils/test-data/file02.msp‎ renamed to ‎tools/utils/msp_split/test-data/file02.msp‎

File renamed without changes.

0 commit comments

Comments
 (0)