Skip to content

Commit

Permalink
Merge branch 'devel' into phili
Browse files Browse the repository at this point in the history
  • Loading branch information
philouail authored Nov 16, 2023
2 parents 7834540 + 120ab3f commit aaad8c9
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 11 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/check-bioc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ jobs:
matrix:
config:
- { os: ubuntu-latest, r: 'devel', bioc: 'devel', cont: "bioconductor/bioconductor_docker:devel", rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest" }
- { os: macOS-latest, r: '4.3', bioc: '3.18'}
- { os: windows-latest, r: '4.3', bioc: '3.18'}
- { os: macOS-latest, r: 'next', bioc: '3.18'}
- { os: windows-latest, r: 'next', bioc: '3.18'}
env:
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
RSPM: ${{ matrix.config.rspm }}
Expand Down
8 changes: 6 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: xcms
Version: 4.1.2
Version: 4.1.1
Title: LC-MS and GC-MS Data Analysis
Description: Framework for processing and visualization of chromatographically
separated and single-spectra mass spectral data. Imports from AIA/ANDI NetCDF,
Expand Down Expand Up @@ -31,7 +31,11 @@ Authors@R: c(
role = "ctb"),
person(given = "William", family = "Kumler",
email = "[email protected]", role = "ctb",
comment = c(ORCID = "0000-0002-5022-8009"))
comment = c(ORCID = "0000-0002-5022-8009")),
person(given = "Philippine", family = "Louail",
email = "[email protected]",
role = "aut",
comment = c(ORCID = "0009-0007-5429-6846"))
)
Depends:
R (>= 4.0.0),
Expand Down
7 changes: 0 additions & 7 deletions inst/NEWS
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
Changes in version 4.1.2
----------------------

- Add a `param =` to generic function `storeResults`: `PlainTextParam` to save
an `XcmsExperiment` or `MsExperiment` object as colleciton of plain text
files.

Changes in version 4.1.1
----------------------

Expand Down

0 comments on commit aaad8c9

Please sign in to comment.