Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Topic: Looking for help: Dimensions of profile matrices do not match ! #400

Open
wants to merge 537 commits into
base: XChromatograms
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
537 commits
Select commit Hold shift + click to select a range
9ddb654
refactor: multiple smaller changes
jorainer May 11, 2020
355941c
feat: filterFile gains parameter keepFeatures
jorainer May 11, 2020
d14365b
fix: ensure correlate,Chromatogram works even if no points overlap
jorainer May 12, 2020
f00e72a
Adding unit tests for XCMSnExp -> xcmsSet method
wkumler May 12, 2020
7db134b
Adding unit test for new XCMSnExp -> xcmsSet method
wkumler May 15, 2020
4ea51f0
Moving unit tests to correct location
wkumler May 15, 2020
31f2962
feat: add process step for feature grouping
jorainer May 18, 2020
ef4e49c
Think I found erroneous unit test: ftDef was checking identical to ol…
wkumler May 18, 2020
6f560bf
feat: add parameter n and value to featureChromatograms
jorainer May 19, 2020
67af8d4
feat: add normalize method for Chromatogram objects
jorainer May 19, 2020
7570fe0
fix: filterColumnsKeepTop works also on single EIC Chromatograms
jorainer May 19, 2020
9b1ccaf
fix: tentative fix for issue #475
jorainer May 19, 2020
57ec9cb
ci: check also pushes to jomaster branch
jorainer May 19, 2020
0499d26
Merge pull request #478 from wkumler/master
jorainer May 20, 2020
0fe06bc
Merge branch 'master' into jomaster
jorainer May 20, 2020
dbcc84e
ci: force installing MsCoreUtils from github
jorainer May 20, 2020
de63eca
ci: remove travis CI tests
jorainer May 20, 2020
5644f24
fix: conversion from XCMSnExp to xcmsSet keeps phenodata
jorainer May 20, 2020
a78ab0b
tests: set random number seed in various unit tests
jorainer May 20, 2020
5c370cc
ci: remove testing on macOS devel as dependencies are not available
jorainer May 20, 2020
b3580ce
Merge pull request #480 from sneumann/jomaster
jorainer May 20, 2020
b285f74
refactor: improve data splitting for parallel peak detection
jorainer May 25, 2020
996d6a4
refactor: improve splitting objects for parallel processing
jorainer May 27, 2020
57a7efb
refactor: additional performance improvements
jorainer May 28, 2020
8729815
fix: minor fixes related to the previous committs
jorainer May 29, 2020
33cbcb1
fix: tentative fix for issue #481
jorainer Jun 5, 2020
2aca524
refactor: use bplapply instead of bpmapply in refineChromPeaks
jorainer Jun 8, 2020
726081f
feat: add fillChromPeaks,ChromPeakAreaParam
jorainer Jun 9, 2020
1aa37cb
fix: fix problem in unit test and disable some vignettes
jorainer Jun 9, 2020
b45b92e
Merge pull request #484 from sneumann/jomaster
jorainer Jun 9, 2020
b7c7582
fix: fix error in refineChromPeaks when no peaks found to be merged
jorainer Jun 10, 2020
15d24e0
tests: tentative performance improvement of unit tests
jorainer Jun 15, 2020
e3be360
ci: add Bioconductor badges
jorainer Jun 15, 2020
5fd859b
docs: update all examples using the internal test data
jorainer Jun 15, 2020
9db0036
Moved data from inst/data to data
jorainer Jun 15, 2020
cd9be8b
Merge pull request #488 from sneumann/jomaster
jorainer Jun 15, 2020
4fae6c1
fix: report rtime for SWATH reconstructed spectra
jorainer Jun 16, 2020
e96e4fc
Merge pull request #489 from sneumann/jomaster
jorainer Jun 16, 2020
9551282
refactor: add polarity to reconstructed MS2 spectra (issue #485)
jorainer Jun 16, 2020
750f62f
refactor: report precursorIntensity in reconstructed spectra
jorainer Jun 16, 2020
e576ff6
Merge pull request #490 from sneumann/jomaster
jorainer Jun 16, 2020
f530d8d
refactor: use MSpectra and MChromatograms from MSnbase
jorainer Jun 18, 2020
ae88b2e
docs: reduce and tune examples, unit tests and vignettes
jorainer Jun 22, 2020
3b1e98d
ci: force installation of faahKO package
jorainer Jun 23, 2020
9c83e57
ci: remove tab
jorainer Jun 23, 2020
80ea184
Merge branch 'master' into jomaster
jorainer Jun 24, 2020
e8769e2
Merge pull request #494 from sneumann/jomaster
jorainer Jun 24, 2020
52ad7a9
bump version
jorainer Jun 25, 2020
6e56fee
Merge remote-tracking branch 'origin/master'
jorainer Jun 25, 2020
2fcd75c
ci: change to BioC-check github action
jorainer Jun 25, 2020
394531e
ci: force install of the faahKO package
jorainer Jun 25, 2020
7c067b8
ci: install (github) xcms as a requirement for faahKO
jorainer Jun 25, 2020
d485fab
ci: replace tabs with whitespaces
jorainer Jun 25, 2020
c2f81df
fix: fix C++ compiler WARNING in massifquant code
jorainer Jun 25, 2020
c8a8c77
ci: force installation of faahKO also for Windows (and macOS?)
jorainer Jun 25, 2020
383f92f
ci: update README to point to the new github action
jorainer Jun 26, 2020
9ccb050
feat: add `estimatePrecursorIntensity` function (issue #453)
jorainer Jun 29, 2020
6990c57
Merge branch 'master' into jomaster
jorainer Jun 29, 2020
a742542
ci: fix Bioc version
jorainer Jun 29, 2020
bd047c5
Merge pull request #496 from sneumann/jomaster
jorainer Jun 29, 2020
944e73b
docs: shorten examples
jorainer Jun 29, 2020
2f00516
docs: remove link to xcmsPapply
jorainer Jun 29, 2020
43f484b
feat: filter chrom peaks by intensity
jorainer Jul 22, 2020
26a3fc6
Merge pull request #504 from sneumann/jomaster
jorainer Jul 22, 2020
79c7210
refactor: tiny changes to the internal .split_by_file function
jorainer Aug 3, 2020
993d261
refactor: improvements for per-file splitting
jorainer Aug 4, 2020
616beb2
docs: disable parallel processing in all examples
jorainer Sep 18, 2020
e5389a8
Merge pull request #510 from sneumann/jomaster
jorainer Sep 18, 2020
4211435
ci: ensure RELEASE branches are tested against correct version
jorainer Sep 18, 2020
435fc1e
Merge remote-tracking branch 'origin/master' into jomaster
jorainer Oct 19, 2020
6c961ee
Re-add the deprecated parallel processing functions
jorainer Oct 19, 2020
92fdbd7
Merge pull request #516 from sneumann/jomaster
jorainer Oct 19, 2020
1518ef3
bump x.y.z version to even y prior to creation of RELEASE_3_12 branch
nturaga Oct 27, 2020
6d255e4
bump x.y.z version to odd y following creation of RELEASE_3_12 branch
nturaga Oct 27, 2020
4ddc4bb
fix: support subsetting of XChromatograms with drop = FALSE
jorainer Nov 6, 2020
821cb29
tests: ensure correct BioC version is used
jorainer Nov 12, 2020
827587f
Merge branch 'master' into jomaster
jorainer Nov 12, 2020
b81c9fe
feat: add manualChromPeaks function (issue #525)
jorainer Nov 24, 2020
29b6a87
ci: disable windows and mac checks
jorainer Nov 24, 2020
aab04e3
ci: enable ubuntu
jorainer Nov 24, 2020
eb726d8
ci: replace GH with newest version from biocthis
jorainer Nov 24, 2020
ba2cc5d
ci: enable testthat, pkgdown etc in GH
jorainer Nov 24, 2020
ef79053
ci: manually install additional packages
jorainer Nov 24, 2020
9282c1f
ci: disable BiocCheck
jorainer Nov 24, 2020
75662a5
ci: install netcdf and smaller fixes
jorainer Nov 24, 2020
6d28881
ci: disable installation of netcdf on macOS
jorainer Nov 24, 2020
9b067b9
Merge pull request #526 from sneumann/jomain
jorainer Nov 25, 2020
7976bbd
feat: add filterIntensity function for Chromatograms
jorainer Dec 1, 2020
90af0f4
Merge pull request #527 from sneumann/jomain
jorainer Dec 1, 2020
f02e631
fix: smaller fixes and cleanup
jorainer Dec 2, 2020
d15914c
Merge pull request #529 from sneumann/jomain
jorainer Dec 2, 2020
35f5e00
refactor: import Param class from ProtGenerics
jorainer Dec 3, 2020
3a259cd
refactor: move various methods to MSnbase
jorainer Dec 10, 2020
3a154b7
ci: force installation of magick and faahKO
jorainer Dec 10, 2020
634f9c3
ci: force installation of devel versions
jorainer Dec 10, 2020
9d1d36a
ci: use R devel on macOS
jorainer Dec 10, 2020
496935e
ci: install pre-build netcdf library for macos
jorainer Dec 10, 2020
5c528d5
ci: install also hdf5 for macOS
jorainer Dec 11, 2020
68bd752
ci: fix new line
jorainer Dec 11, 2020
c567809
ci: update to netcdf 4.7.4
jorainer Dec 11, 2020
a175027
ci: add szip library for macOS
jorainer Dec 11, 2020
3b7d0ef
Merge pull request #530 from sneumann/param
jorainer Dec 11, 2020
5a0ea28
Depend on latest ProtGenerics
lgatto Jan 2, 2021
56de7c0
import quantify from ProtGenerics (previously from MSnbase)
lgatto Jan 2, 2021
80875da
Merge pull request #532 from lgatto/master
jorainer Jan 7, 2021
a33b956
docs: add rmarkdown to Suggests
jorainer Jan 7, 2021
a745b64
ci: force installation of rmarkdown
jorainer Jan 7, 2021
978fba2
ci: force installation of BiocStyle
jorainer Jan 7, 2021
e3bf014
ci: try to fix failed install of dependencies
jorainer Jan 7, 2021
bc7e851
Update DESCRIPTION
jorainer Jan 7, 2021
a770d44
ci: small fix
jorainer Jan 7, 2021
19cc923
ci: update to newer biocthis version
jorainer Jan 7, 2021
367a4f7
ci: manually install faahKO package
jorainer Jan 8, 2021
4d554c2
ci: force installation of MSnbase from github
jorainer Jan 8, 2021
fda0c6b
Merge pull request #535 from sneumann/jomain
jorainer Jan 8, 2021
298f669
feat: add filterChromPeaks method
jorainer Jan 29, 2021
0e18273
refactor: chromPeakSpectra returns Spectra and MS1 spectra
jorainer Feb 10, 2021
38d6e60
refactor: use .fdata instead of fData
jorainer Feb 10, 2021
a2ac08b
docs: update LC-MS/MS vignette
jorainer Feb 10, 2021
9d3e28b
ci: manual install of MsBackendMgf
jorainer Feb 10, 2021
961e365
refactor: featureSpectra support return of Spectra (issue #539)
jorainer Feb 10, 2021
ca96e39
feat: support to extract spectra for individual peaks or features
jorainer Feb 11, 2021
8264d0a
docs: drop momentarily the SWATH analysis from the LC-MS/MS vignette
jorainer Feb 11, 2021
8b6340a
refactor: remove all version info from classes
jorainer Feb 11, 2021
6f65bbe
docs: add warning if processing queue is not empty
jorainer Feb 11, 2021
bfa9cfe
Merge branch 'no_version' into jomain
jorainer Feb 11, 2021
5ab2784
feat: allow return of Spectra in reconstructChromPeakSpectra
jorainer Feb 12, 2021
7039f99
Update version requirements for MSnbase and ProtGenerics
jorainer Feb 15, 2021
5a72e1d
ci: disable forced install of vignettes
jorainer Feb 15, 2021
5875543
Merge pull request #540 from sneumann/jomain
jorainer Feb 15, 2021
9ab61a9
Export findmzROI method
jorainer Feb 22, 2021
149b57a
docs: add missing documentation for findmzROI
jorainer Feb 22, 2021
f9b834e
Merge pull request #543 from sneumann/jomain
jorainer Feb 22, 2021
86dd9f2
feat: add filterChromPeaks,XCMSnExp (issue #541)
jorainer Feb 22, 2021
2961e5b
Merge pull request #544 from sneumann/jomain
jorainer Feb 22, 2021
9a82ea1
Bumped some minimal dependency version
sneumann Feb 26, 2021
9e8642b
fix: issue #545
jorainer Mar 2, 2021
33796c8
docs: remove LC-MS/MS vignette and drop MsBackendMgf dependency
jorainer Mar 4, 2021
0eb8053
Merge pull request #547 from sneumann/jomain
jorainer Mar 4, 2021
94a149f
feat: add featureArea function
jorainer Mar 18, 2021
e48dd9a
fix: fix featureSpectra
jorainer Mar 25, 2021
c698566
docs: re-add LC-MS/MS analysis vignette
jorainer Mar 25, 2021
1c5304d
ci: force installation of MsBackendMassbank
jorainer Mar 26, 2021
873b57f
ci: fix spelling mistake in github repo name
jorainer Mar 26, 2021
62bf206
ci: remove MsBackendMgf from remotes and fix dependency
jorainer Mar 26, 2021
d712fac
Merge pull request #554 from sneumann/jomain
jorainer Mar 26, 2021
550df17
Feature: plotQC() supports XCMSnExp objects now
sneumann Mar 30, 2021
25dc000
Merge branch 'master' into feature/plotQCxcms2
sneumann Mar 30, 2021
3f2d200
Merge pull request #555 from sneumann/feature/plotQCxcms2
jorainer Apr 6, 2021
742ad47
refactor: use inherits instead of class
jorainer Apr 6, 2021
b2f24f2
Fix plotQC() for XCMSnExp objects
sneumann Apr 22, 2021
9fd1202
bump x.y.z version to even y prior to creation of RELEASE_3_13 branch
nturaga May 19, 2021
ee65aa2
bump x.y.z version to odd y following creation of RELEASE_3_13 branch
nturaga May 19, 2021
7bca0a0
Merge branch 'master' into jomain
jorainer May 21, 2021
a7842d0
SSgauss: update for R 4.1
rickhelmus Jun 12, 2021
f8416f9
Bump version after merging #562
sneumann Jun 14, 2021
d18e243
Merge branch 'rickhelmus-master'
sneumann Jun 14, 2021
5c4cae7
Bump BioC test environment to 3.15
sneumann Jun 14, 2021
15f1682
Revert "Bump BioC test environment to 3.15"
sneumann Jun 14, 2021
77f2bb6
Merge branch 'master' into jomain
jorainer Jun 16, 2021
e114b1c
fix: fix LC-MS/MS vignette and unit tests (issue #564)
jorainer Jun 16, 2021
7ab2730
fix: replace |> with %>%
jorainer Jun 16, 2021
fb73089
Merge branch 'jomain'
sneumann Jun 17, 2021
a87a7c6
feat: add groupFeatures and first feature grouping approaches
jorainer Jun 18, 2021
7459d90
fix: small issue
jorainer Jun 18, 2021
17e73c5
refactor: move chromatogram correlation functionality to MSnbase
jorainer Jun 18, 2021
3ef174b
refactor: re-use compareChromatograms from MSnbase
jorainer Jun 21, 2021
14d52e0
feat: add feature grouping based on EIC similarity
jorainer Jun 22, 2021
b1976b7
feat: add preprocessed data
jorainer Jun 22, 2021
1bce624
feat: add plotChromatogramsOverlay
jorainer Jun 23, 2021
88ff5a3
fix: chromPeaks: ensure rt and mz are converted to numbers
jorainer Jul 2, 2021
bc85a39
fix: adapt methods to generics in ProtGenerics
jorainer Jul 19, 2021
05ac6e2
fix: change package for vignette
jorainer Jul 19, 2021
5535a55
ci: install also magick
jorainer Jul 19, 2021
3923869
ci: disable most vignette code blocks
jorainer Jul 19, 2021
2d6b4ba
ci: use BioC devel
jorainer Jul 19, 2021
fcce004
docs: fix package in vignette
jorainer Jul 19, 2021
71c331d
fix: CI, restore vignette and drop import of MSnbase::bin
jorainer Jul 19, 2021
d799e45
ci: fix config file
jorainer Jul 19, 2021
10cd712
ci: force installation of mzR from github
jorainer Jul 19, 2021
654a5aa
docs: disable most of the vignette
jorainer Jul 19, 2021
8151ef6
docs: fix package in vignette
jorainer Jul 20, 2021
93585df
docs: restore full vignette
jorainer Jul 20, 2021
54e416c
refactor: add parameter transform to plotChromatogramsOverlay
jorainer Jul 26, 2021
643c33b
Update plotQC.R
sneumann Jul 27, 2021
92fb5fb
feat: add manualFeatures function
jorainer Jul 28, 2021
fa5afa1
docs: update documentation to introduce "compounding"
jorainer Jul 28, 2021
70f6a13
Merge pull request #574 from sneumann/fix/mtbls2
sneumann Jul 28, 2021
0020c07
docs: expand documentation on featureDefinitions
jorainer Jul 30, 2021
2fe51ea
Merge pull request #572 from sneumann/ms_features
jorainer Aug 3, 2021
a2534c4
fix: plot type XIC with empty data
jorainer Aug 16, 2021
0783664
refactor: skip repeated peak indexing for features if not needed
jorainer Sep 10, 2021
f9f4f6b
docs: small update
jorainer Sep 27, 2021
ebfdf6f
fix: remove warning check from unit test
jorainer Oct 8, 2021
b814aeb
Merge pull request #581 from sneumann/jomain
sneumann Oct 10, 2021
02ddd0d
Disable testing on windows i386 and Disable parallel processing on Wi…
sneumann Oct 19, 2021
105d503
Merge pull request #583 from sneumann/fix/issue582
sneumann Oct 19, 2021
b13bc1b
bump x.y.z version to even y prior to creation of RELEASE_3_14 branch
nturaga Oct 26, 2021
6db8f84
bump x.y.z version to odd y following creation of RELEASE_3_14 branch
nturaga Oct 26, 2021
062a48a
fix: avoid error message from issue #584
jorainer Nov 3, 2021
dd0bbf2
fix: fix bug in EIC feature grouping
jorainer Nov 19, 2021
6e63896
fix: fix unit test
jorainer Nov 19, 2021
af1e8b9
Merge branch 'jomain'
sneumann Nov 20, 2021
2935453
Use mzML instead of mzData files in testing and vignettes
sneumann Nov 20, 2021
7300273
Surviving mzR without mzData
sneumann Nov 22, 2021
a44d393
Merge pull request #586 from sneumann/fix/removeMzDataTests
sneumann Nov 22, 2021
c967638
Bump version
sneumann Nov 22, 2021
9de027e
feat: add `transformIntensity` method
jorainer Jan 14, 2022
99c0a07
docs: fix missing documentation
jorainer Jan 14, 2022
522c083
refactor: use intensity weighted mean to calculate m/z for scan
jorainer Jan 31, 2022
dc9536d
fix: fix issue 603
jorainer Mar 14, 2022
9492439
Merge pull request #604 from sneumann/jomain
sneumann Mar 17, 2022
0ddb42a
Merge branch 'master' into fix_peak_mz
jorainer Mar 25, 2022
7ca3efc
docs: increase version
jorainer Mar 25, 2022
e99ee74
refactor: allow to choose m/z calculation function
jorainer Mar 28, 2022
4948ad3
Replace links to MassSpecWavelet::sav.gol() with links to MassSpecWav…
zeehio Apr 5, 2022
4b0ce56
feat: add parameter expandMz to featureChromatograms
jorainer Apr 14, 2022
60e2d39
refactor: rewrite function to subset features and chrom peaks
jorainer Apr 17, 2022
87b34e8
Merge pull request #606 from sneumann/fix_peak_mz
sneumann Apr 18, 2022
3b2a4cd
Revert "refactor: allow to choose m/z calculation function"
sneumann Apr 18, 2022
5e771f2
fix merge conflict
sneumann Apr 18, 2022
7cd6d61
Merge branch 'jomain'
sneumann Apr 18, 2022
a2dd2d2
fix NEWS formatting to properly display
lshep Apr 21, 2022
f205ce1
bump x.y.z version to even y prior to creation of RELEASE_3_15 branch
nturaga Apr 26, 2022
71df9e1
bump x.y.z version to odd y following creation of RELEASE_3_15 branch
nturaga Apr 26, 2022
f30d4ef
ci: update to BioC 3.16
jorainer Apr 28, 2022
578e083
ci: install dependencies from BioC
jorainer Apr 28, 2022
feb2e71
ci: change to git global command
jorainer Apr 29, 2022
f47ef2a
refactor: use rbindFill instead of rbind in groupChromPeaks
jorainer Jun 16, 2022
ad590b7
Merge pull request #620 from zeehio/relink-savgol
jorainer Jun 16, 2022
f2c95df
Merge remote-tracking branch 'origin/master'
jorainer Jun 16, 2022
af3d030
doc: update documentation
jorainer Jun 16, 2022
a0e4c20
Fix typo in list element lookup, closes #623
sneumann Jun 29, 2022
4675f17
docs: update/expand documentation for firstBaselineCheck parameter
jorainer Sep 20, 2022
899f366
bump x.y.z version to even y prior to creation of RELEASE_3_16 branch
jwokaty Nov 1, 2022
39f2900
bump x.y.z version to odd y following creation of RELEASE_3_16 branch
jwokaty Nov 1, 2022
dc75b93
Merge remote-tracking branch 'upstream/master'
jorainer Nov 11, 2022
eafacc5
ci: use BioC 3.17
jorainer Nov 11, 2022
d10dee2
Merge remote-tracking branch 'origin/master' into jomain
jorainer Jan 13, 2023
7dbc636
fix: issue #654
jorainer Jan 13, 2023
6a90d6f
Change rgl.* to *3d
dmurdoch Jan 14, 2023
6f4cfab
docs: fix documentation
jorainer Jan 16, 2023
152b515
Merge pull request #655 from sneumann/jomain
jorainer Jan 16, 2023
8cf1803
Merge pull request #654 from dmurdoch/rgl
jorainer Jan 16, 2023
7932133
Update NEWS
jorainer Jan 16, 2023
09a9a4d
refactor: improve reconstructChromPeakSpectra
jorainer Jan 26, 2023
e687ae9
refactor: clean up and remove old functions
jorainer Jan 26, 2023
ce20652
docs: re-add author information
jorainer Feb 10, 2023
19ed3b9
Merge pull request #662 from sneumann/jomain
sneumann Feb 12, 2023
fcab3c6
Several fixes to the longtests
sneumann Mar 11, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .BBSoptions
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
RunLongTests: TRUE
9 changes: 8 additions & 1 deletion .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
local_data/*
.editorconfig
local_data
.git
.travis.yml
.org
^.*\.Rproj$
^\.Rproj\.user$
README.md
Rplots.pdf
.DS_Store
^\.github$
21 changes: 21 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# top-most EditorConfig file
root = true

# Unix-style newlines with a newline ending every file
[*]
charset = utf-8
end_of_line = lf
trim_trailing_whitespace = true
insert_final_newline = false

[*.R]
indent_style = space
indent_size = 4
max_line_length = 80

[Makefile]
indent_style = tab

[.travis.yml]
indent_style = space
indent_size = 2
1 change: 1 addition & 0 deletions .github/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.html
298 changes: 298 additions & 0 deletions .github/workflows/check-bioc.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,298 @@
## Read more about GitHub actions the features of this GitHub Actions workflow
## at https://lcolladotor.github.io/biocthis/articles/biocthis.html#use_bioc_github_action
##
## For more details, check the biocthis developer notes vignette at
## https://lcolladotor.github.io/biocthis/articles/biocthis_dev_notes.html
##
## You can add this workflow to other packages using:
## > biocthis::use_bioc_github_action()
##
## Using GitHub Actions exposes you to many details about how R packages are
## compiled and installed in several operating system.s
### If you need help, please follow the steps listed at
## https://github.com/r-lib/actions#where-to-find-help
##
## If you found an issue specific to biocthis's GHA workflow, please report it
## with the information that will make it easier for others to help you.
## Thank you!

## Acronyms:
## * GHA: GitHub Action
## * OS: operating system

on:
push:
pull_request:

name: R-CMD-check-bioc

## These environment variables control whether to run GHA code later on that is
## specific to testthat, covr, and pkgdown.
##
## If you need to clear the cache of packages, update the number inside
## cache-version as discussed at https://github.com/r-lib/actions/issues/86.
## Note that you can always run a GHA test without the cache by using the word
## "/nocache" in the commit message.
env:
has_testthat: 'true'
run_covr: 'true'
run_pkgdown: 'true'
has_RUnit: 'false'
has_BiocCheck: 'false'
cache-version: 'cache-v1'

jobs:
build-check:
runs-on: ${{ matrix.config.os }}
name: ${{ matrix.config.os }} (${{ matrix.config.r }})
container: ${{ matrix.config.cont }}
## Environment variables unique to this job.

strategy:
fail-fast: false
matrix:
config:
- { os: ubuntu-latest, r: 'devel', bioc: '3.17', cont: "bioconductor/bioconductor_docker:devel", rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest" }
- { os: macOS-latest, r: 'devel', bioc: '3.17'}
- { os: windows-latest, r: 'devel', bioc: '3.17'}
env:
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
RSPM: ${{ matrix.config.rspm }}
NOT_CRAN: true
TZ: UTC
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

steps:

## Set the R library to the directory matching the
## R packages cache step further below when running on Docker (Linux).
- name: Set R Library home on Linux
if: runner.os == 'Linux'
run: |
mkdir /__w/_temp/Library
echo ".libPaths('/__w/_temp/Library')" > ~/.Rprofile

## Most of these steps are the same as the ones in
## https://github.com/r-lib/actions/blob/master/examples/check-standard.yaml
## If they update their steps, we will also need to update ours.
- name: Checkout Repository
uses: actions/checkout@v2

## R is already included in the Bioconductor docker images
- name: Setup R from r-lib
if: runner.os != 'Linux'
uses: r-lib/actions/setup-r@v2
with:
r-version: ${{ matrix.config.r }}

## pandoc is already included in the Bioconductor docker images
- name: Setup pandoc from r-lib
if: runner.os != 'Linux'
uses: r-lib/actions/setup-pandoc@v2

- name: Query dependencies
run: |
install.packages('remotes')
saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2)
shell: Rscript {0}

- name: Cache R packages
if: "!contains(github.event.head_commit.message, '/nocache') && runner.os != 'Linux'"
uses: actions/cache@v2
with:
path: ${{ env.R_LIBS_USER }}
key: ${{ env.cache-version }}-${{ runner.os }}-biocversion-devel-r-devel-${{ hashFiles('.github/depends.Rds') }}
restore-keys: ${{ env.cache-version }}-${{ runner.os }}-biocversion-devel-r-devel-

- name: Cache R packages on Linux
if: "!contains(github.event.head_commit.message, '/nocache') && runner.os == 'Linux' "
uses: actions/cache@v2
with:
path: /home/runner/work/_temp/Library
key: ${{ env.cache-version }}-${{ runner.os }}-biocversion-devel-r-devel-${{ hashFiles('.github/depends.Rds') }}
restore-keys: ${{ env.cache-version }}-${{ runner.os }}-biocversion-devel-r-devel-

- name: Install Linux system dependencies
if: runner.os == 'Linux'
run: |
sysreqs=$(Rscript -e 'cat("apt-get update -y && apt-get install -y", paste(gsub("apt-get install -y ", "", remotes::system_requirements("ubuntu", "20.04")), collapse = " "))')
echo $sysreqs
sudo -s eval "$sysreqs"

- name: Install macOS system dependencies
if: matrix.config.os == 'macOS-latest'
run: |
## Enable installing XML from source if needed
brew install libxml2
echo "XML_CONFIG=/usr/local/opt/libxml2/bin/xml2-config" >> $GITHUB_ENV

## Required to install magick as noted at
## https://github.com/r-lib/usethis/commit/f1f1e0d10c1ebc75fd4c18fa7e2de4551fd9978f#diff-9bfee71065492f63457918efcd912cf2
brew install imagemagick@6

## For textshaping, required by ragg, and required by pkgdown
brew install harfbuzz fribidi

## For installing usethis's dependency gert
brew install libgit2

## required for ncdf4
## brew install netcdf ## Does not work as it is compiled with gcc
## Use pre-compiled libraries from https://mac.r-project.org/libs-4/
curl -O https://mac.r-project.org/libs-4/netcdf-4.7.4-darwin.17-x86_64.tar.gz
tar fvxzm netcdf-4.7.4-darwin.17-x86_64.tar.gz -C /
rm netcdf-4.7.4-darwin.17-x86_64.tar.gz
curl -O https://mac.r-project.org/libs-4/hdf5-1.12.0-darwin.17-x86_64.tar.gz
tar fvxzm hdf5-1.12.0-darwin.17-x86_64.tar.gz -C /
rm hdf5-1.12.0-darwin.17-x86_64.tar.gz
curl -O https://mac.r-project.org/libs-4/szip-2.1.1-darwin.17-x86_64.tar.gz
tar fvxzm szip-2.1.1-darwin.17-x86_64.tar.gz -C /
rm szip-2.1.1-darwin.17-x86_64.tar.gz

- name: Install Windows system dependencies
if: runner.os == 'Windows'
run: |
## Edit below if you have any Windows system dependencies
shell: Rscript {0}

- name: Install BiocManager
run: |
message(paste('****', Sys.time(), 'installing BiocManager ****'))
remotes::install_cran("BiocManager")
shell: Rscript {0}

- name: Set BiocVersion
run: |
BiocManager::install(version = "${{ matrix.config.bioc }}", ask = FALSE)
shell: Rscript {0}

- name: Install dependencies pass 1
run: |
## Try installing the package dependencies in steps. First the local
## dependencies, then any remaining dependencies to avoid the
## issues described at
## https://stat.ethz.ch/pipermail/bioc-devel/2020-April/016675.html
## https://github.com/r-lib/remotes/issues/296
## Ideally, all dependencies should get installed in the first pass.

## Pass #1 at installing dependencies
message(paste('****', Sys.time(), 'pass number 1 at installing dependencies: local dependencies ****'))
remotes::install_local(dependencies = TRUE, repos =
BiocManager::repositories(), build_vignettes = FALSE, upgrade = TRUE)

BiocManager::install(c("rmarkdown", "BiocStyle"))
continue-on-error: true
shell: Rscript {0}

- name: Install dependencies pass 2
run: |
## Pass #2 at installing dependencies
message(paste('****', Sys.time(), 'pass number 2 at installing dependencies: any remaining dependencies ****'))
remotes::install_local(dependencies = TRUE, repos = BiocManager::repositories(), build_vignettes = FALSE, upgrade = TRUE)

## Manually install packages that seem to be skipped.
message(paste('****', Sys.time(), 'force installation of selected packages ****'))
BiocManager::install(c("faahKO"))
BiocManager::install("ProtGenerics")
BiocManager::install("MSnbase")
BiocManager::install("mzR")
BiocManager::install("Spectra")
BiocManager::install("MsBackendMgf")
BiocManager::install("magick")

## For running the checks
message(paste('****', Sys.time(), 'installing rcmdcheck and BiocCheck ****'))
remotes::install_cran("rcmdcheck")
BiocManager::install(c("BiocCheck", "DBI"))
shell: Rscript {0}

- name: Install BiocGenerics
if: env.has_RUnit == 'true'
run: |
## Install BiocGenerics
BiocManager::install("BiocGenerics")
shell: Rscript {0}

- name: Install covr
if: github.ref == 'refs/heads/master' && env.run_covr == 'true' && runner.os == 'Linux'
run: |
remotes::install_cran("covr")
shell: Rscript {0}

- name: Install pkgdown
if: github.ref == 'refs/heads/master' && env.run_pkgdown == 'true' && runner.os == 'Linux'
run: |
remotes::install_github("r-lib/pkgdown")
shell: Rscript {0}

- name: Session info
run: |
options(width = 100)
pkgs <- installed.packages()[, "Package"]
sessioninfo::session_info(pkgs, include_base = TRUE)
shell: Rscript {0}

- name: Run CMD check
env:
_R_CHECK_CRAN_INCOMING_: false
run: |
rcmdcheck::rcmdcheck(
args = c("--no-build-vignettes", "--no-manual", "--timings"),
build_args = c("--no-manual", "--no-resave-data"),
error_on = "warning",
check_dir = "check"
)
shell: Rscript {0}

## Might need an to add this to the if: && runner.os == 'Linux'
- name: Reveal testthat details
if: env.has_testthat == 'true'
run: find . -name testthat.Rout -exec cat '{}' ';'

- name: Run RUnit tests
if: env.has_RUnit == 'true'
run: |
BiocGenerics:::testPackage()
shell: Rscript {0}

- name: Run BiocCheck
if: env.has_BiocCheck == 'true'
run: |
BiocCheck::BiocCheck(
dir('check', 'tar.gz$', full.names = TRUE),
`quit-with-status` = TRUE,
`no-check-R-ver` = TRUE,
`no-check-bioc-help` = TRUE
)
shell: Rscript {0}

- name: Test coverage
if: github.ref == 'refs/heads/master' && env.run_covr == 'true' && runner.os == 'Linux'
run: |
covr::codecov()
shell: Rscript {0}

- name: Install package
if: github.ref == 'refs/heads/master' && env.run_pkgdown == 'true' && runner.os == 'Linux'
run: R CMD INSTALL .

- name: Deploy package
if: github.ref == 'refs/heads/master' && env.run_pkgdown == 'true' && runner.os == 'Linux'
run: |
git config --global user.email "[email protected]"
git config --global user.name "GitHub Actions"
git config --global --add safe.directory /__w/xcms/xcms
Rscript -e "pkgdown::deploy_to_branch(new_process = FALSE)"
shell: bash {0}
## Note that you need to run pkgdown::deploy_to_branch(new_process = FALSE)
## at least one locally before this will work. This creates the gh-pages
## branch (erasing anything you haven't version controlled!) and
## makes the git history recognizable by pkgdown.

- name: Upload check results
if: failure()
uses: actions/upload-artifact@master
with:
name: ${{ runner.os }}-biocversion-devel-r-devel-results
path: check
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,10 @@ src/pwiz/

readme.org
local_data/
.Rproj.user

.Rhistory
xcms.Rproj

Rplots.pdf
.DS_Store
Loading