Merge branch 'main' into dev (forward-port mzData fix), bump version

MassBank · Mar 10, 2022 · 27128b5 · 27128b5
2 parents b896a8a + e51aa6f
commit 27128b5
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 190 deletions.
diff --git a/.BBSoptions b/.BBSoptions
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: RMassBank
 Type: Package
 Title: Workflow to process tandem MS files and build MassBank records
-Version: 3.3.4
+Version: 3.5.2
 Authors@R: c(
     person(given = "RMassBank at Eawag", email = "[email protected]",
     role=c("cre")),
@@ -37,7 +37,7 @@ Imports:
     enviPat,assertthat,logger,RCurl,readJDX,webchem,
     ChemmineR,ChemmineOB,R.utils
 Suggests:
-    BiocStyle,gplots,RMassBankData,
+    BiocStyle,gplots,RMassBankData (>= 1.33.1),
     xcms (>= 1.37.1),
     CAMERA,
     RUnit,

diff --git a/inst/NEWS b/inst/NEWS
@@ -1,3 +1,7 @@
+Changes in version 3.5.1
+
+- Switch to using mzML files in the vignette after mzR dropped support for mzData
+
 Changes in version 2.99.4
 
 - Fix an issue if no electronic noise was specified in settings.ini, closes #239

diff --git a/vignettes/RMassBankXCMS.Rmd b/vignettes/RMassBankXCMS.Rmd
@@ -89,7 +89,7 @@ The full paths of the files must be loaded into the container in the array
 ```{r }
 msmsList@files <- list.files(system.file("spectra.Glucolesquerellin",
                                          package = "RMassBankData"),
-                             "Glucolesquerellin.*mzData", full.names=TRUE)
+                             "Glucolesquerellin.*mzML", full.names=TRUE)
 ```
 
 Note the position of the compound IDs in the filenames. Historically,

diff --git a/vignettes/RMassBankXCMS.Rnw-disabled b/vignettes/RMassBankXCMS.Rnw-disabled