Skip to content

Update Spark install instructions #242

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

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 1 addition & 7 deletions .github/workflows/spark-R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,6 @@ jobs:

- uses: r-lib/actions/setup-pandoc@v2

- uses: actions/setup-java@v1
with:
java-version: '8' # The JDK version to make available on the path.
java-package: jdk # (jre, jdk, or jdk+fx) - defaults to jdk
architecture: x64 # (x64 or x86) - defaults to x64

- uses: r-lib/actions/setup-r@v2
with:
r-version: ${{ matrix.config.r }}
Expand All @@ -63,7 +57,7 @@ jobs:

- name: Install Spark
run: |
try(sparklyr::spark_install(verbose = TRUE), silent = TRUE)
try(sparklyr::spark_install(version = "3.4.0", verbose = TRUE), silent = TRUE)
shell: Rscript {0}

- name: Install devel versions
Expand Down
3 changes: 2 additions & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ Suggests:
yardstick
Remotes:
mixOmicsTeam/mixOmics,
r-lib/pillar
r-lib/pillar,
sparklyr/[email protected]
biocViews: mixOmics
Config/testthat/edition: 3
Config/testthat/start-first: parsnip-extension-messaging
Expand Down
5 changes: 2 additions & 3 deletions tests/testthat/helper-objects.R
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,12 @@ run_glmnet <- utils::compareVersion('3.6.0', as.character(getRversion())) > 0

spark_not_installed <- function() {

quietly_inquire_re_spark <- purrr:::quietly(sparklyr::spark_install_find)()
need_install <- try(quietly_inquire_re_spark(), silent = TRUE)
need_install <- purrr:::quietly(sparklyr::spark_install_find)()

if(inherits(need_install, "try-error")) {
need_install <- TRUE
} else {
need_install <- !isTRUE(need_install$installed)
need_install <- !isTRUE(need_install$result$installed)
}
need_install
}
2 changes: 1 addition & 1 deletion tests/testthat/test-spark-boost-tree.R
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## Skip entire file is Spark is not installed
skip_if(spark_not_installed)
skip_if(spark_not_installed())

library(testthat)
library(parsnip)
Expand Down