From ba65d6e7d5f503c1d5da4cc17586aed67e7955c3 Mon Sep 17 00:00:00 2001 From: Felix Cheung Date: Sun, 6 Aug 2017 15:52:59 -0700 Subject: [PATCH 1/3] disable eval on windows --- R/pkg/vignettes/sparkr-vignettes.Rmd | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/R/pkg/vignettes/sparkr-vignettes.Rmd b/R/pkg/vignettes/sparkr-vignettes.Rmd index 2301a64576d0..2cc5c15f1744 100644 --- a/R/pkg/vignettes/sparkr-vignettes.Rmd +++ b/R/pkg/vignettes/sparkr-vignettes.Rmd @@ -27,6 +27,17 @@ vignette: > limitations under the License. --> +```{r setup, include=FALSE} +library(knitr) +opts_hooks$set(eval = function(options) { + # override eval only on windows + if (.Platform$OS.type == "windows") { + options$eval = FALSE + } + options +}) +``` + ## Overview SparkR is an R package that provides a light-weight frontend to use Apache Spark from R. With Spark `r packageVersion("SparkR")`, SparkR provides a distributed data frame implementation that supports data processing operations like selection, filtering, aggregation etc. and distributed machine learning using [MLlib](http://spark.apache.org/mllib/). From 7c75073a0bbf9ef489244d58b678a8b2dda3c287 Mon Sep 17 00:00:00 2001 From: Felix Cheung Date: Sun, 20 Aug 2017 19:09:34 -0700 Subject: [PATCH 2/3] add support for no localappdata --- R/pkg/R/install.R | 6 +++++- R/pkg/vignettes/sparkr-vignettes.Rmd | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/R/pkg/R/install.R b/R/pkg/R/install.R index ec931befa285..492dee68e164 100644 --- a/R/pkg/R/install.R +++ b/R/pkg/R/install.R @@ -270,7 +270,11 @@ sparkCachePath <- function() { if (is_windows()) { winAppPath <- Sys.getenv("LOCALAPPDATA", unset = NA) if (is.na(winAppPath)) { - stop(paste("%LOCALAPPDATA% not found.", + message("%LOCALAPPDATA% not found. Falling back to %USERPROFILE%.") + winAppPath <- Sys.getenv("USERPROFILE", unset = NA) + } + if (is.na(winAppPath)) { + stop(paste("%LOCALAPPDATA% and %USERPROFILE% not found.", "Please define the environment variable", "or restart and enter an installation path in localDir.")) } else { diff --git a/R/pkg/vignettes/sparkr-vignettes.Rmd b/R/pkg/vignettes/sparkr-vignettes.Rmd index 2cc5c15f1744..caeae72e37bb 100644 --- a/R/pkg/vignettes/sparkr-vignettes.Rmd +++ b/R/pkg/vignettes/sparkr-vignettes.Rmd @@ -30,7 +30,7 @@ vignette: > ```{r setup, include=FALSE} library(knitr) opts_hooks$set(eval = function(options) { - # override eval only on windows + # override eval to FALSE only on windows if (.Platform$OS.type == "windows") { options$eval = FALSE } From 23f9d5ec42b57d296d67353019b6fa5ea28a6ba6 Mon Sep 17 00:00:00 2001 From: Felix Cheung Date: Wed, 23 Aug 2017 10:26:15 -0700 Subject: [PATCH 3/3] fix description --- R/pkg/DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/pkg/DESCRIPTION b/R/pkg/DESCRIPTION index b739d423a36c..d1c846c04827 100644 --- a/R/pkg/DESCRIPTION +++ b/R/pkg/DESCRIPTION @@ -2,7 +2,7 @@ Package: SparkR Type: Package Version: 2.3.0 Title: R Frontend for Apache Spark -Description: The SparkR package provides an R Frontend for Apache Spark. +Description: Provides an R Frontend for Apache Spark. Authors@R: c(person("Shivaram", "Venkataraman", role = c("aut", "cre"), email = "shivaram@cs.berkeley.edu"), person("Xiangrui", "Meng", role = "aut",