You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by fe...@apache.org on 2017/08/24 04:35:20 UTC
spark git commit: [SPARK-21805][SPARKR] Disable R vignettes code on
Windows
Repository: spark
Updated Branches:
refs/heads/master b8aaef49f -> 43cbfad99
[SPARK-21805][SPARKR] Disable R vignettes code on Windows
## What changes were proposed in this pull request?
Code in vignettes requires winutils on windows to run, when publishing to CRAN or building from source, winutils might not be available, so it's better to disable code run (so resulting vigenttes will not have output from code, but text is still there and code is still there)
fix * checking re-building of vignette outputs ... WARNING
and
> %LOCALAPPDATA% not found. Please define the environment variable or restart and enter an installation path in localDir.
## How was this patch tested?
jenkins, appveyor, r-hub
before: https://artifacts.r-hub.io/SparkR_2.2.0.tar.gz-49cecef3bb09db1db130db31604e0293/SparkR.Rcheck/00check.log
after: https://artifacts.r-hub.io/SparkR_2.2.0.tar.gz-86a066c7576f46794930ad114e5cff7c/SparkR.Rcheck/00check.log
Author: Felix Cheung <fe...@hotmail.com>
Closes #19016 from felixcheung/rvigwind.
Project: http://git-wip-us.apache.org/repos/asf/spark/repo
Commit: http://git-wip-us.apache.org/repos/asf/spark/commit/43cbfad9
Tree: http://git-wip-us.apache.org/repos/asf/spark/tree/43cbfad9
Diff: http://git-wip-us.apache.org/repos/asf/spark/diff/43cbfad9
Branch: refs/heads/master
Commit: 43cbfad9992624d89bbb3209d1f5b765c7947bb9
Parents: b8aaef4
Author: Felix Cheung <fe...@hotmail.com>
Authored: Wed Aug 23 21:35:17 2017 -0700
Committer: Felix Cheung <fe...@apache.org>
Committed: Wed Aug 23 21:35:17 2017 -0700
----------------------------------------------------------------------
R/pkg/DESCRIPTION | 2 +-
R/pkg/R/install.R | 6 +++++-
R/pkg/vignettes/sparkr-vignettes.Rmd | 11 +++++++++++
3 files changed, 17 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/spark/blob/43cbfad9/R/pkg/DESCRIPTION
----------------------------------------------------------------------
diff --git a/R/pkg/DESCRIPTION b/R/pkg/DESCRIPTION
index b739d42..d1c846c 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",
http://git-wip-us.apache.org/repos/asf/spark/blob/43cbfad9/R/pkg/R/install.R
----------------------------------------------------------------------
diff --git a/R/pkg/R/install.R b/R/pkg/R/install.R
index ec931be..492dee6 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 {
http://git-wip-us.apache.org/repos/asf/spark/blob/43cbfad9/R/pkg/vignettes/sparkr-vignettes.Rmd
----------------------------------------------------------------------
diff --git a/R/pkg/vignettes/sparkr-vignettes.Rmd b/R/pkg/vignettes/sparkr-vignettes.Rmd
index 2301a64..caeae72 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 to FALSE 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/).
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org