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

GitHub actions fix: r-cmd-check #316

Merged
merged 92 commits into from
Oct 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
137812c
dependencies: udpate dependency versions
brendanlu Jul 24, 2024
6076719
dependencies: update renv
brendanlu Jul 24, 2024
f705f4a
dependencies: explicitly add devtools to renv.lock
brendanlu Jul 24, 2024
e02c86c
update: add dctii transforms consistent with Scipy
brendanlu Jul 25, 2024
a80ec47
documentation: add roxygen2 comments
brendanlu Jul 25, 2024
aa6cd23
documentation: investigate problem
brendanlu Jul 25, 2024
13b05e9
documentation: remove non ascii character
brendanlu Jul 25, 2024
6e2edf6
documentation: remove deprecated @docType
brendanlu Jul 25, 2024
6706cf6
tests: inverse tests passing for dctii
brendanlu Jul 25, 2024
a3339e5
testing: ensure fft dct algorithm is sensible
brendanlu Jul 25, 2024
26d50ac
testing: fix - pass in ortho into dctii/idctii
brendanlu Jul 25, 2024
34e5871
update: add new mtransform utils
brendanlu Jul 29, 2024
357d6e2
minor: progress save off of laptop devel
brendanlu Jul 29, 2024
0715a5c
update: finish m-product utils (+TESTING)
brendanlu Jul 29, 2024
9a2820d
update: add UNTESTED m_product function
brendanlu Jul 29, 2024
0558340
update: m-product passing error message tests
brendanlu Jul 29, 2024
bd91fbb
minor: mprod testing and param validation
brendanlu Jul 29, 2024
6698ede
bedtime: save untested tsvdm
brendanlu Jul 29, 2024
e2970e8
testing: validate tsvdm tests
brendanlu Jul 31, 2024
364b3af
update: add untested tpca
brendanlu Aug 7, 2024
bca4ab7
update: tpca running
brendanlu Aug 7, 2024
c403c27
update: change unravel_index not working
brendanlu Aug 7, 2024
f174132
fix: tsvdm filling dimensions + update lock
brendanlu Aug 28, 2024
135b7be
update: tpca matrix compression working
brendanlu Aug 28, 2024
bdb65ae
update: return loadings in tpca
brendanlu Aug 28, 2024
fc088b9
minor: minor changes
brendanlu Aug 28, 2024
737f4c8
minor: docstrings in tens.tpca.R
brendanlu Aug 30, 2024
3b37083
minor: (untested) progress save
brendanlu Aug 30, 2024
6d8fe21
Merge branch 'master' of https://github.com/brendanlu/mixOmics
brendanlu Aug 30, 2024
787f3b5
update: tpls 1 test failing
brendanlu Sep 1, 2024
1740df8
update: PASSES TESTS tpls basic sensible algorithm
brendanlu Sep 1, 2024
4887c33
update: UNTESTED tpls canonical & regression
brendanlu Sep 11, 2024
935f9dd
minor: (UNTESTED) fix tpls errors
brendanlu Sep 11, 2024
3879721
fix: update ca certificate to try to fix SSL peer certificate error i…
evaham1 Sep 24, 2024
437b1b8
debug: comment out install system dependencies using 'sysreqs' as thi…
evaham1 Sep 24, 2024
d273cef
comment out test coverage for now as its slow
evaham1 Sep 24, 2024
838871c
comment out slack notification action for now
evaham1 Sep 24, 2024
8b970db
try running github action tests on windows and mac as well as linux
evaham1 Sep 24, 2024
ea02562
update: tpls fix, basic tests pass
brendanlu Sep 24, 2024
0efc4c1
minor: fix stupid linter error
brendanlu Sep 24, 2024
88e0987
minor: suppress annoying warnings in tests
brendanlu Sep 24, 2024
2b40d91
testing: only errors are existing parallel tests
brendanlu Sep 24, 2024
2b47f0f
minor: update renv.lock test results unchanged
brendanlu Sep 24, 2024
3e3d5c9
Merge pull request #313 from brendanlu/master
evaham1 Sep 25, 2024
36b46df
minor: progress save tplsda
brendanlu Sep 25, 2024
137c4ac
try running action without linux docker image
evaham1 Sep 25, 2024
760690b
Merge branch 'github-actions-fix' of https://github.com/mixOmicsTeam/…
evaham1 Sep 25, 2024
63a0019
add action to install curl if running on linux OS
evaham1 Sep 25, 2024
bac206b
update package imports in description file
evaham1 Sep 25, 2024
4433f48
Biocstyle back in suggests description and load it if avaliable for v…
evaham1 Sep 25, 2024
ef77b74
change package doc type to avoid warning during package check
evaham1 Sep 25, 2024
d900d29
install system dependencies using github action 'r-lib/actions/setup-…
evaham1 Sep 25, 2024
ea5acac
add magick package to description suggests as its needed to build the…
evaham1 Sep 25, 2024
4236c68
fix so not exceeding ncores during testing
evaham1 Sep 25, 2024
fa0779d
minor: some doc stuff
brendanlu Sep 25, 2024
37f903d
fixed biocparallel issue in tune.spls test
evaham1 Sep 26, 2024
367ff84
fixed biocparallel asking for too many cpus in vignette.md -> now cmd…
evaham1 Sep 26, 2024
ce72f4d
fix: install xquartz on macos runner to avoid segfault during check
evaham1 Sep 26, 2024
2551d0c
fix: add extra dependencies for linux runner
evaham1 Sep 26, 2024
1b900d6
debug: try installing pdflatex on windows runner to see if fixes buil…
evaham1 Sep 26, 2024
547ee70
temp: run check without error on warning to see if it passes for macO…
evaham1 Sep 26, 2024
b2fe225
debug windows r cmd check query parallel errors
evaham1 Sep 26, 2024
4e1689c
Merge branch 'github-actions-fix' of https://github.com/mixOmicsTeam/…
brendanlu Sep 26, 2024
3fb6127
minor: update docstrings in tens.mproduct.R
brendanlu Sep 26, 2024
271c18f
minor: docs for tens.tpca.R
brendanlu Sep 26, 2024
3d6e620
minor: rest of docs for tens.*
brendanlu Sep 26, 2024
b583431
minor: docs for tplsda too
brendanlu Sep 26, 2024
ba2ca4f
docs: generate a bunch of Rd files
brendanlu Sep 26, 2024
6125ea5
minor: use eqn{} in docstring whoops
brendanlu Sep 26, 2024
906f9a1
minor: update lockfile with magick
brendanlu Sep 26, 2024
692f55b
minor: update renv.lock
brendanlu Sep 26, 2024
f21b0b4
Merge branch 'master' of https://github.com/brendanlu/mixOmics
brendanlu Sep 26, 2024
3c19634
minor: resolve renv inconsistencies
brendanlu Sep 28, 2024
26e73c6
update: completed tens.tplsda.R
brendanlu Sep 28, 2024
cc8bb8e
minor: write tplsda tests - passing
brendanlu Sep 28, 2024
a1ec6e7
minor: tensor testing
brendanlu Sep 29, 2024
19f3c84
minor: .Rd files from devtools::check()
brendanlu Sep 29, 2024
df7d5ea
Merge pull request #314 from brendanlu/master
evaham1 Sep 30, 2024
3a456eb
debug: comment out trying to install tinytex for windows as this fails
evaham1 Sep 30, 2024
abcbb48
Merge branch 'github-actions-fix' of https://github.com/mixOmicsTeam/…
evaham1 Sep 30, 2024
8d3b99f
run devtoolsinstall before rmdcheck to debug workers not finding mixo…
evaham1 Sep 30, 2024
f184030
try running check using devtools rather than rmdcheck to see if can a…
evaham1 Sep 30, 2024
b1aa2fe
try running devtools::check on all three OSs
evaham1 Sep 30, 2024
b6b2733
make linux install pandoc non-interactively
evaham1 Sep 30, 2024
2b176b4
docs: rough, terrible docstrings, to appease devtools
brendanlu Sep 30, 2024
a45ca4a
minor: commit new .rd files for devtools
brendanlu Sep 30, 2024
534d231
Merge pull request #315 from brendanlu/master
evaham1 Sep 30, 2024
3f082f6
install qpdf for linux as needed for devtools:check
evaham1 Sep 30, 2024
91f4231
update actions to run test coverage and slack notification
evaham1 Oct 1, 2024
00eb315
convert all checks to devtools rather than rcmdcheck and update param…
evaham1 Oct 1, 2024
be36772
temp comment out test coverage and notify slack
evaham1 Oct 2, 2024
55da038
uncomment test coverage - run only on scheuled events
evaham1 Oct 2, 2024
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
64 changes: 46 additions & 18 deletions .github/workflows/actions.yml
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ jobs:
fail-fast: false
matrix:
config:
# - { os: windows-latest, r: '${{ needs.versions.outputs.r }}', bioc: '${{ needs.versions.outputs.bioc }}'}
# - { os: macOS-latest, r: '${{ needs.versions.outputs.r }}', bioc: '${{ needs.versions.outputs.bioc }}'}
- { os: windows-latest, r: '${{ needs.versions.outputs.r }}', bioc: '${{ needs.versions.outputs.bioc }}'}
- { os: macOS-latest, r: '${{ needs.versions.outputs.r }}', bioc: '${{ needs.versions.outputs.bioc }}'}
- { os: ubuntu-latest, r: '${{ needs.versions.outputs.r }}', bioc: '${{ needs.versions.outputs.bioc }}', image: 'bioconductor/bioconductor_docker:${{ needs.versions.outputs.bioc }}'}

env:
Expand Down Expand Up @@ -124,17 +124,38 @@ jobs:
key: ${{ runner.os }}-r-${{ matrix.config.r }}-bioc-${{ matrix.config.bioc }}-${{ hashFiles('depends.Rds') }}
restore-keys: ${{ runner.os }}-r-${{ matrix.config.r }}-bioc-${{ matrix.config.bioc }}-

- name: Install system dependencies 🔧
## the below step doesn't work anymore because 'sysreqs' API is archived
# - name: Install system dependencies 🔧
# if: runner.os == 'Linux'
# env:
# RHUB_PLATFORM: linux-x86_64-ubuntu-gcc
# run: |
# Rscript -e "remotes::install_github('r-hub/sysreqs')"
# sysreqs=$(Rscript -e "cat(sysreqs::sysreq_commands('DESCRIPTION'))")
# sudo -s eval "$sysreqs"
# sudo apt-get update && sudo apt-get -y install libcurl4-openssl-dev

- name: Install system and package dependencies using github action 🔧
uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-repositories: 'https://cloud.r-project.org'

- name: Install extra dependencies for macOS
if: runner.os == 'macOS'
run: |
brew install --cask xquartz
brew install gcc

- name: Install extra dependencies for linux
if: runner.os == 'Linux'
env:
RHUB_PLATFORM: linux-x86_64-ubuntu-gcc
run: |
Rscript -e "remotes::install_github('r-hub/sysreqs')"
sysreqs=$(Rscript -e "cat(sysreqs::sysreq_commands('DESCRIPTION'))")
sudo -s eval "$sysreqs"
sudo apt-get update && sudo apt-get -y install libcurl4-openssl-dev
sudo apt-get update
sudo apt-get install -y pandoc-citeproc
sudo apt-get install -y qpdf

- name: Install dependencies 🔨
- name: Install R dependencies 🔨
run: |
options(repos = c(CRAN = "https://cran.r-project.org"))
remotes::install_deps(dependencies = TRUE, repos = BiocManager::repositories(), Ncpus=2)
Expand All @@ -149,17 +170,24 @@ jobs:
sessioninfo::session_info(pkgs, include_base = TRUE)
shell: Rscript {0}

# runs rmdcheck, first runs 'devtools::install to make sure there is a copy of mixOmics the parallel workers can access'
- name: Check ✅
if: (!contains(github.event.head_commit.message, 'skip-check'))
run: rcmdcheck::rcmdcheck(args = c("--no-manual"), error_on = "warning", check_dir = "check")
run: |
remotes::install_cran("devtools", Ncpus=2)
devtools::install()
devtools::check(args = c("--no-manual"), error_on = "warning", check_dir = "check")
shell: Rscript {0}

- name: Check --as-cran ✅ ✅
if: github.event_name == 'schedule' && github.repository == 'mixOmicsTeam/mixOmics'
env:
_R_CHECK_CRAN_INCOMING_: false
run: rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran", "--ignore-vignettes", "--run-dontrun"), error_on = "never", check_dir = "check/asCRAN", build_args = c("--no-build-vignettes"))
run: |
options(devtools.check.dir = "check/asCRAN", devtools.check.warning = "never")
devtools::check(args = c("--no-manual", "--as-cran", "--ignore-vignettes", "--run-dontrun"), build_args = c("--no-build-vignettes"))
shell: Rscript {0}

# - name: BiocCheck 🧬 ✅
# if: github.event_name == 'schedule' && github.repository == 'mixOmicsTeam/mixOmics'
# run: |
Expand Down Expand Up @@ -190,17 +218,17 @@ jobs:
build_args: BIOC_VERSION=${{ needs.versions.outputs.bioc }}

- name: Test coverage 🔍
# if: (matrix.config.os == 'ubuntu-latest' && matrix.config.r == 'release')
if: github.event_name == 'schedule' && github.repository == 'mixOmicsTeam/mixOmics'
# the commands between 'set +e' and 'set -e' are run without throwing any error
run: |
set +e
Rscript -e "covr::codecov(type = c('tests', 'examples'))"
set -e

- name: Notify Slack 📣
uses: 8398a7/action-slack@v3
with:
status: ${{ job.status }}
fields: repo,message,commit,author,action,eventName,ref,workflow,job,took # selectable (default: repo,message)
env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} # set in rep's setting >> secrets
# - name: Notify Slack 📣
# uses: 8398a7/action-slack@v3
# with:
# status: ${{ job.status }}
# fields: repo,message,commit,author,action,eventName,ref,workflow,job,took # selectable (default: repo,message)
# env:
# SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} # set in rep's setting >> secrets
53 changes: 29 additions & 24 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -6,29 +6,34 @@ Depends: R (>= 3.5.0),
MASS,
lattice,
ggplot2
Imports: igraph,
ellipse,
corpcor,
RColorBrewer,
parallel,
dplyr,
tidyr,
reshape2,
methods,
matrixStats,
rARPACK,
gridExtra,
grDevices,
graphics,
stats,
ggrepel,
BiocParallel,
utils
Suggests: BiocStyle,
knitr,
rmarkdown,
testthat,
rgl
Imports:
igraph,
ellipse,
corpcor,
RColorBrewer,
parallel,
dplyr,
tidyr,
reshape2,
methods,
matrixStats,
rARPACK,
gridExtra,
grDevices,
graphics,
stats,
ggrepel,
BiocParallel,
utils,
gsignal
Suggests:
BiocStyle,
knitr,
rmarkdown,
testthat,
rgl,
microbenchmark,
magick
Authors@R:
c(person("Kim-Anh", "Le Cao", role = "aut", email = "[email protected]"),
person("Florian", "Rohart", role = "aut"),
Expand Down Expand Up @@ -64,5 +69,5 @@ biocViews: ImmunoOncology,
MultipleComparison,
Classification,
Regression
RoxygenNote: 7.2.3
RoxygenNote: 7.3.2
Encoding: UTF-8
11 changes: 11 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,7 @@ S3method(summary,mixo_pls)
S3method(summary,mixo_spls)
S3method(summary,pca)
S3method(summary,rcc)
export("%fp%")
export(auroc)
export(background.predict)
export(block.pls)
Expand All @@ -121,15 +122,21 @@ export(color.GreenRed)
export(color.jet)
export(color.mixo)
export(color.spectral)
export(dctii_m_transforms)
export(explained_variance)
export(facewise_product)
export(facewise_transpose)
export(ft)
export(get.BER)
export(get.confusion_matrix)
export(imgCor)
export(impute.nipals)
export(ipca)
export(logratio.transfo)
export(m_product)
export(map)
export(mat.rank)
export(matrix_to_m_transforms)
export(mint.block.pls)
export(mint.block.plsda)
export(mint.block.spls)
Expand Down Expand Up @@ -160,6 +167,10 @@ export(spca)
export(spls)
export(splsda)
export(study_split)
export(tpca)
export(tpls)
export(tplsda)
export(tsvdm)
export(tune)
export(tune.block.splsda)
export(tune.mint.splsda)
Expand Down
Loading
Loading