From 80a97a81fe834e568e485d531ecb73934449b9e2 Mon Sep 17 00:00:00 2001 From: Carson Date: Fri, 20 Oct 2023 10:47:13 -0500 Subject: [PATCH 1/4] Start v4.10.3 release candidate --- DESCRIPTION | 2 +- NEWS.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index be477e0a60..76d7e1e309 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: plotly Title: Create Interactive Web Graphics via 'plotly.js' -Version: 4.10.2.9000 +Version: 4.10.3 Authors@R: c(person("Carson", "Sievert", role = c("aut", "cre"), email = "cpsievert1@gmail.com", comment = c(ORCID = "0000-0002-4958-2844")), person("Chris", "Parmer", role = "aut", diff --git a/NEWS.md b/NEWS.md index 882d900d4d..a09fa9cf8c 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# 4.10.2.9000 +# 4.10.3 ## Improvements From ab0e95fd6ad926cf200fbe109c11d8f86390e58d Mon Sep 17 00:00:00 2001 From: Carson Date: Fri, 20 Oct 2023 10:54:45 -0500 Subject: [PATCH 2/4] Run tests against CRAN version of ggplot2 --- DESCRIPTION | 1 - 1 file changed, 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 76d7e1e309..4b44767b4f 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -81,7 +81,6 @@ RoxygenNote: 7.2.3 Encoding: UTF-8 Roxygen: list(markdown = TRUE) Config/Needs/check: - tidyverse/ggplot2, rcmdcheck, devtools, reshape2 From 3d1c19218877e8e70d44b131a079f3a0e9df4c18 Mon Sep 17 00:00:00 2001 From: Carson Date: Fri, 20 Oct 2023 15:55:46 -0500 Subject: [PATCH 3/4] Go back to dev ggplot2 (for CI checks) --- DESCRIPTION | 1 + 1 file changed, 1 insertion(+) diff --git a/DESCRIPTION b/DESCRIPTION index 4b44767b4f..76d7e1e309 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -81,6 +81,7 @@ RoxygenNote: 7.2.3 Encoding: UTF-8 Roxygen: list(markdown = TRUE) Config/Needs/check: + tidyverse/ggplot2, rcmdcheck, devtools, reshape2 From 1c4a882b9b12728e6ab8d551f7af5e6eff916a5f Mon Sep 17 00:00:00 2001 From: Carson Date: Fri, 20 Oct 2023 16:39:50 -0500 Subject: [PATCH 4/4] Don't run slow examples --- R/group2NA.R | 2 +- R/highlight.R | 2 +- man/group2NA.Rd | 2 +- man/highlight.Rd | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/R/group2NA.R b/R/group2NA.R index b8c351200a..78af437ed6 100644 --- a/R/group2NA.R +++ b/R/group2NA.R @@ -23,7 +23,7 @@ #' then `groupNames`, then `ordered`. As long as `groupNames` #' contains valid variable names, new rows will also be inserted to separate #' the groups. -#' @examplesIf interactive() || !identical(.Platform$OS.type, "windows") +#' @examplesIf interactive() #' #' # note the insertion of new rows with missing values #' group2NA(mtcars, "vs", "cyl") diff --git a/R/highlight.R b/R/highlight.R index 810bd49d55..17434f92e5 100644 --- a/R/highlight.R +++ b/R/highlight.R @@ -54,7 +54,7 @@ #' @author Carson Sievert #' @references \url{https://plotly-r.com/client-side-linking.html} #' @seealso [attrs_selected()] -#' @examplesIf interactive() || !identical(.Platform$OS.type, "windows") +#' @examplesIf interactive() #' #' # These examples are designed to show you how to highlight/brush a *single* #' # view. For examples of multiple linked views, see `demo(package = "plotly")` diff --git a/man/group2NA.Rd b/man/group2NA.Rd index d647b77be1..ac2ffb658f 100644 --- a/man/group2NA.Rd +++ b/man/group2NA.Rd @@ -45,7 +45,7 @@ In this case, one should also take care to make sure is set to \code{FALSE}. } \examples{ -\dontshow{if (interactive() || !identical(.Platform$OS.type, "windows")) (if (getRversion() >= "3.4") withAutoprint else force)(\{ # examplesIf} +\dontshow{if (interactive()) (if (getRversion() >= "3.4") withAutoprint else force)(\{ # examplesIf} # note the insertion of new rows with missing values group2NA(mtcars, "vs", "cyl") diff --git a/man/highlight.Rd b/man/highlight.Rd index 5aefb10a0a..35f36f9807 100644 --- a/man/highlight.Rd +++ b/man/highlight.Rd @@ -84,7 +84,7 @@ other htmlwidgets will respect these options, such as persistent selection in leaflet (see \code{demo("highlight-leaflet", package = "plotly")}). } \examples{ -\dontshow{if (interactive() || !identical(.Platform$OS.type, "windows")) (if (getRversion() >= "3.4") withAutoprint else force)(\{ # examplesIf} +\dontshow{if (interactive()) (if (getRversion() >= "3.4") withAutoprint else force)(\{ # examplesIf} # These examples are designed to show you how to highlight/brush a *single* # view. For examples of multiple linked views, see `demo(package = "plotly")`