Browse code

Merge branch 'master' into devel

* master:
Fix failing example and test due to updated msdata::protemics data

From: Laurent <lg390@cam.ac.uk>

git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/mzR@122002 bc3139a8-67e5-0310-9ffc-ced21a209358

l.gatto authored on 06/10/2016 22:09:03
Showing 4 changed files

... ...
@@ -2,7 +2,7 @@ Package: mzR
2 2
 Type: Package
3 3
 Title: parser for netCDF, mzXML, mzData and mzML and mzIdentML files
4 4
        (mass spectrometry data)
5
-Version: 2.7.10
5
+Version: 2.7.11
6 6
 Author: Bernd Fischer, Steffen Neumann, Laurent Gatto, Qiang Kou
7 7
 Maintainer: Bernd Fischer <b.fischer@dkfz.de>,
8 8
 	    Steffen Neumann <sneumann@ipb-halle.de>,
... ...
@@ -1,3 +1,7 @@
1
+CHANGES IN VERSION 2.7.11
2
+-------------------------
3
+ o Fix failing example and test due to updated msdata::protemics data
4
+ 
1 5
 CHANGES IN VERSION 2.7.10
2 6
 -------------------------
3 7
  o compiling and loading on Windows (hopefully)
... ...
@@ -1,6 +1,6 @@
1 1
 test_isolationWindow <- function() {
2 2
     library("msdata")
3
-    f <- msdata::proteomics(full.names = TRUE)
3
+    f <- msdata::proteomics(full.names = TRUE, pattern = "TMT_")
4 4
     rw1 <- openMSfile(f, backend = "Ramp")
5 5
     rw2 <- openMSfile(f, backend = "pwiz")
6 6
     i1 <- isolationWindow(f)
... ...
@@ -51,7 +51,7 @@
51 51
 
52 52
 \examples{
53 53
 library("msdata")
54
-f <- msdata::proteomics(full.names = TRUE)
54
+f <- msdata::proteomics(full.names = TRUE, pattern = "TMT_")
55 55
 isolationWindow(f)
56 56
 
57 57
 rw <- openMSfile(f)