You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by do...@apache.org on 2022/01/28 07:21:52 UTC
[spark] branch master updated: [SPARK-38051][R][DOCS] Update `Roxygen` reference to 7.1.2
This is an automated email from the ASF dual-hosted git repository.
dongjoon pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new 421358d [SPARK-38051][R][DOCS] Update `Roxygen` reference to 7.1.2
421358d is described below
commit 421358d63af395f20e3187fba09eb73cb80a3d0d
Author: Dongjoon Hyun <do...@apache.org>
AuthorDate: Thu Jan 27 23:21:06 2022 -0800
[SPARK-38051][R][DOCS] Update `Roxygen` reference to 7.1.2
### What changes were proposed in this pull request?
This PR aims to update `Roxygen` reference to 7.1.2 for Apache Spark 3.3.0.
### Why are the changes needed?
`Roxygen2` was 7.1.2 since 2021-09-08. So, this touches `R/pkg/DESCRIPTION` file when we build with `-Psparkr`. This PR removes this annoying situation by removing this version mismatch.
- https://cran.r-project.org/web/packages/roxygen2/index.html
```
$ build/sbt -Psparkr compile
$ git diff
diff --git a/R/pkg/DESCRIPTION b/R/pkg/DESCRIPTION
index 6b85bb758a..d147ff2b34 100644
--- a/R/pkg/DESCRIPTION
+++ b/R/pkg/DESCRIPTION
-60,7 +60,7 Collate:
'types.R'
'utils.R'
'window.R'
-RoxygenNote: 7.1.1
+RoxygenNote: 7.1.2
VignetteBuilder: knitr
NeedsCompilation: no
Encoding: UTF-8
```
We have been using `7.1.2` already for testing.
```
$ docker run -it --rm dongjoon/apache-spark-github-action-image:20211228 Rscript -e 'installed.packages()' | grep roxygen2 | grep site-library
roxygen2 "roxygen2" "/usr/local/lib/R/site-library" "7.1.2"
```
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
Pass the CIs.
Closes #35349 from dongjoon-hyun/SPARK-38051.
Authored-by: Dongjoon Hyun <do...@apache.org>
Signed-off-by: Dongjoon Hyun <do...@apache.org>
---
R/pkg/DESCRIPTION | 2 +-
docs/README.md | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/R/pkg/DESCRIPTION b/R/pkg/DESCRIPTION
index 6b85bb7..d147ff2 100644
--- a/R/pkg/DESCRIPTION
+++ b/R/pkg/DESCRIPTION
@@ -60,7 +60,7 @@ Collate:
'types.R'
'utils.R'
'window.R'
-RoxygenNote: 7.1.1
+RoxygenNote: 7.1.2
VignetteBuilder: knitr
NeedsCompilation: no
Encoding: UTF-8
diff --git a/docs/README.md b/docs/README.md
index 5e9a187..0cf5c0a 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -55,12 +55,12 @@ and install these libraries:
```sh
$ sudo Rscript -e 'install.packages(c("knitr", "devtools", "testthat", "rmarkdown"), repos="https://cloud.r-project.org/")'
-$ sudo Rscript -e 'devtools::install_version("roxygen2", version = "7.1.1", repos="https://cloud.r-project.org/")'
+$ sudo Rscript -e 'devtools::install_version("roxygen2", version = "7.1.2", repos="https://cloud.r-project.org/")'
$ sudo Rscript -e "devtools::install_version('pkgdown', version='2.0.1', repos='https://cloud.r-project.org')"
$ sudo Rscript -e "devtools::install_version('preferably', version='0.4', repos='https://cloud.r-project.org')"
```
-Note: Other versions of roxygen2 might work in SparkR documentation generation but `RoxygenNote` field in `$SPARK_HOME/R/pkg/DESCRIPTION` is 7.1.1, which is updated if the version is mismatched.
+Note: Other versions of roxygen2 might work in SparkR documentation generation but `RoxygenNote` field in `$SPARK_HOME/R/pkg/DESCRIPTION` is 7.1.2, which is updated if the version is mismatched.
### API Documentation
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org