Browse code

misc + version update

Laurent Gatto authored on 18/06/2021 16:37:31
Showing 4 changed files

  • .Rbuildignore index bd571ec23..ed53dbf37 100644
  • DESCRIPTION index 17427bea3..b57859bb5 100644
  • NEWS index bad8ec8b3..48316561a 100644
  • R/zzz.R index 829611844..270c07790 100644
... ...
@@ -1,7 +1,5 @@
1
-.travis.yml
2
-^.git$
1
+\.travis.yml
3 2
 ^.*\.Rproj$
4 3
 ^\.Rproj\.user$
5
-.git
6
-.gitignore
7
-.travis.yml
4
+^\.gitignore$
5
+^\.git$
... ...
@@ -2,18 +2,18 @@ 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.25.5
5
+Version: 2.27.1
6 6
 Author: Bernd Fischer, Steffen Neumann, Laurent Gatto, Qiang Kou, Johannes Rainer
7 7
 Maintainer: Steffen Neumann <sneumann@ipb-halle.de>,
8
-	    Laurent Gatto <laurent.gatto@uclouvain.be>,
9
-	    Qiakng Kou <qkou@umail.iu.edu>
8
+            Laurent Gatto <laurent.gatto@uclouvain.be>,
9
+            Qiakng Kou <qkou@umail.iu.edu>
10 10
 Description: mzR provides a unified API to the common file formats and
11
-	parsers available for mass spectrometry data. It comes with a
12
-	wrapper for the ISB random access parser for mass spectrometry
13
-	mzXML, mzData and mzML files. The package contains the
14
-	original code written by the ISB, and a subset of the
15
-	proteowizard library for mzML and mzIdentML. The netCDF
16
-	reading code has previously been used in XCMS.
11
+        parsers available for mass spectrometry data. It comes with a
12
+        wrapper for the ISB random access parser for mass spectrometry
13
+        mzXML, mzData and mzML files. The package contains the
14
+        original code written by the ISB, and a subset of the
15
+        proteowizard library for mzML and mzIdentML. The netCDF
16
+        reading code has previously been used in XCMS.
17 17
 License: Artistic-2.0
18 18
 LazyLoad: yes
19 19
 Depends: Rcpp (>= 0.10.1), methods, utils
... ...
@@ -26,5 +26,5 @@ SystemRequirements: C++11, GNU make
26 26
 URL: https://github.com/sneumann/mzR/
27 27
 BugReports: https://github.com/sneumann/mzR/issues/
28 28
 biocViews: ImmunoOncology, Infrastructure, DataImport, Proteomics, Metabolomics,
29
-	MassSpectrometry
29
+        MassSpectrometry
30 30
 RoxygenNote: 6.0.1
... ...
@@ -1,3 +1,11 @@
1
+CHANGES IN VERSION 2.27.1
2
+-------------------------
3
+ o Add missing atomic_count_sync.hpp BH file (see PR #248 by vjcitn)
4
+
5
+CHANGES IN VERSION 2.27.0
6
+-------------------------
7
+ o New Bioc devel version
8
+
1 9
 CHANGES IN VERSION 2.25.5
2 10
 -------------------------
3 11
  o Fix compile error on clang-11 reported (and fixed!) by Kurt Hornik, closes #244
... ...
@@ -22,7 +30,7 @@ CHANGES IN VERSION 2.25.1
22 30
 CHANGES IN VERSION 2.25.0
23 31
 -------------------------
24 32
  o New Bioc devel version
25
- 
33
+
26 34
 CHANGES IN VERSION 2.21.2
27 35
 -------------------------
28 36
  o Update email address
... ...
@@ -1,4 +1,4 @@
1
-BUILT_RCPP_VERSION = package_version("1.0.2")
1
+BUILT_RCPP_VERSION = package_version("1.0.6")
2 2
 
3 3
 .onLoad <-
4 4
     function(libname, pkgname) {