aboutsummaryrefslogtreecommitdiff
path: root/R/pkg
diff options
context:
space:
mode:
authorFelix Cheung <felixcheung_m@hotmail.com>2016-11-11 15:49:55 -0800
committerShivaram Venkataraman <shivaram@cs.berkeley.edu>2016-11-11 15:49:55 -0800
commitba23f768f7419039df85530b84258ec31f0c22b4 (patch)
tree20d35c6fcf8fad0231e8120dee6dbfbf0333c2b6 /R/pkg
parent6e95325fc3726d260054bd6e7c0717b3c139917e (diff)
downloadspark-ba23f768f7419039df85530b84258ec31f0c22b4.tar.gz
spark-ba23f768f7419039df85530b84258ec31f0c22b4.tar.bz2
spark-ba23f768f7419039df85530b84258ec31f0c22b4.zip
[SPARK-18264][SPARKR] build vignettes with package, update vignettes for CRAN release build and add info on release
## What changes were proposed in this pull request? Changes to DESCRIPTION to build vignettes. Changes the metadata for vignettes to generate the recommended format (which is about <10% of size before). Unfortunately it does not look as nice (before - left, after - right) ![image](https://cloud.githubusercontent.com/assets/8969467/20040492/b75883e6-a40d-11e6-9534-25cdd5d59a8b.png) ![image](https://cloud.githubusercontent.com/assets/8969467/20040490/a40f4d42-a40d-11e6-8c91-af00ddcbdad9.png) Also add information on how to run build/release to CRAN later. ## How was this patch tested? manually, unit tests shivaram We need this for branch-2.1 Author: Felix Cheung <felixcheung_m@hotmail.com> Closes #15790 from felixcheung/rpkgvignettes.
Diffstat (limited to 'R/pkg')
-rw-r--r--R/pkg/DESCRIPTION9
-rw-r--r--R/pkg/vignettes/sparkr-vignettes.Rmd9
2 files changed, 11 insertions, 7 deletions
diff --git a/R/pkg/DESCRIPTION b/R/pkg/DESCRIPTION
index 5a83883089..fe41a9e7da 100644
--- a/R/pkg/DESCRIPTION
+++ b/R/pkg/DESCRIPTION
@@ -1,8 +1,8 @@
Package: SparkR
Type: Package
Title: R Frontend for Apache Spark
-Version: 2.0.0
-Date: 2016-08-27
+Version: 2.1.0
+Date: 2016-11-06
Authors@R: c(person("Shivaram", "Venkataraman", role = c("aut", "cre"),
email = "shivaram@cs.berkeley.edu"),
person("Xiangrui", "Meng", role = "aut",
@@ -18,7 +18,9 @@ Depends:
Suggests:
testthat,
e1071,
- survival
+ survival,
+ knitr,
+ rmarkdown
Description: The SparkR package provides an R frontend for Apache Spark.
License: Apache License (== 2.0)
Collate:
@@ -48,3 +50,4 @@ Collate:
'utils.R'
'window.R'
RoxygenNote: 5.0.1
+VignetteBuilder: knitr
diff --git a/R/pkg/vignettes/sparkr-vignettes.Rmd b/R/pkg/vignettes/sparkr-vignettes.Rmd
index 80e876027b..73a5e26a3b 100644
--- a/R/pkg/vignettes/sparkr-vignettes.Rmd
+++ b/R/pkg/vignettes/sparkr-vignettes.Rmd
@@ -1,12 +1,13 @@
---
title: "SparkR - Practical Guide"
output:
- html_document:
- theme: united
+ rmarkdown::html_vignette:
toc: true
toc_depth: 4
- toc_float: true
- highlight: textmate
+vignette: >
+ %\VignetteIndexEntry{SparkR - Practical Guide}
+ %\VignetteEngine{knitr::rmarkdown}
+ \usepackage[utf8]{inputenc}
---
## Overview