Merge branch 'saskema-fix288' into devel

sneumann · Nov 19, 2024 · 0368dbf · 0368dbf
2 parents 4e4e270 + e91cfcc
commit 0368dbf
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 6 deletions.
diff --git a/.github/workflows/check-bioc.yml b/.github/workflows/check-bioc.yml
@@ -52,10 +52,9 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - { os: ubuntu-latest, r: 'devel', bioc: '3.19', cont: "bioconductor/bioconductor_docker:devel", rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest" }
-          - { os: fedora-latest, r: 'devel', bioc: '3.19', cont: "bioconductor/bioconductor_docker:devel", rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest" }
-          - { os: macOS-latest, r: 'devel', bioc: '3.19'}
-          - { os: windows-latest, r: 'devel', bioc: '3.19'}
+          - { os: ubuntu-latest, r: 'devel', bioc: '3.21', cont: "bioconductor/bioconductor_docker:devel", rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest" }
+          - { os: macOS-latest, r: 'devel', bioc: '3.21'}
+          - { os: windows-latest, r: 'devel', bioc: '3.21'}
     env:
       R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
       RSPM: ${{ matrix.config.rspm }}

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -2,13 +2,14 @@ Package: mzR
 Type: Package
 Title: parser for netCDF, mzXML and mzML and mzIdentML files
        (mass spectrometry data)
-Version: 2.41.0
+Version: 2.41.1
 Author: Bernd Fischer, Steffen Neumann, Laurent Gatto, Qiang Kou, Johannes Rainer
 Authors@R: c(
     person("Steffen", "Neumann", email="[email protected]", role=c("aut","cre")),
     person("Laurent", "Gatto", email="[email protected]", role=c("aut")),
     person("Qiakng", "Kou", email="[email protected]", role=c("aut")),
-    person("David","Rauh",email="[email protected]", role=c("ctb"))
+    person("David","Rauh",email="[email protected]", role=c("ctb")),
+    person("Sascha","Manier",email="[email protected]", role=c("ctb"))
     )
 Description: mzR provides a unified API to the common file formats and
         parsers available for mass spectrometry data. It comes with a

diff --git a/NEWS b/NEWS
@@ -1,3 +1,7 @@
+CHANGES IN VERSION 2.41.1
+-------------------------
+o Fix compilation error with stricter compiler checks
+
 CHANGES IN VERSION 2.39.2
 -------------------------
 o Improve openMSfile and openIDfile manual page (contirbuted by

diff --git a/src/pwiz/data/msdata/MSData.cpp b/src/pwiz/data/msdata/MSData.cpp
@@ -1112,6 +1112,8 @@ PWIZ_API_DECL size_t SpectrumList::findAbbreviated(const string& abbreviatedId,
         if ((result >= 0 && result < size()) || s == 0)
             return result;
     }
+
+    return size();
 }
-Original file line number
+Diff line change
@@ Expand Up @@
             if ((result >= 0 && result < size()) || s == 0)
                 return result;
         }
+        return size();
     }
@@ Expand Down @@