From c1f91c5fd5a4da37af978cacdc582d255aa55ef4 Mon Sep 17 00:00:00 2001 From: Edgar Ruiz Date: Wed, 18 Oct 2023 09:23:21 -0500 Subject: [PATCH 1/2] Points to dev sparklyr, fixes spark_connect_method() args --- DESCRIPTION | 4 +++- R/spark-connect.R | 5 ++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 8a44ee2..118a5cf 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -22,7 +22,7 @@ Imports: reticulate (>= 1.31), methods, rlang, - sparklyr (>= 1.8.3), + sparklyr (>= 1.8.3.9001), tidyselect, fs, magrittr, @@ -40,3 +40,5 @@ Suggests: tibble, withr Config/testthat/edition: 3 +Remotes: + sparklyr/sparklyr diff --git a/R/spark-connect.R b/R/spark-connect.R index f045529..f885bb0 100644 --- a/R/spark-connect.R +++ b/R/spark-connect.R @@ -7,7 +7,7 @@ spark_connect_method.spark_method_spark_connect <- function( config, app_name, version, - hadoop_version, + packages, extensions, scala_version, ...) { @@ -29,14 +29,13 @@ spark_connect_method.spark_method_databricks_connect <- function( config, app_name, version, - hadoop_version, + packages, extensions, scala_version, ...) { py_spark_connect(master = master, method = method, config = config, ...) } - py_spark_connect <- function(master, token = Sys.getenv("DATABRICKS_TOKEN"), cluster_id = NULL, From b648b47446c86e6bec0444900b51c1347936a051 Mon Sep 17 00:00:00 2001 From: Edgar Ruiz Date: Wed, 18 Oct 2023 09:23:38 -0500 Subject: [PATCH 2/2] Disables coverage CI --- .github/workflows/test-coverage.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml index 9952296..69b0ad0 100644 --- a/.github/workflows/test-coverage.yaml +++ b/.github/workflows/test-coverage.yaml @@ -2,9 +2,9 @@ # Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help on: push: - branches: main + branches: temp pull_request: - branches: main + branches: temp name: test-coverage