From 539bba26722e07f6deea1612791c5efd68a70ea6 Mon Sep 17 00:00:00 2001 From: Etienne Bacher <52219252+etiennebacher@users.noreply.github.com> Date: Sat, 20 Jul 2024 17:11:26 +0200 Subject: [PATCH] Fix R CMD check errors on vignette for macOS-R 4.3 (#528) * narrow down workflows * trigger ci * fix * fix * reactive workflows, remove temp one * foo [skip ci] * Remove htmltools * revert dummy change in rbuildignore * compile -> build [skip ci] --- DESCRIPTION | 3 +-- NEWS.md | 5 ++++ vignettes/selection_syntax.Rmd | 41 ++++++++++++++--------------- vignettes/tidyverse_translation.Rmd | 25 ++++++++---------- 4 files changed, 37 insertions(+), 37 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index c10f5071d..6f380849e 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Type: Package Package: datawizard Title: Easy Data Wrangling and Statistical Transformations -Version: 0.12.1 +Version: 0.12.1.9000 Authors@R: c( person("Indrajeet", "Patil", , "patilindrajeet.science@gmail.com", role = "aut", comment = c(ORCID = "0000-0003-1995-6531", Twitter = "@patilindrajeets")), @@ -49,7 +49,6 @@ Suggests: ggplot2 (>= 3.5.0), gt, haven, - htmltools, httr, knitr, lme4, diff --git a/NEWS.md b/NEWS.md index c954a131f..10a2d26a8 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,8 @@ +# datawizard (development version) + +* Remove `htmltools` from `Suggests` in an attempt of fixing an error in CRAN + checks due to failures to build a vignette (#528). + # datawizard 0.12.1 This is a patch release to fix one error on CRAN checks occurring because of a diff --git a/vignettes/selection_syntax.Rmd b/vignettes/selection_syntax.Rmd index 9b501ebd5..3c0953f65 100644 --- a/vignettes/selection_syntax.Rmd +++ b/vignettes/selection_syntax.Rmd @@ -15,8 +15,7 @@ knitr::opts_chunk$set( pkgs <- c( "datawizard", - "dplyr", - "htmltools" + "dplyr" ) if (!all(vapply(pkgs, requireNamespace, quietly = TRUE, FUN.VALUE = logical(1L)))) { @@ -27,18 +26,10 @@ if (!all(vapply(pkgs, requireNamespace, quietly = TRUE, FUN.VALUE = logical(1L)) ```{r load, echo=FALSE, message=FALSE} library(datawizard) library(dplyr) -library(htmltools) set.seed(123) iris <- iris[sample(nrow(iris), 10), ] row.names(iris) <- NULL - -row <- function(...) { - div( - class = "custom_note", - ... - ) -} ``` ```{css, echo=FALSE} @@ -127,18 +118,26 @@ data_select(iris, contains("pal", "ec")) data_select(iris, regex("^Sep|ies")) ``` -```{r echo=FALSE} -row("Note: these functions are not exported by `datawizard` but are detected and -applied internally. This means that they won't be detected by autocompletion -when we write them.") -``` -```{r echo=FALSE} -row("Note #2: because these functions are not exported, they will not create -conflicts with the ones that come from the `tidyverse` and that have the same name. -So we can still use `dplyr` and its friends, it won't change anything for selection -in `datawizard` functions!") -``` + + + +
+

+ Note: these functions are not exported by `datawizard` but are detected and + applied internally. This means that they won't be detected by autocompletion + when we write them. +

+
+ +
+

+ Note #2: because these functions are not exported, they will not create + conflicts with the ones that come from the `tidyverse` and that have the same + name. Therefore, we can still use `dplyr` and its friends, it won't change + anything for selection in `datawizard` functions! +

+
# Excluding variables diff --git a/vignettes/tidyverse_translation.Rmd b/vignettes/tidyverse_translation.Rmd index 6197341d1..e78006008 100644 --- a/vignettes/tidyverse_translation.Rmd +++ b/vignettes/tidyverse_translation.Rmd @@ -22,8 +22,7 @@ knitr::opts_chunk$set( pkgs <- c( "dplyr", "datawizard", - "tidyr", - "htmltools" + "tidyr" ) # since we explicitely put eval = TRUE for some chunks, we can't rely on @@ -36,15 +35,6 @@ if (!all(vapply(pkgs, requireNamespace, quietly = TRUE, FUN.VALUE = logical(1L)) } ``` -```{r echo=FALSE, message=FALSE, eval=evaluate_chunk} -row <- function(...) { - htmltools::div( - class = "custom_note", - ... - ) -} -``` - This vignette can be referred to by citing the following: Patil et al., (2022). datawizard: An R Package for Easy Data Preparation and Statistical Transformations. *Journal of Open Source Software*, *7*(78), 4684, https://doi.org/10.21105/joss.04684 @@ -82,9 +72,16 @@ In this article, we will see how to go through basic data wrangling steps with This way, if you decide to make the switch, you can easily find the translations here. This vignette is largely inspired from `{dplyr}`'s [Getting started vignette](https://dplyr.tidyverse.org/articles/dplyr.html). -```{r echo=FALSE} -row("Note: In this vignette, we use the native pipe-operator, `|>`, which was introduced in R 4.1. Users of R version 3.6 or 4.0 should replace the native pipe by magrittr's one (`%>%`) so that examples work.") -``` + + + +
+

+ Note: In this vignette, we use the native pipe-operator, `|>`, which was + introduced in R 4.1. Users of R version 3.6 or 4.0 should replace the native + pipe by magrittr's one (`%>%`) so that examples work. +

+
```{r, eval = evaluate_chunk} library(dplyr)