# HG changeset patch # User computational-metabolomics # Date 1597063282 14400 # Node ID 3d36a391612ca85e040893f682aa66e77c27a6af # Parent 19fd19059791c3c3d582b7d4680c63ef6e4140e7 "planemo upload for repository https://github.com/computational-metabolomics/mspurity-galaxy commit cbbd708ea1e93b1b1643f6bf6da72af65ffd9950" diff -r 19fd19059791 -r 3d36a391612c README.rst --- a/README.rst Thu Apr 09 14:26:52 2020 -0400 +++ b/README.rst Mon Aug 10 08:41:22 2020 -0400 @@ -3,13 +3,13 @@ |Build Status (Travis)| |Git| |Bioconda| |License| -Version v1.12.2+galaxy1 +Version v1.12.2+galaxy2 ------ - msPurity - bioconductor-mspurity v1.12.2 - Galaxy tools - - v1 + - v2 About ------ @@ -55,6 +55,11 @@ Changes ------------------------- +v1.12.2-galaxy2 + - Bug fix for using custom library sqlite database from Galaxy UI + - Bug fix for "allfrag" for createDatabase + + v1.12.2-galaxy1 - grpPeaklist reference incorrect in createDatabase.xml - Add custom adduct handling for createMSP diff -r 19fd19059791 -r 3d36a391612c createDatabase.R --- a/createDatabase.R Thu Apr 09 14:26:52 2020 -0400 +++ b/createDatabase.R Mon Aug 10 08:41:22 2020 -0400 @@ -94,7 +94,11 @@ print(pa@fileList) - +# Missing list element causes failures (should be updated +# in msPurity R package for future releases) +if (!exists('allfrag', where=pa@filter_frag_params)){ + pa@filter_frag_params$allfrag <- FALSE +} if (opt$xcms_camera_option=='xcms'){ diff -r 19fd19059791 -r 3d36a391612c macros.xml --- a/macros.xml Thu Apr 09 14:26:52 2020 -0400 +++ b/macros.xml Mon Aug 10 08:41:22 2020 -0400 @@ -1,7 +1,7 @@ 1.12.2 - 1 + 2 diff -r 19fd19059791 -r 3d36a391612c spectralMatching.R --- a/spectralMatching.R Thu Apr 09 14:26:52 2020 -0400 +++ b/spectralMatching.R Mon Aug 10 08:41:22 2020 -0400 @@ -292,6 +292,7 @@ q_check <- checkSPeakMeta(opt$q_dbPth, 'query') l_check <- checkSPeakMeta(opt$l_dbPth, 'library') + if (q_check && l_check){ sm <- msPurity::spectralMatching( q_purity = opt$q_purity,