From 367b21afd2f8ede3df18763559532ad0246de7e7 Mon Sep 17 00:00:00 2001 From: Carson Date: Fri, 2 Jul 2021 12:55:57 -0500 Subject: [PATCH 01/42] wip implement kaleido() for image exporting --- .github/workflows/R-CMD-check.yaml | 4 +- DESCRIPTION | 3 +- NAMESPACE | 2 + R/kaleido.R | 113 +++++++++++++++++++++++++++++ R/orca.R | 29 ++------ R/plotly.R | 9 +++ man/kaleido.Rd | 53 ++++++++++++++ man/orca.Rd | 12 +-- tests/testthat/helper-vdiffr.R | 26 ++----- 9 files changed, 198 insertions(+), 53 deletions(-) create mode 100644 R/kaleido.R create mode 100644 man/kaleido.Rd diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 2b7b21c07e..60085df677 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -83,9 +83,9 @@ jobs: with: node-version: ${{ matrix.config.node }} - - name: Install orca + - name: Install kaleido if: matrix.config.visual_tests == true - run: npm install -g electron@6.1.4 orca + run: pip install kaleido shell: bash - name: Install phantomjs diff --git a/DESCRIPTION b/DESCRIPTION index a44b1740ad..86df1578ba 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -73,7 +73,8 @@ Suggests: plotlyGeoAssets, forcats, palmerpenguins, - rversions + rversions, + reticulate LazyData: true RoxygenNote: 7.1.1 Encoding: UTF-8 diff --git a/NAMESPACE b/NAMESPACE index 0411fd601d..d7d1a725f3 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -34,6 +34,7 @@ S3method(print,api) S3method(print,api_grid) S3method(print,api_grid_local) S3method(print,api_plot) +S3method(print,kaleidoScope) S3method(print,plotly_data) S3method(to_basic,GeomAbline) S3method(to_basic,GeomAnnotationMap) @@ -136,6 +137,7 @@ export(hide_guides) export(hide_legend) export(highlight) export(highlight_key) +export(kaleido) export(knit_print.api_grid) export(knit_print.api_grid_local) export(knit_print.api_plot) diff --git a/R/kaleido.R b/R/kaleido.R new file mode 100644 index 0000000000..0be6299ca5 --- /dev/null +++ b/R/kaleido.R @@ -0,0 +1,113 @@ +#' Static image exporting via kaleido +#' +#' Static image exporting via [the kaleido python +#' package](https://github.com/plotly/Kaleido/). `kaleido()` imports +#' kaleido into a \pkg{reticulate}d Python session and returns a `$transform()` +#' method for converting R plots into static images (see examples below). +#' +#' @param ... not currently used. +#' @export +#' @return an environment which contains: +#' * `transform()`: a function to convert plots objects into static images, +#' with the following arguments: +#' * `p`: a plot object. +#' * `file`: a file path with a suitable file extension (png, jpg, jpeg, +#' webp, svg, or pdf). +#' * `width`, `height`: The width/height of the exported image in layout +#' pixels. If `scale` is 1, this will also be the width/height of the +#' exported image in physical pixels. +#' * `scale`: The scale factor to use when exporting the figure. A scale +#' factor larger than 1.0 will increase the image resolution with +#' respect to the figure's layout pixel dimensions. Whereas as +#' scale factor of less than 1.0 will decrease the image resolution. +#' * `shutdown()`: a function for shutting down any currently running subprocesses +#' that were launched via `transform()` +#' * `scope`: a reference to the underlying `kaleido.scopes.plotly.PlotlyScope` +#' python object. Modify this object to customize the underlying Chromium +#' subprocess and/or configure other details such as URL to plotly.js, MathJax, etc. +#' @examples +#' +#' \dontrun{ +#' scope <- kaleido() +#' tmp <- tempfile(fileext = ".png") +#' scope$transform(plot_ly(x = 1:10), tmp) +#' file.show(tmp) +#' # Remove and garbage collect to remove +#' # R/Python objects and shutdown subprocesses +#' rm(scope); gc() +#' } +#' +kaleido <- function(...) { + if (!rlang::is_installed("reticulate")) { + stop("`kaleido()` requires the reticulate package.") + } + if (!reticulate::py_available(initialize = TRUE)) { + stop("`kaleido()` requires `reticulate::py_available()` to be `TRUE`. Do you need to install python?") + } + reticulate::py_run_string( + "from kaleido.scopes.plotly import PlotlyScope", + convert = FALSE + ) + scope_name <- paste0("scope_", new_id()) + reticulate::py_run_string( + sprintf("%s = PlotlyScope(plotlyjs='%s')", scope_name, plotlyMainBundlePath()), + convert = FALSE + ) + + scope <- reticulate::py[[scope_name]] + + mapbox <- Sys.getenv("MAPBOX_TOKEN", NA) + if (!is.na(mapbox)) { + scope$mapbox_access_token <- mapbox + } + + res <- list2env(list( + scope = scope, + # https://github.com/plotly/Kaleido/blob/6a46ecae/repos/kaleido/py/kaleido/scopes/plotly.py#L78-L106 + transform = function(p, file = "figure.png", width = NULL, height = NULL, scale = NULL) { + # Perform JSON conversion exactly how the R package would do it + # (this is essentially plotly_json(), without the additional unneeded info) + # and attach as an attribute on the python scope object + scope[["_last_plot"]] <- to_JSON( + plotly_build(p)$x[c("data", "layout", "config")] + ) + # On the python side, _last_plot is a string, so use json.loads() to + # convert to dict(). This should be fine since json is a dependency of the + # BaseScope() https://github.com/plotly/Kaleido/blob/586be5/repos/kaleido/py/kaleido/scopes/base.py#L2 + transform_cmd <- sprintf( + "%s.transform(sys.modules['json'].loads(%s._last_plot), format='%s', width=%s, height=%s, scale=%s)", + scope_name, scope_name, tools::file_ext(file), + reticulate::r_to_py(width), reticulate::r_to_py(height), + reticulate::r_to_py(scale) + ) + # Write the base64 encoded string that transform() returns to disk + # https://github.com/plotly/Kaleido/blame/master/README.md#L52 + reticulate::py_run_string( + sprintf("open('%s', 'wb').write(%s)", file, transform_cmd) + ) + }, + # Shutdown the kaleido subprocesses + # https://github.com/plotly/Kaleido/blob/586be5c/repos/kaleido/py/kaleido/scopes/base.py#L71-L72 + shutdown = function() { + reticulate::py_run_string(paste0(scope_name, ".__del__()")) + } + )) + + # Shutdown subprocesses and delete python scope when + # this object is garbage collected by R + reg.finalizer(res, onexit = TRUE, function(x) { + x$shutdown() + reticulate::py_run_string(paste("del", scope_name)) + }) + + class(res) <- "kaleidoScope" + res +} + +#' @export +print.kaleidoScope <- function(x, ...) { + args <- formals(x$transform) + cat("$transform: function(", paste(names(args), collapse = ", "), ")\n", sep = "") + cat("$shutdown: function()\n") + cat("$scope: ", capture.output(x$scope)) +} diff --git a/R/orca.R b/R/orca.R index 1a394788e4..a5566beb47 100644 --- a/R/orca.R +++ b/R/orca.R @@ -1,13 +1,6 @@ -#' Static image exporting +#' Static image exporting via orca #' -#' Export plotly objects to static images (e.g., pdf, png, jpeg, svg, etc) via the -#' [orca command-line utility](https://github.com/plotly/orca#installation). -#' -#' The `orca()` function is designed for exporting one plotly graph whereas `orca_serve()` -#' is meant for exporting many graphs at once. The former starts and stops an external (nodejs) -#' process everytime it is called whereas the latter starts up a process when called, then -#' returns an `export()` method for exporting graphs as well as a `close()` method for stopping -#' the external (background) process. +#' Superseded by [kaleido()]. #' #' @param p a plotly object. #' @param file output filename. @@ -67,17 +60,14 @@ orca <- function(p, file = "plot.png", format = tools::file_ext(file), parallel_limit = NULL, verbose = FALSE, debug = FALSE, safe = FALSE, more_args = NULL, ...) { + .Deprecated("kaleido") + orca_available() b <- plotly_build(p) # find the relevant plotly.js bundle - plotlyjs <- plotlyjsBundle(b) - plotlyjs_path <- file.path(plotlyjs$src$file, plotlyjs$script) - # package field means src file path should be relative to pkg dir - if (!is.null(plotlyjs$package)) { - plotlyjs_path <- system.file(plotlyjs_path, package = plotlyjs$package) - } + plotlyjs_path <- plotlyMainBundlePath() tmp <- tempfile(fileext = ".json") cat(to_JSON(b$x[c("data", "layout")]), file = tmp) @@ -141,17 +131,14 @@ orca_serve <- function(port = 5151, mathjax = FALSE, safe = FALSE, request_limit keep_alive = TRUE, window_max_number = NULL, quiet = FALSE, debug = FALSE, more_args = NULL, ...) { + .Deprecated("kaleido") + # make sure we have the required infrastructure orca_available() try_library("processx", "orca_serve") # use main bundle since any plot can be thrown at the server - plotlyjs <- plotlyMainBundle() - plotlyjs_path <- file.path(plotlyjs$src$file, plotlyjs$script) - # package field means src file path should be relative to pkg dir - if (!is.null(plotlyjs$package)) { - plotlyjs_path <- system.file(plotlyjs_path, package = plotlyjs$package) - } + plotlyjs_path <- plotlyMainBundlePath() args <- c( "serve", diff --git a/R/plotly.R b/R/plotly.R index 5cfa90d8e3..e350e578bf 100644 --- a/R/plotly.R +++ b/R/plotly.R @@ -487,6 +487,15 @@ plotlyMainBundle <- function() { ) } +plotlyMainBundlePath <- function() { + dep <- plotlyMainBundle() + path <- file.path(dep$src$file, dep$script) + if (!is.null(dep$package)) { + path <- system.file(path, package = dep$package) + } + path +} + plotlyHtmlwidgetsCSS <- function() { htmltools::htmlDependency( name = "plotly-htmlwidgets-css", diff --git a/man/kaleido.Rd b/man/kaleido.Rd new file mode 100644 index 0000000000..e7658096b5 --- /dev/null +++ b/man/kaleido.Rd @@ -0,0 +1,53 @@ +% Generated by roxygen2: do not edit by hand +% Please edit documentation in R/kaleido.R +\name{kaleido} +\alias{kaleido} +\title{Static image exporting via kaleido} +\usage{ +kaleido(...) +} +\arguments{ +\item{...}{not currently used.} +} +\value{ +an environment which contains: +\itemize{ +\item \code{transform()}: a function to convert plots objects into static images, +with the following arguments: +\itemize{ +\item \code{p}: a plot object. +\item \code{file}: a file path with a suitable file extension (png, jpg, jpeg, +webp, svg, or pdf). +\item \code{width}, \code{height}: The width/height of the exported image in layout +pixels. If \code{scale} is 1, this will also be the width/height of the +exported image in physical pixels. +\item \code{scale}: The scale factor to use when exporting the figure. A scale +factor larger than 1.0 will increase the image resolution with +respect to the figure's layout pixel dimensions. Whereas as +scale factor of less than 1.0 will decrease the image resolution. +} +\item \code{shutdown()}: a function for shutting down any currently running subprocesses +that were launched via \code{transform()} +\item \code{scope}: a reference to the underlying \code{kaleido.scopes.plotly.PlotlyScope} +python object. Modify this object to customize the underlying Chromium +subprocess and/or configure other details such as URL to plotly.js, MathJax, etc. +} +} +\description{ +Static image exporting via \href{https://github.com/plotly/Kaleido/}{the kaleido python package}. \code{kaleido()} imports +kaleido into a \pkg{reticulate}d Python session and returns a \verb{$transform()} +method for converting R plots into static images (see examples below). +} +\examples{ + +\dontrun{ + scope <- kaleido() + tmp <- tempfile(fileext = ".png") + scope$transform(plot_ly(x = 1:10), tmp) + file.show(tmp) + # Remove and garbage collect to remove + # R/Python objects and shutdown subprocesses + rm(scope); gc() +} + +} diff --git a/man/orca.Rd b/man/orca.Rd index d13fc0ad28..ccfcd1c86c 100644 --- a/man/orca.Rd +++ b/man/orca.Rd @@ -3,7 +3,7 @@ \name{orca} \alias{orca} \alias{orca_serve} -\title{Static image exporting} +\title{Static image exporting via orca} \usage{ orca( p, @@ -80,15 +80,7 @@ for specifying display and/or electron options, such as \code{--enable-webgl} or \item{quiet}{Suppress all logging info.} } \description{ -Export plotly objects to static images (e.g., pdf, png, jpeg, svg, etc) via the -\href{https://github.com/plotly/orca#installation}{orca command-line utility}. -} -\details{ -The \code{orca()} function is designed for exporting one plotly graph whereas \code{orca_serve()} -is meant for exporting many graphs at once. The former starts and stops an external (nodejs) -process everytime it is called whereas the latter starts up a process when called, then -returns an \code{export()} method for exporting graphs as well as a \code{close()} method for stopping -the external (background) process. +Superseded by \code{\link[=kaleido]{kaleido()}}. } \section{Methods}{ diff --git a/tests/testthat/helper-vdiffr.R b/tests/testthat/helper-vdiffr.R index 2079e50f5d..b27435a1e8 100644 --- a/tests/testthat/helper-vdiffr.R +++ b/tests/testthat/helper-vdiffr.R @@ -3,20 +3,12 @@ visual_testing <- grepl("true", Sys.getenv("VISUAL_TESTS"), fixed = TRUE) message("Visual testing is ", if (!visual_testing) "not ", "enabled.") # start up the orca image server -if (visual_testing) { - # try 20 random ports - for (vdiff_port_tries in 1:20) { - port <- floor(runif(1, 3001, 8000)) - success <- tryFALSE({ - # init image server with webgl enabled - # maybe someday this won't be necessary - # https://github.com/plotly/orca/issues/127 - orcaServer <- orca_serve(port = port, more_args = "--enable-webgl") - orcaServer$process$is_alive() && is.null(orcaServer$process$get_exit_status()) - }) - if (success) break - } -} +imageServer <- if (visual_testing) { + kaleido() +} else { + list(transform = function(...) stop("Visual testing is disabled!")) +} + expect_doppelganger <- function(p, name, ...) { @@ -53,13 +45,9 @@ write_plotly_svg <- function(p, file) { p$x$data <- Map(function(tr, id) { tr$uid <- id; tr }, p$x$data, uid_data) # write svg to disk - # NOTE TO SELF: yes, it would be great to use `orca_serve()` here, but it gives - # slightly different results from `orca()` (ordering of attributes are different) - # and `orca_serve()` doesn't seem to run reliably everywhere owd <- setwd(dirname(file)) on.exit(setwd(owd)) - # NOTE: the dimensions here should match the server args part of xvfb-run - orcaServer$export(p, file = basename(file), width = 640, height = 480) + imageServer$transform(p, file = basename(file), width = 640, height = 480) # strip out non-deterministic fullLayout.uid # TODO: if and when plotly provides an API to pre-specify, use it! From cae8919a73f541cf2c8a48b1ebc59f3e86b1f319 Mon Sep 17 00:00:00 2001 From: Carson Date: Fri, 2 Jul 2021 13:11:07 -0500 Subject: [PATCH 02/42] Fix sf on mac --- .github/workflows/R-CMD-check.yaml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 60085df677..a0b5286522 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -72,12 +72,19 @@ jobs: key: ${{ matrix.config.os }}-${{ steps.install-r.outputs.installed-r-version }}-1-${{ hashFiles('.github/r-depends.rds') }} restore-keys: ${{ matrix.config.os }}-${{ steps.install-r.outputs.installed-r-version }}-1- - - name: Install system dependencies + - name: Install Linux sysdeps if: runner.os == 'Linux' run: | pak::local_system_requirements(execute = TRUE) pak::pkg_system_requirements("rcmdcheck", execute = TRUE) shell: Rscript {0} + + - name: Install Mac sysdeps + if: runner.os == 'macOS' + run: | + brew install pkg-config + brew install gdal + shell: bash - uses: actions/setup-node@v1 with: From 1c592aedeadc796845a1d74fbbbd796458359ad2 Mon Sep 17 00:00:00 2001 From: Carson Date: Fri, 2 Jul 2021 13:23:23 -0500 Subject: [PATCH 03/42] Try again --- .github/workflows/R-CMD-check.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index a0b5286522..4c406e75c2 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -84,12 +84,9 @@ jobs: run: | brew install pkg-config brew install gdal + Rscript -e 'install.packages("sf", configure.args = "--with-proj-lib=/usr/local/lib/")' shell: bash - - uses: actions/setup-node@v1 - with: - node-version: ${{ matrix.config.node }} - - name: Install kaleido if: matrix.config.visual_tests == true run: pip install kaleido From 1fcd7099a9d2c61461fe4ce5f4ee9d17630d4072 Mon Sep 17 00:00:00 2001 From: Carson Date: Fri, 2 Jul 2021 13:37:07 -0500 Subject: [PATCH 04/42] sf is such a headache --- .github/workflows/R-CMD-check.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 4c406e75c2..76ffdea137 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -84,7 +84,6 @@ jobs: run: | brew install pkg-config brew install gdal - Rscript -e 'install.packages("sf", configure.args = "--with-proj-lib=/usr/local/lib/")' shell: bash - name: Install kaleido @@ -97,11 +96,11 @@ jobs: run: | pak::pak("shinytest") shinytest::installDependencies() - pak::pak() shell: Rscript {0} - name: Install dependencies run: | + options(install.packages.check.source = "no") pak::local_install_dev_deps(upgrade = TRUE) pak::pkg_install("rcmdcheck") shell: Rscript {0} From 9f1c8fbc5d3212f864a5918b9017e4e51bc7836f Mon Sep 17 00:00:00 2001 From: Carson Date: Fri, 2 Jul 2021 14:11:11 -0500 Subject: [PATCH 05/42] cleanup print method --- NAMESPACE | 1 + R/kaleido.R | 11 ++++++++++- man/print.kaleidoScope.Rd | 17 +++++++++++++++++ 3 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 man/print.kaleidoScope.Rd diff --git a/NAMESPACE b/NAMESPACE index d7d1a725f3..381958839d 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -262,6 +262,7 @@ importFrom(tidyr,unnest) importFrom(tools,file_ext) importFrom(tools,file_path_sans_ext) importFrom(utils,browseURL) +importFrom(utils,capture.output) importFrom(utils,data) importFrom(utils,file.edit) importFrom(utils,getFromNamespace) diff --git a/R/kaleido.R b/R/kaleido.R index 0be6299ca5..331cf73374 100644 --- a/R/kaleido.R +++ b/R/kaleido.R @@ -104,10 +104,19 @@ kaleido <- function(...) { res } + +#' Print method for kaleido +#' +#' S3 method for [kaleido()]. +#' +#' @param x a [kaleido()] object. +#' @param ... currently unused. #' @export +#' @importFrom utils capture.output +#' @keywords internal print.kaleidoScope <- function(x, ...) { args <- formals(x$transform) cat("$transform: function(", paste(names(args), collapse = ", "), ")\n", sep = "") cat("$shutdown: function()\n") - cat("$scope: ", capture.output(x$scope)) + cat("$scope: ", utils::capture.output(x$scope)) } diff --git a/man/print.kaleidoScope.Rd b/man/print.kaleidoScope.Rd new file mode 100644 index 0000000000..a1020407a0 --- /dev/null +++ b/man/print.kaleidoScope.Rd @@ -0,0 +1,17 @@ +% Generated by roxygen2: do not edit by hand +% Please edit documentation in R/kaleido.R +\name{print.kaleidoScope} +\alias{print.kaleidoScope} +\title{Print method for kaleido} +\usage{ +\method{print}{kaleidoScope}(x, ...) +} +\arguments{ +\item{x}{a \code{\link[=kaleido]{kaleido()}} object.} + +\item{...}{currently unused.} +} +\description{ +S3 method for \code{\link[=kaleido]{kaleido()}}. +} +\keyword{internal} From 22ea199b3f18101154a740a3198a606340c6d6f3 Mon Sep 17 00:00:00 2001 From: Carson Date: Fri, 2 Jul 2021 14:22:11 -0500 Subject: [PATCH 06/42] attempt to 'fix' conda install --- .github/workflows/R-CMD-check.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 76ffdea137..9708417625 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -88,7 +88,10 @@ jobs: - name: Install kaleido if: matrix.config.visual_tests == true - run: pip install kaleido + run: | + pip install kaleido + conda install -c conda-forge python-kaleido + sudo chmod 777 -R /usr/local/miniconda shell: bash - name: Install phantomjs From d88de966bf9e0032cd9da90181dbe0c417fbbbf6 Mon Sep 17 00:00:00 2001 From: Carson Date: Fri, 2 Jul 2021 14:31:42 -0500 Subject: [PATCH 07/42] attempt to 'fix' conda install --- .github/workflows/R-CMD-check.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 9708417625..10c216715f 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -89,9 +89,8 @@ jobs: - name: Install kaleido if: matrix.config.visual_tests == true run: | - pip install kaleido + unset SUDO_UID SUDO_GID SUDO_USER >> ~/.bashrc conda install -c conda-forge python-kaleido - sudo chmod 777 -R /usr/local/miniconda shell: bash - name: Install phantomjs From 88b1d3f5cef4b6a7743f67d8840648f7c9851fea Mon Sep 17 00:00:00 2001 From: Carson Date: Fri, 2 Jul 2021 14:38:46 -0500 Subject: [PATCH 08/42] attempt to 'fix' conda install --- .github/workflows/R-CMD-check.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 10c216715f..d0c317b2a4 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -89,7 +89,7 @@ jobs: - name: Install kaleido if: matrix.config.visual_tests == true run: | - unset SUDO_UID SUDO_GID SUDO_USER >> ~/.bashrc + sudo chmod 777 -R /usr/local/miniconda conda install -c conda-forge python-kaleido shell: bash From 40bd2b13762757663ba60404dbc8de8c5904d40f Mon Sep 17 00:00:00 2001 From: Carson Date: Fri, 2 Jul 2021 14:48:53 -0500 Subject: [PATCH 09/42] attempt to 'fix' conda install --- .github/workflows/R-CMD-check.yaml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index d0c317b2a4..63caef7b34 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -56,6 +56,16 @@ jobs: http-user-agent: ${{ matrix.config.http-user-agent }} - uses: r-lib/actions/setup-pandoc@v1 + + - name: Set up Python 3.8 + uses: actions/setup-python@v2 + with: + python-version: 3.8 + + - name: Install kaleido + if: matrix.config.visual_tests == true + run: conda install -c conda-forge python-kaleido + shell: bash - name: Install pak and query dependencies run: | @@ -85,13 +95,6 @@ jobs: brew install pkg-config brew install gdal shell: bash - - - name: Install kaleido - if: matrix.config.visual_tests == true - run: | - sudo chmod 777 -R /usr/local/miniconda - conda install -c conda-forge python-kaleido - shell: bash - name: Install phantomjs if: matrix.config.shinytest == true From 053beb7092fbe7ea1a40169ba3e903a543968891 Mon Sep 17 00:00:00 2001 From: Carson Date: Fri, 2 Jul 2021 14:51:45 -0500 Subject: [PATCH 10/42] attempt to 'fix' conda install --- .github/workflows/R-CMD-check.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 63caef7b34..ca52a6ddb1 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -64,7 +64,9 @@ jobs: - name: Install kaleido if: matrix.config.visual_tests == true - run: conda install -c conda-forge python-kaleido + run: | + unset SUDO_UID SUDO_GID SUDO_USER + conda install -c conda-forge python-kaleido shell: bash - name: Install pak and query dependencies From 093c771505454b9c7212d56ae6e5ca058bdd1124 Mon Sep 17 00:00:00 2001 From: Carson Date: Fri, 2 Jul 2021 14:54:52 -0500 Subject: [PATCH 11/42] attempt to 'fix' conda install --- .github/workflows/R-CMD-check.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index ca52a6ddb1..a7e1264182 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -65,7 +65,8 @@ jobs: - name: Install kaleido if: matrix.config.visual_tests == true run: | - unset SUDO_UID SUDO_GID SUDO_USER + conda config --add channels conda-canary + conda update -n base conda conda install -c conda-forge python-kaleido shell: bash From bf029d34038d70ac380abbea0ef831f6e86ed5de Mon Sep 17 00:00:00 2001 From: Carson Date: Fri, 2 Jul 2021 14:59:48 -0500 Subject: [PATCH 12/42] attempt to 'fix' conda install --- .github/workflows/R-CMD-check.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index a7e1264182..cd6c2f0746 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -61,6 +61,11 @@ jobs: uses: actions/setup-python@v2 with: python-version: 3.8 + + - name: Hack + if: matrix.config.visual_tests == true + run: unset SUDO_UID SUDO_GID SUDO_USER >> ~/.bashrc + shell: bash - name: Install kaleido if: matrix.config.visual_tests == true From 525eb1e2073c48ca6463a569b48bb14402fe59a8 Mon Sep 17 00:00:00 2001 From: Carson Date: Fri, 2 Jul 2021 15:02:13 -0500 Subject: [PATCH 13/42] give up on conda --- .github/workflows/R-CMD-check.yaml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index cd6c2f0746..27b6a4884f 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -61,18 +61,11 @@ jobs: uses: actions/setup-python@v2 with: python-version: 3.8 - - - name: Hack - if: matrix.config.visual_tests == true - run: unset SUDO_UID SUDO_GID SUDO_USER >> ~/.bashrc - shell: bash - name: Install kaleido if: matrix.config.visual_tests == true run: | - conda config --add channels conda-canary - conda update -n base conda - conda install -c conda-forge python-kaleido + pip install kaleido shell: bash - name: Install pak and query dependencies From a43ceed3ef51ffa9b747d41940fec00c13f89dbe Mon Sep 17 00:00:00 2001 From: Carson Date: Fri, 2 Jul 2021 15:04:25 -0500 Subject: [PATCH 14/42] attempt to 'fix' conda install --- .github/workflows/R-CMD-check.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 27b6a4884f..e63dde958c 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -62,10 +62,15 @@ jobs: with: python-version: 3.8 + - name: Fix Conda permissions on macOS + if: runner.os == 'macOS' + run: sudo chown -R $UID $CONDA + - name: Install kaleido if: matrix.config.visual_tests == true run: | pip install kaleido + conda install -c conda-forge python-kaleido shell: bash - name: Install pak and query dependencies From bef0e187857ae003218e4293d178948d083166f8 Mon Sep 17 00:00:00 2001 From: Carson Date: Fri, 2 Jul 2021 15:16:28 -0500 Subject: [PATCH 15/42] bring back sf --- .github/workflows/R-CMD-check.yaml | 18 ++++-------------- DESCRIPTION | 1 + 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index e63dde958c..4dfdd9e342 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -61,15 +61,12 @@ jobs: uses: actions/setup-python@v2 with: python-version: 3.8 - - - name: Fix Conda permissions on macOS - if: runner.os == 'macOS' - run: sudo chown -R $UID $CONDA - + + # https://github.com/nextstrain/conda/issues/5 - name: Install kaleido if: matrix.config.visual_tests == true run: | - pip install kaleido + sudo chown -R $UID $CONDA conda install -c conda-forge python-kaleido shell: bash @@ -94,13 +91,6 @@ jobs: pak::local_system_requirements(execute = TRUE) pak::pkg_system_requirements("rcmdcheck", execute = TRUE) shell: Rscript {0} - - - name: Install Mac sysdeps - if: runner.os == 'macOS' - run: | - brew install pkg-config - brew install gdal - shell: bash - name: Install phantomjs if: matrix.config.shinytest == true @@ -111,7 +101,7 @@ jobs: - name: Install dependencies run: | - options(install.packages.check.source = "no") + if (.Platform[['OS.type']] == 'windows' || Sys.info()[['sysname']] == 'Darwin') options(pkgType = 'binary') pak::local_install_dev_deps(upgrade = TRUE) pak::pkg_install("rcmdcheck") shell: Rscript {0} diff --git a/DESCRIPTION b/DESCRIPTION index 86df1578ba..0b92e69a83 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -65,6 +65,7 @@ Suggests: webshot, listviewer, dendextend, + sf, maptools, rgeos, png, From 8c39425eb57b3b32a13f1341634687857ccf85d0 Mon Sep 17 00:00:00 2001 From: Carson Date: Fri, 2 Jul 2021 15:21:03 -0500 Subject: [PATCH 16/42] install kaleido in reticulate env --- .github/workflows/R-CMD-check.yaml | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 4dfdd9e342..26c4488010 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -56,19 +56,6 @@ jobs: http-user-agent: ${{ matrix.config.http-user-agent }} - uses: r-lib/actions/setup-pandoc@v1 - - - name: Set up Python 3.8 - uses: actions/setup-python@v2 - with: - python-version: 3.8 - - # https://github.com/nextstrain/conda/issues/5 - - name: Install kaleido - if: matrix.config.visual_tests == true - run: | - sudo chown -R $UID $CONDA - conda install -c conda-forge python-kaleido - shell: bash - name: Install pak and query dependencies run: | @@ -105,6 +92,20 @@ jobs: pak::local_install_dev_deps(upgrade = TRUE) pak::pkg_install("rcmdcheck") shell: Rscript {0} + + - name: Set up Python 3.8 + uses: actions/setup-python@v2 + with: + python-version: 3.8 + + # https://github.com/nextstrain/conda/issues/5 + - name: Install kaleido + if: matrix.config.visual_tests == true + run: | + sudo chown -R $UID $CONDA + #conda install -c conda-forge python-kaleido + Rscript -e "reticulate::conda_install('r-reticulate', 'kaleido', channel = 'python-kaleido')" + shell: bash - name: Session info run: | From 0d7dfc08ea3adcc4eb1553b2004ef12d8e588f25 Mon Sep 17 00:00:00 2001 From: Carson Date: Fri, 2 Jul 2021 15:27:35 -0500 Subject: [PATCH 17/42] sffff --- .github/workflows/R-CMD-check.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 26c4488010..02ffdcd7ab 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -88,7 +88,7 @@ jobs: - name: Install dependencies run: | - if (.Platform[['OS.type']] == 'windows' || Sys.info()[['sysname']] == 'Darwin') options(pkgType = 'binary') + if (Sys.info()[['sysname']] == 'Darwin') options(pkgType = 'mac.binary') pak::local_install_dev_deps(upgrade = TRUE) pak::pkg_install("rcmdcheck") shell: Rscript {0} From 260c6e6871ad3dd1e63c53dd9071dac64fe901d4 Mon Sep 17 00:00:00 2001 From: Carson Date: Fri, 2 Jul 2021 15:29:13 -0500 Subject: [PATCH 18/42] ignore sf again --- DESCRIPTION | 1 - 1 file changed, 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 0b92e69a83..86df1578ba 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -65,7 +65,6 @@ Suggests: webshot, listviewer, dendextend, - sf, maptools, rgeos, png, From d26fb063517a09611994c247c4cd63c2bb696ae4 Mon Sep 17 00:00:00 2001 From: Carson Date: Fri, 2 Jul 2021 15:35:00 -0500 Subject: [PATCH 19/42] fix --- .github/workflows/R-CMD-check.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 02ffdcd7ab..0c31f006fd 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -104,7 +104,7 @@ jobs: run: | sudo chown -R $UID $CONDA #conda install -c conda-forge python-kaleido - Rscript -e "reticulate::conda_install('r-reticulate', 'kaleido', channel = 'python-kaleido')" + Rscript -e "reticulate::conda_install('r-reticulate', 'python-kaleido', channel = 'conda-forge')" shell: bash - name: Session info From 5a12147fb2b09a4816069632b532bd734b537e22 Mon Sep 17 00:00:00 2001 From: Carson Date: Fri, 2 Jul 2021 15:51:39 -0500 Subject: [PATCH 20/42] debug --- .github/workflows/R-CMD-check.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 0c31f006fd..5eef9bfddd 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -103,8 +103,9 @@ jobs: if: matrix.config.visual_tests == true run: | sudo chown -R $UID $CONDA - #conda install -c conda-forge python-kaleido Rscript -e "reticulate::conda_install('r-reticulate', 'python-kaleido', channel = 'conda-forge')" + Rscript -e "reticulate::py_config()" + Rscript -e "reticulate::conda_list()" shell: bash - name: Session info From e3b565e5d8f8ab84d8825f5d464872ba613917bd Mon Sep 17 00:00:00 2001 From: Carson Date: Fri, 2 Jul 2021 16:11:36 -0500 Subject: [PATCH 21/42] Use import() for better namespacing --- R/kaleido.R | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/R/kaleido.R b/R/kaleido.R index 331cf73374..088ee24fd0 100644 --- a/R/kaleido.R +++ b/R/kaleido.R @@ -44,17 +44,14 @@ kaleido <- function(...) { if (!reticulate::py_available(initialize = TRUE)) { stop("`kaleido()` requires `reticulate::py_available()` to be `TRUE`. Do you need to install python?") } - reticulate::py_run_string( - "from kaleido.scopes.plotly import PlotlyScope", - convert = FALSE - ) + + py <- reticulate::py scope_name <- paste0("scope_", new_id()) - reticulate::py_run_string( - sprintf("%s = PlotlyScope(plotlyjs='%s')", scope_name, plotlyMainBundlePath()), - convert = FALSE + py[[scope_name]] <- reticulate::import("kaleido")$scopes$plotly$PlotlyScope( + plotlyjs = plotlyMainBundlePath() ) - scope <- reticulate::py[[scope_name]] + scope <- py[[scope_name]] mapbox <- Sys.getenv("MAPBOX_TOKEN", NA) if (!is.na(mapbox)) { From 73caad6aa7af411cf417430457b5ac1acecd8aad Mon Sep 17 00:00:00 2001 From: Carson Date: Fri, 2 Jul 2021 16:22:19 -0500 Subject: [PATCH 22/42] :fingers-crossed: --- .github/workflows/R-CMD-check.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 5eef9bfddd..099540cef7 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -103,7 +103,8 @@ jobs: if: matrix.config.visual_tests == true run: | sudo chown -R $UID $CONDA - Rscript -e "reticulate::conda_install('r-reticulate', 'python-kaleido', channel = 'conda-forge')" + Rscript -e "reticulate::conda_install('r-reticulate', 'python-kaleido')" + Rscript -e "reticulate::use_condaenv('r-reticulate')" Rscript -e "reticulate::py_config()" Rscript -e "reticulate::conda_list()" shell: bash From 52a4674c8596a7cefe6f2edb5a615fd076b3c4aa Mon Sep 17 00:00:00 2001 From: Carson Date: Fri, 2 Jul 2021 16:38:34 -0500 Subject: [PATCH 23/42] use a special conda env --- .github/workflows/R-CMD-check.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 099540cef7..b6050bb524 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -103,8 +103,8 @@ jobs: if: matrix.config.visual_tests == true run: | sudo chown -R $UID $CONDA - Rscript -e "reticulate::conda_install('r-reticulate', 'python-kaleido')" - Rscript -e "reticulate::use_condaenv('r-reticulate')" + Rscript -e "reticulate::conda_install('visual-testing', 'python-kaleido')" + Rscript -e "reticulate::use_condaenv('visual-testing')" Rscript -e "reticulate::py_config()" Rscript -e "reticulate::conda_list()" shell: bash From df8d6cd584a87f7e41020d3ace9a8a3ddbe1c083 Mon Sep 17 00:00:00 2001 From: Carson Date: Fri, 2 Jul 2021 16:40:09 -0500 Subject: [PATCH 24/42] try installing miniconda first --- .github/workflows/R-CMD-check.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index b6050bb524..766cc14eb4 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -103,6 +103,7 @@ jobs: if: matrix.config.visual_tests == true run: | sudo chown -R $UID $CONDA + Rscript -e "reticulate::install_miniconda()" Rscript -e "reticulate::conda_install('visual-testing', 'python-kaleido')" Rscript -e "reticulate::use_condaenv('visual-testing')" Rscript -e "reticulate::py_config()" From 705235f133c01d9dbeeb0864df106a32f62c64ad Mon Sep 17 00:00:00 2001 From: Carson Date: Fri, 2 Jul 2021 16:44:34 -0500 Subject: [PATCH 25/42] use miniconda --- .github/workflows/R-CMD-check.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 766cc14eb4..57dd3535c6 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -105,7 +105,7 @@ jobs: sudo chown -R $UID $CONDA Rscript -e "reticulate::install_miniconda()" Rscript -e "reticulate::conda_install('visual-testing', 'python-kaleido')" - Rscript -e "reticulate::use_condaenv('visual-testing')" + Rscript -e "reticulate::use_miniconda('visual-testing')" Rscript -e "reticulate::py_config()" Rscript -e "reticulate::conda_list()" shell: bash From d101fcc136031dc8a3e2c713a32a48a2c43b1a81 Mon Sep 17 00:00:00 2001 From: Carson Date: Fri, 2 Jul 2021 16:55:59 -0500 Subject: [PATCH 26/42] go back to r-reticulate --- .github/workflows/R-CMD-check.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 57dd3535c6..5dc47a7a53 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -104,8 +104,8 @@ jobs: run: | sudo chown -R $UID $CONDA Rscript -e "reticulate::install_miniconda()" - Rscript -e "reticulate::conda_install('visual-testing', 'python-kaleido')" - Rscript -e "reticulate::use_miniconda('visual-testing')" + Rscript -e "reticulate::conda_install('r-reticulate', 'python-kaleido')" + Rscript -e "reticulate::use_miniconda('r-reticulate')" Rscript -e "reticulate::py_config()" Rscript -e "reticulate::conda_list()" shell: bash From 9519cabb39dbe26a071671e4ca80821181a4fb8c Mon Sep 17 00:00:00 2001 From: Carson Date: Fri, 2 Jul 2021 17:03:29 -0500 Subject: [PATCH 27/42] debug --- .github/workflows/R-CMD-check.yaml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 5dc47a7a53..0a69aa1b6d 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -97,15 +97,26 @@ jobs: uses: actions/setup-python@v2 with: python-version: 3.8 + + - name: Install kaleido + if: matrix.config.visual_tests == true + run: | + Rscript -e "reticulate::py_config()" + Rscript -e "reticulate::conda_list()" + shell: bash - # https://github.com/nextstrain/conda/issues/5 - name: Install kaleido if: matrix.config.visual_tests == true run: | - sudo chown -R $UID $CONDA + echo $CONDA + sudo chown -R $UID $CONDA # https://github.com/nextstrain/conda/issues/5 Rscript -e "reticulate::install_miniconda()" Rscript -e "reticulate::conda_install('r-reticulate', 'python-kaleido')" Rscript -e "reticulate::use_miniconda('r-reticulate')" + + - name: Install kaleido + if: matrix.config.visual_tests == true + run: | Rscript -e "reticulate::py_config()" Rscript -e "reticulate::conda_list()" shell: bash From 03c9f42421fe6ad87a8ad4be19f72e140f8c475a Mon Sep 17 00:00:00 2001 From: Carson Date: Fri, 2 Jul 2021 17:07:44 -0500 Subject: [PATCH 28/42] progress --- .github/workflows/R-CMD-check.yaml | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 0a69aa1b6d..02191fe4bb 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -97,29 +97,15 @@ jobs: uses: actions/setup-python@v2 with: python-version: 3.8 - - - name: Install kaleido - if: matrix.config.visual_tests == true - run: | - Rscript -e "reticulate::py_config()" - Rscript -e "reticulate::conda_list()" - shell: bash - name: Install kaleido if: matrix.config.visual_tests == true run: | - echo $CONDA sudo chown -R $UID $CONDA # https://github.com/nextstrain/conda/issues/5 Rscript -e "reticulate::install_miniconda()" Rscript -e "reticulate::conda_install('r-reticulate', 'python-kaleido')" + Rscript -e "reticulate::conda_install('r-reticulate', 'plotly', channel = 'plotly')" Rscript -e "reticulate::use_miniconda('r-reticulate')" - - - name: Install kaleido - if: matrix.config.visual_tests == true - run: | - Rscript -e "reticulate::py_config()" - Rscript -e "reticulate::conda_list()" - shell: bash - name: Session info run: | From 779c3f3dff0cae2dbcb52de42dd0dbde725bcd02 Mon Sep 17 00:00:00 2001 From: Carson Date: Fri, 2 Jul 2021 17:31:35 -0500 Subject: [PATCH 29/42] increase max failures --- .github/workflows/R-CMD-check.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 02191fe4bb..e78c6c3302 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -117,7 +117,7 @@ jobs: # Run test() before R CMD check since, for some reason, rcmdcheck::rcmdcheck() skips vdiffr tests - name: Run Tests run: | - options(crayon.enabled = TRUE) + options(crayon.enabled = TRUE, testthat.progress.max_fails=1000) if (!require(devtools)) pak::pak("devtools") if (!require(reshape2)) pak::pak("reshape2") res <- devtools::test() From edeed4bce9fab5c3931fd3d8649543e3fd8f1a1d Mon Sep 17 00:00:00 2001 From: Carson Date: Fri, 2 Jul 2021 18:04:45 -0500 Subject: [PATCH 30/42] new snaps --- .../_snaps/cookbook-lines/cookbook-axes-bar-dodge-color.svg | 2 +- .../_snaps/cookbook-lines/cookbook-axes-scatter-basic.svg | 2 +- tests/testthat/_snaps/ggplot-area/area-traces-order.svg | 2 +- tests/testthat/_snaps/ggplot-bar/bar-color.svg | 2 +- tests/testthat/_snaps/ggplot-bar/bar-dodge.svg | 2 +- tests/testthat/_snaps/ggplot-bar/bar-position-stack.svg | 2 +- tests/testthat/_snaps/ggplot-boxplot/boxplot-fillcolor.svg | 2 +- tests/testthat/_snaps/ggplot-col/col.svg | 2 +- tests/testthat/_snaps/ggplot-date/date-strings.svg | 2 +- tests/testthat/_snaps/ggplot-density/density-fill.svg | 2 +- .../_snaps/ggplot-errorbar-horizontal/errorbar-horizontal.svg | 2 +- .../testthat/_snaps/ggplot-errorbar/errorbar-unique-groups.svg | 2 +- tests/testthat/_snaps/ggplot-facets/facet-grid-labeller.svg | 2 +- tests/testthat/_snaps/ggplot-facets/facet-wrap-free-mult.svg | 2 +- tests/testthat/_snaps/ggplot-facets/facet-wrap-free-y-2.svg | 2 +- tests/testthat/_snaps/ggplot-facets/facet-wrap-labeller.svg | 2 +- tests/testthat/_snaps/ggplot-heatmap/heatmap-discrete.svg | 2 +- tests/testthat/_snaps/ggplot-heatmap/heatmap-midpoint.svg | 2 +- tests/testthat/_snaps/ggplot-heatmap/heatmap.svg | 2 +- tests/testthat/_snaps/ggplot-hex/hex-basic.svg | 2 +- tests/testthat/_snaps/ggplot-hex/hex-bins.svg | 2 +- tests/testthat/_snaps/ggplot-hex/hex-binwidth.svg | 2 +- tests/testthat/_snaps/ggplot-histogram/histogram-fill.svg | 2 +- tests/testthat/_snaps/ggplot-labels/labs-element-blank.svg | 2 +- .../testthat/_snaps/ggplot-legend/legend-many-legend-items.svg | 2 +- tests/testthat/_snaps/ggplot-legend/legend-one-entry.svg | 2 +- .../_snaps/ggplot-legend/legend-very-long-legend-items.svg | 2 +- tests/testthat/_snaps/ggplot-legend/scatter-legend.svg | 2 +- tests/testthat/_snaps/ggplot-lines/linetype-colors.svg | 2 +- tests/testthat/_snaps/ggplot-lines/linetype-types.svg | 2 +- tests/testthat/_snaps/ggplot-map/map-facet.svg | 2 +- .../_snaps/ggplot-path/path-colored-groups-stay-together.svg | 2 +- tests/testthat/_snaps/ggplot-path/path-colors.svg | 2 +- tests/testthat/_snaps/ggplot-path/path-colors2.svg | 2 +- tests/testthat/_snaps/ggplot-path/path-line-symbols.svg | 2 +- tests/testthat/_snaps/ggplot-point/all-shapes.svg | 2 +- tests/testthat/_snaps/ggplot-polygons/polygon-aes-color.svg | 2 +- tests/testthat/_snaps/ggplot-rect/rect-color.svg | 2 +- tests/testthat/_snaps/ggplot-ribbon/ribbon-colour.svg | 2 +- .../_snaps/ggplot-segment/segment-multiple-non-numeric.svg | 2 +- tests/testthat/_snaps/ggplot-size/size-global-scaling.svg | 2 +- tests/testthat/_snaps/ggplot-step/step-gg-hv.svg | 2 +- tests/testthat/_snaps/ggplot-text/text-colour.svg | 2 +- tests/testthat/_snaps/ggplot-ticks/ticks-boxes-facet-grid.svg | 2 +- .../testthat/_snaps/ggplot-tooltip/heatmap-discrete-tooltip.svg | 2 +- tests/testthat/_snaps/mean-error-bars/error-rect-alpha.svg | 2 +- .../plotly-color/plotly-color-bar-color-factor-custom.svg | 2 +- .../testthat/_snaps/plotly-color/plotly-color-color-manual.svg | 2 +- .../plotly-color/plotly-color-scatterplot-color-factor.svg | 2 +- .../plotly-color-scatterplot-color-numeric-custom.svg | 2 +- .../plotly-color/plotly-color-scatterplot-color-numeric.svg | 2 +- .../plotly-color/plotly-color-scatterplot-scatter3d-axes.svg | 2 +- .../testthat/_snaps/plotly-colorbar/plotly-colorbar-expand.svg | 2 +- .../_snaps/plotly-colorbar/plotly-colorbar-restrict.svg | 2 +- .../_snaps/plotly-colorbar/plotly-colorbar-z-expand.svg | 2 +- .../_snaps/plotly-colorbar/plotly-colorbar-z-restrict.svg | 2 +- tests/testthat/_snaps/plotly-colorbar/plotly-colorbar.svg | 2 +- tests/testthat/_snaps/plotly-colorscale/colorramp.svg | 2 +- tests/testthat/_snaps/plotly-colorscale/contour-alpha.svg | 2 +- tests/testthat/_snaps/plotly-colorscale/contour-colorscale.svg | 2 +- tests/testthat/_snaps/plotly-colorscale/marker-colorscale.svg | 2 +- tests/testthat/_snaps/plotly-colorscale/test-df.svg | 2 +- tests/testthat/_snaps/plotly-colorscale/test-list-2.svg | 2 +- tests/testthat/_snaps/plotly-colorscale/test-list-3.svg | 2 +- tests/testthat/_snaps/plotly-colorscale/test-list.svg | 2 +- tests/testthat/_snaps/plotly-colorscale/test-matrix.svg | 2 +- tests/testthat/_snaps/plotly-group/plotly-nas-within-color.svg | 2 +- .../_snaps/plotly-linetype/plotly-linetype-alphabetical.svg | 2 +- .../_snaps/plotly-linetype/plotly-linetype-linetype.svg | 2 +- tests/testthat/_snaps/plotly-size/sizemode.svg | 2 +- .../_snaps/plotly-subplot/plotly-subplot-geo-cartesian.svg | 2 +- .../testthat/_snaps/plotly-subplot/plotly-subplot-ggmatrix.svg | 2 +- .../testthat/_snaps/plotly-subplot/plotly-subplot-shareboth.svg | 2 +- tests/testthat/_snaps/plotly-subplot/plotly-subplot-simple.svg | 2 +- .../plotly-subplot/plotly-subplot-subplot-legendgroup.svg | 2 +- .../_snaps/plotly-subplot/subplot-reposition-annotation.svg | 2 +- tests/testthat/_snaps/plotly-symbol/plotly-symbol-logical.svg | 2 +- tests/testthat/_snaps/plotly/layout-grid.svg | 2 +- tests/testthat/_snaps/plotly/plotly-alpha-blending.svg | 2 +- tests/testthat/_snaps/plotly/plotly-box-data-array.svg | 2 +- tests/testthat/_snaps/plotly/plotly-character-axis.svg | 2 +- tests/testthat/_snaps/plotly/plotly-time-series-summary.svg | 2 +- 82 files changed, 82 insertions(+), 82 deletions(-) diff --git a/tests/testthat/_snaps/cookbook-lines/cookbook-axes-bar-dodge-color.svg b/tests/testthat/_snaps/cookbook-lines/cookbook-axes-bar-dodge-color.svg index 22d3096a45..422ca99fed 100644 --- a/tests/testthat/_snaps/cookbook-lines/cookbook-axes-bar-dodge-color.svg +++ b/tests/testthat/_snaps/cookbook-lines/cookbook-axes-bar-dodge-color.svg @@ -1 +1 @@ -controltreatment0510groupABcondresult +controltreatment0510groupABcondresult diff --git a/tests/testthat/_snaps/cookbook-lines/cookbook-axes-scatter-basic.svg b/tests/testthat/_snaps/cookbook-lines/cookbook-axes-scatter-basic.svg index 8459e2035c..3768a1b627 100644 --- a/tests/testthat/_snaps/cookbook-lines/cookbook-axes-scatter-basic.svg +++ b/tests/testthat/_snaps/cookbook-lines/cookbook-axes-scatter-basic.svg @@ -1 +1 @@ -81012910111213condcontroltreatmentxvalyval +81012910111213condcontroltreatmentxvalyval diff --git a/tests/testthat/_snaps/ggplot-area/area-traces-order.svg b/tests/testthat/_snaps/ggplot-area/area-traces-order.svg index 0434a9975b..bba3a58958 100644 --- a/tests/testthat/_snaps/ggplot-area/area-traces-order.svg +++ b/tests/testthat/_snaps/ggplot-area/area-traces-order.svg @@ -1 +1 @@ -0123450.000.250.500.751.00cutFairGoodVery GoodPremiumIdealcaratfreq +0123450.000.250.500.751.00cutFairGoodVery GoodPremiumIdealcaratfreq diff --git a/tests/testthat/_snaps/ggplot-bar/bar-color.svg b/tests/testthat/_snaps/ggplot-bar/bar-color.svg index 96854bec9a..28a4345257 100644 --- a/tests/testthat/_snaps/ggplot-bar/bar-color.svg +++ b/tests/testthat/_snaps/ggplot-bar/bar-color.svg @@ -1 +1 @@ -LunchDinner051015timeLunchDinnertimetotal_bill +LunchDinner051015timeLunchDinnertimetotal_bill diff --git a/tests/testthat/_snaps/ggplot-bar/bar-dodge.svg b/tests/testthat/_snaps/ggplot-bar/bar-dodge.svg index de2a5978e5..93789e3da1 100644 --- a/tests/testthat/_snaps/ggplot-bar/bar-dodge.svg +++ b/tests/testthat/_snaps/ggplot-bar/bar-dodge.svg @@ -1 +1 @@ -CanadaGermanyUSA0102030fieldBioMathcountrypapers +CanadaGermanyUSA0102030fieldBioMathcountrypapers diff --git a/tests/testthat/_snaps/ggplot-bar/bar-position-stack.svg b/tests/testthat/_snaps/ggplot-bar/bar-position-stack.svg index a0f7f1b2ef..cb49b58015 100644 --- a/tests/testthat/_snaps/ggplot-bar/bar-position-stack.svg +++ b/tests/testthat/_snaps/ggplot-bar/bar-position-stack.svg @@ -1 +1 @@ -01051015factor(cyl)468factor(vs)count +01051015factor(cyl)468factor(vs)count diff --git a/tests/testthat/_snaps/ggplot-boxplot/boxplot-fillcolor.svg b/tests/testthat/_snaps/ggplot-boxplot/boxplot-fillcolor.svg index b07d56e6fc..4a3ca245ee 100644 --- a/tests/testthat/_snaps/ggplot-boxplot/boxplot-fillcolor.svg +++ b/tests/testthat/_snaps/ggplot-boxplot/boxplot-fillcolor.svg @@ -1 +1 @@ -ABCD-2024colC1C2condrating +ABCD-2024colC1C2condrating diff --git a/tests/testthat/_snaps/ggplot-col/col.svg b/tests/testthat/_snaps/ggplot-col/col.svg index 366e7fcd5a..01847e0545 100644 --- a/tests/testthat/_snaps/ggplot-col/col.svg +++ b/tests/testthat/_snaps/ggplot-col/col.svg @@ -1 +1 @@ -71.4%20.0%48.3%28.6%80.0%51.7%ElementaryHighMiddle0.000.250.500.751.00includedexcludedincludedtypeprop +71.4%20.0%48.3%28.6%80.0%51.7%ElementaryHighMiddle0.000.250.500.751.00includedexcludedincludedtypeprop diff --git a/tests/testthat/_snaps/ggplot-date/date-strings.svg b/tests/testthat/_snaps/ggplot-date/date-strings.svg index 41aee002f8..e9d737ffdb 100644 --- a/tests/testthat/_snaps/ggplot-date/date-strings.svg +++ b/tests/testthat/_snaps/ggplot-date/date-strings.svg @@ -1 +1 @@ -Apr 1983Jul 1983Oct 1983Jan 1984Apr 19840.02.55.07.510.0whomeyoutime.objdollars +Apr 1983Jul 1983Oct 1983Jan 1984Apr 19840.02.55.07.510.0whomeyoutime.objdollars diff --git a/tests/testthat/_snaps/ggplot-density/density-fill.svg b/tests/testthat/_snaps/ggplot-density/density-fill.svg index fe67e4d2f3..f379baeaf3 100644 --- a/tests/testthat/_snaps/ggplot-density/density-fill.svg +++ b/tests/testthat/_snaps/ggplot-density/density-fill.svg @@ -1 +1 @@ -23450.00.20.40.6factor(vs)01wtdensity +23450.00.20.40.6factor(vs)01wtdensity diff --git a/tests/testthat/_snaps/ggplot-errorbar-horizontal/errorbar-horizontal.svg b/tests/testthat/_snaps/ggplot-errorbar-horizontal/errorbar-horizontal.svg index fae3fb48da..56d1e0741a 100644 --- a/tests/testthat/_snaps/ggplot-errorbar-horizontal/errorbar-horizontal.svg +++ b/tests/testthat/_snaps/ggplot-errorbar-horizontal/errorbar-horizontal.svg @@ -1 +1 @@ -1234512group12resptrt +1234512group12resptrt diff --git a/tests/testthat/_snaps/ggplot-errorbar/errorbar-unique-groups.svg b/tests/testthat/_snaps/ggplot-errorbar/errorbar-unique-groups.svg index 06f75170a1..cdbf648722 100644 --- a/tests/testthat/_snaps/ggplot-errorbar/errorbar-unique-groups.svg +++ b/tests/testthat/_snaps/ggplot-errorbar/errorbar-unique-groups.svg @@ -1 +1 @@ -1212345group1234trtresp +1212345group1234trtresp diff --git a/tests/testthat/_snaps/ggplot-facets/facet-grid-labeller.svg b/tests/testthat/_snaps/ggplot-facets/facet-grid-labeller.svg index 914c9638aa..90cd4fd68f 100644 --- a/tests/testthat/_snaps/ggplot-facets/facet-grid-labeller.svg +++ b/tests/testthat/_snaps/ggplot-facets/facet-grid-labeller.svg @@ -1 +1 @@ -23451015202530352345101520253035mpgwtam: 0am: 1vs: 0vs: 1 +23451015202530352345101520253035mpgwtam: 0am: 1vs: 0vs: 1 diff --git a/tests/testthat/_snaps/ggplot-facets/facet-wrap-free-mult.svg b/tests/testthat/_snaps/ggplot-facets/facet-wrap-free-mult.svg index 02df0765ca..7d03989d38 100644 --- a/tests/testthat/_snaps/ggplot-facets/facet-wrap-free-mult.svg +++ b/tests/testthat/_snaps/ggplot-facets/facet-wrap-free-mult.svg @@ -1 +1 @@ -25301.52.02.53.0181920212.753.003.253.5010.012.515.017.53.54.04.55.05.5mpgwt468 +25301.52.02.53.0181920212.753.003.253.5010.012.515.017.53.54.04.55.05.5mpgwt468 diff --git a/tests/testthat/_snaps/ggplot-facets/facet-wrap-free-y-2.svg b/tests/testthat/_snaps/ggplot-facets/facet-wrap-free-y-2.svg index db79a82294..2b5fcb1510 100644 --- a/tests/testthat/_snaps/ggplot-facets/facet-wrap-free-y-2.svg +++ b/tests/testthat/_snaps/ggplot-facets/facet-wrap-free-y-2.svg @@ -1 +1 @@ -025005000750010000125005101519701980199020002010400080001200020000022500025000027500030000032500019701980199020002010510152025datevaluepcepoppsavertuempmedunemploy +025005000750010000125005101519701980199020002010400080001200020000022500025000027500030000032500019701980199020002010510152025datevaluepcepoppsavertuempmedunemploy diff --git a/tests/testthat/_snaps/ggplot-facets/facet-wrap-labeller.svg b/tests/testthat/_snaps/ggplot-facets/facet-wrap-labeller.svg index 55bca192bf..e6250c252c 100644 --- a/tests/testthat/_snaps/ggplot-facets/facet-wrap-labeller.svg +++ b/tests/testthat/_snaps/ggplot-facets/facet-wrap-labeller.svg @@ -1 +1 @@ -1015202530352345101520253035mpgwtam: 0am: 1 +1015202530352345101520253035mpgwtam: 0am: 1 diff --git a/tests/testthat/_snaps/ggplot-heatmap/heatmap-discrete.svg b/tests/testthat/_snaps/ggplot-heatmap/heatmap-discrete.svg index d23c0fd06a..9c462f95b0 100644 --- a/tests/testthat/_snaps/ggplot-heatmap/heatmap-discrete.svg +++ b/tests/testthat/_snaps/ggplot-heatmap/heatmap-discrete.svg @@ -1 +1 @@ -amcarbcyldispdratgearhpmpgqsecvswtamcarbcyldispdratgearhpmpgqsecvswt-0.50.00.51.0corvar1var2 +amcarbcyldispdratgearhpmpgqsecvswtamcarbcyldispdratgearhpmpgqsecvswt-0.50.00.51.0corvar1var2 diff --git a/tests/testthat/_snaps/ggplot-heatmap/heatmap-midpoint.svg b/tests/testthat/_snaps/ggplot-heatmap/heatmap-midpoint.svg index f285f0a90e..4260614d0d 100644 --- a/tests/testthat/_snaps/ggplot-heatmap/heatmap-midpoint.svg +++ b/tests/testthat/_snaps/ggplot-heatmap/heatmap-midpoint.svg @@ -1 +1 @@ -0.000.250.500.751.000.000.250.500.751.000.000.250.500.751.00zxy +0.000.250.500.751.000.000.250.500.751.000.000.250.500.751.00zxy diff --git a/tests/testthat/_snaps/ggplot-heatmap/heatmap.svg b/tests/testthat/_snaps/ggplot-heatmap/heatmap.svg index b8a0a8f25b..33fe075d00 100644 --- a/tests/testthat/_snaps/ggplot-heatmap/heatmap.svg +++ b/tests/testthat/_snaps/ggplot-heatmap/heatmap.svg @@ -1 +1 @@ -MondayTuesdayWednesdayThursdayFridayMorningAfternoonEvening020406080valuedaytime +MondayTuesdayWednesdayThursdayFridayMorningAfternoonEvening020406080valuedaytime diff --git a/tests/testthat/_snaps/ggplot-hex/hex-basic.svg b/tests/testthat/_snaps/ggplot-hex/hex-basic.svg index 0d70ba37fc..9277790281 100644 --- a/tests/testthat/_snaps/ggplot-hex/hex-basic.svg +++ b/tests/testthat/_snaps/ggplot-hex/hex-basic.svg @@ -1 +1 @@ -01234505000100001500010002000300040005000countcaratprice +01234505000100001500010002000300040005000countcaratprice diff --git a/tests/testthat/_snaps/ggplot-hex/hex-bins.svg b/tests/testthat/_snaps/ggplot-hex/hex-bins.svg index 0df88b6b1f..6c32c75085 100644 --- a/tests/testthat/_snaps/ggplot-hex/hex-bins.svg +++ b/tests/testthat/_snaps/ggplot-hex/hex-bins.svg @@ -1 +1 @@ -01234505000100001500020000250050007500countcaratprice +01234505000100001500020000250050007500countcaratprice diff --git a/tests/testthat/_snaps/ggplot-hex/hex-binwidth.svg b/tests/testthat/_snaps/ggplot-hex/hex-binwidth.svg index 9e1432b287..404b84fb73 100644 --- a/tests/testthat/_snaps/ggplot-hex/hex-binwidth.svg +++ b/tests/testthat/_snaps/ggplot-hex/hex-binwidth.svg @@ -1 +1 @@ -0240500010000150002000050001000015000countcaratprice +0240500010000150002000050001000015000countcaratprice diff --git a/tests/testthat/_snaps/ggplot-histogram/histogram-fill.svg b/tests/testthat/_snaps/ggplot-histogram/histogram-fill.svg index 58a328f225..36b168ef5d 100644 --- a/tests/testthat/_snaps/ggplot-histogram/histogram-fill.svg +++ b/tests/testthat/_snaps/ggplot-histogram/histogram-fill.svg @@ -1 +1 @@ -234502460246countwtcount +234502460246countwtcount diff --git a/tests/testthat/_snaps/ggplot-labels/labs-element-blank.svg b/tests/testthat/_snaps/ggplot-labels/labs-element-blank.svg index 18b5187b96..d787c370f4 100644 --- a/tests/testthat/_snaps/ggplot-labels/labs-element-blank.svg +++ b/tests/testthat/_snaps/ggplot-labels/labs-element-blank.svg @@ -1 +1 @@ -40506015.017.520.0speciesAdelieChinstrapGentoo +40506015.017.520.0speciesAdelieChinstrapGentoo diff --git a/tests/testthat/_snaps/ggplot-legend/legend-many-legend-items.svg b/tests/testthat/_snaps/ggplot-legend/legend-many-legend-items.svg index dc91cf1222..e352d3cdcd 100644 --- a/tests/testthat/_snaps/ggplot-legend/legend-many-legend-items.svg +++ b/tests/testthat/_snaps/ggplot-legend/legend-many-legend-items.svg @@ -1 +1 @@ -AARAAUAHRAHUALRALUHARHAUHHRHHUHLRHLULARLAULHRLHU050100150200categoryAARAAUAHRAHUALRALUHARHAUHHRHHUHLRHLULARLAULHRLHUcategorycount +AARAAUAHRAHUALRALUHARHAUHHRHHUHLRHLULARLAULHRLHU050100150200categoryAARAAUAHRAHUALRALUHARHAUHHRHHUHLRHLULARLAULHRLHUcategorycount diff --git a/tests/testthat/_snaps/ggplot-legend/legend-one-entry.svg b/tests/testthat/_snaps/ggplot-legend/legend-one-entry.svg index cd262fc7b4..3a476bfdf0 100644 --- a/tests/testthat/_snaps/ggplot-legend/legend-one-entry.svg +++ b/tests/testthat/_snaps/ggplot-legend/legend-one-entry.svg @@ -1 +1 @@ -40506015.017.520.0AllAll speciesbill_length_mmbill_depth_mm +40506015.017.520.0AllAll speciesbill_length_mmbill_depth_mm diff --git a/tests/testthat/_snaps/ggplot-legend/legend-very-long-legend-items.svg b/tests/testthat/_snaps/ggplot-legend/legend-very-long-legend-items.svg index 89e9253a37..fb46854158 100644 --- a/tests/testthat/_snaps/ggplot-legend/legend-very-long-legend-items.svg +++ b/tests/testthat/_snaps/ggplot-legend/legend-very-long-legend-items.svg @@ -1 +1 @@ -ABCDEFGHIJ0246cat2AAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBBBBBBBBBBBBBBBBBCCCCCCCCCCCCCCCCCCCCCCCCCCCCCcat1count +ABCDEFGHIJ0246cat2AAAAAAAAAAAAAAAAAAAAAAAAAAAAABBBBBBBBBBBBBBBBBBBBBBBBBBBBBCCCCCCCCCCCCCCCCCCCCCCCCCCCCCcat1count diff --git a/tests/testthat/_snaps/ggplot-legend/scatter-legend.svg b/tests/testthat/_snaps/ggplot-legend/scatter-legend.svg index 840e4a4f99..255b20caee 100644 --- a/tests/testthat/_snaps/ggplot-legend/scatter-legend.svg +++ b/tests/testthat/_snaps/ggplot-legend/scatter-legend.svg @@ -1 +1 @@ -1015202530352345factor(vs)factor(cyl)(0,4)(0,6)(0,8)(1,4)(1,6)mpgwt +1015202530352345factor(vs)factor(cyl)(0,4)(0,6)(0,8)(1,4)(1,6)mpgwt diff --git a/tests/testthat/_snaps/ggplot-lines/linetype-colors.svg b/tests/testthat/_snaps/ggplot-lines/linetype-colors.svg index 9becfb618a..efa8b91cd9 100644 --- a/tests/testthat/_snaps/ggplot-lines/linetype-colors.svg +++ b/tests/testthat/_snaps/ggplot-lines/linetype-colors.svg @@ -1 +1 @@ --2-10120.000.250.500.751.00variabley1y2xvalue +-2-10120.000.250.500.751.00variabley1y2xvalue diff --git a/tests/testthat/_snaps/ggplot-lines/linetype-types.svg b/tests/testthat/_snaps/ggplot-lines/linetype-types.svg index cc6eb1ebf0..8a6e044af8 100644 --- a/tests/testthat/_snaps/ggplot-lines/linetype-types.svg +++ b/tests/testthat/_snaps/ggplot-lines/linetype-types.svg @@ -1 +1 @@ -246246as.factor(x)123456xy +246246as.factor(x)123456xy diff --git a/tests/testthat/_snaps/ggplot-map/map-facet.svg b/tests/testthat/_snaps/ggplot-map/map-facet.svg index a88d89dbb5..6dcca7fd73 100644 --- a/tests/testthat/_snaps/ggplot-map/map-facet.svg +++ b/tests/testthat/_snaps/ggplot-map/map-facet.svg @@ -1 +1 @@ -253035404550-120-100-80253035404550-120-100-80100200300valuexyAssaultMurderRapeUrbanPop +253035404550-120-100-80253035404550-120-100-80100200300valuexyAssaultMurderRapeUrbanPop diff --git a/tests/testthat/_snaps/ggplot-path/path-colored-groups-stay-together.svg b/tests/testthat/_snaps/ggplot-path/path-colored-groups-stay-together.svg index 50252de33a..05e2079a27 100644 --- a/tests/testthat/_snaps/ggplot-path/path-colored-groups-stay-together.svg +++ b/tests/testthat/_snaps/ggplot-path/path-colored-groups-stay-together.svg @@ -1 +1 @@ --2-1012-2-1012gpositivenegativexy +-2-1012-2-1012gpositivenegativexy diff --git a/tests/testthat/_snaps/ggplot-path/path-colors.svg b/tests/testthat/_snaps/ggplot-path/path-colors.svg index 60061c6e98..0a2ab21493 100644 --- a/tests/testthat/_snaps/ggplot-path/path-colors.svg +++ b/tests/testthat/_snaps/ggplot-path/path-colors.svg @@ -1 +1 @@ -1.001.251.501.752.001.001.251.501.752.001.001.251.501.752.00yxy +1.001.251.501.752.001.001.251.501.752.001.001.251.501.752.00yxy diff --git a/tests/testthat/_snaps/ggplot-path/path-colors2.svg b/tests/testthat/_snaps/ggplot-path/path-colors2.svg index b3915b58c2..003f85a6be 100644 --- a/tests/testthat/_snaps/ggplot-path/path-colors2.svg +++ b/tests/testthat/_snaps/ggplot-path/path-colors2.svg @@ -1 +1 @@ -1.001.251.501.752.001.001.251.501.752.00paste0("FOO", y)FOO1FOO2xy +1.001.251.501.752.001.001.251.501.752.00paste0("FOO", y)FOO1FOO2xy diff --git a/tests/testthat/_snaps/ggplot-path/path-line-symbols.svg b/tests/testthat/_snaps/ggplot-path/path-line-symbols.svg index 72ba94b8cb..2064c6b6cd 100644 --- a/tests/testthat/_snaps/ggplot-path/path-line-symbols.svg +++ b/tests/testthat/_snaps/ggplot-path/path-line-symbols.svg @@ -1 +1 @@ -LunchDinner14151617sexFemaleMaletimetotal_bill +LunchDinner14151617sexFemaleMaletimetotal_bill diff --git a/tests/testthat/_snaps/ggplot-point/all-shapes.svg b/tests/testthat/_snaps/ggplot-point/all-shapes.svg index 52de0c694d..4b50918226 100644 --- a/tests/testthat/_snaps/ggplot-point/all-shapes.svg +++ b/tests/testthat/_snaps/ggplot-point/all-shapes.svg @@ -1 +1 @@ --0.050-0.0250.0000.0250.050-0.050-0.0250.0000.0250.050-0.050-0.0250.0000.0250.050-0.050-0.0250.0000.0250.050-0.050-0.0250.0000.0250.050-0.050-0.0250.0000.0250.050-0.050-0.0250.0000.0250.050-0.050-0.0250.0000.0250.050-0.050-0.0250.0000.0250.050-0.050-0.0250.0000.0250.0500123456789101112131415161718192021222324xy0123456789101112131415161718192021222324 +-0.050-0.0250.0000.0250.050-0.050-0.0250.0000.0250.050-0.050-0.0250.0000.0250.050-0.050-0.0250.0000.0250.050-0.050-0.0250.0000.0250.050-0.050-0.0250.0000.0250.050-0.050-0.0250.0000.0250.050-0.050-0.0250.0000.0250.050-0.050-0.0250.0000.0250.050-0.050-0.0250.0000.0250.0500123456789101112131415161718192021222324xy0123456789101112131415161718192021222324 diff --git a/tests/testthat/_snaps/ggplot-polygons/polygon-aes-color.svg b/tests/testthat/_snaps/ggplot-polygons/polygon-aes-color.svg index de9910fb8d..15ab74742e 100644 --- a/tests/testthat/_snaps/ggplot-polygons/polygon-aes-color.svg +++ b/tests/testthat/_snaps/ggplot-polygons/polygon-aes-color.svg @@ -1 +1 @@ -101112130.000.250.500.751.00lableftrightxy +101112130.000.250.500.751.00lableftrightxy diff --git a/tests/testthat/_snaps/ggplot-rect/rect-color.svg b/tests/testthat/_snaps/ggplot-rect/rect-color.svg index bfd09d4027..dadd68be4d 100644 --- a/tests/testthat/_snaps/ggplot-rect/rect-color.svg +++ b/tests/testthat/_snaps/ggplot-rect/rect-color.svg @@ -1 +1 @@ -12340.000.250.500.751.00statuscoolnot +12340.000.250.500.751.00statuscoolnot diff --git a/tests/testthat/_snaps/ggplot-ribbon/ribbon-colour.svg b/tests/testthat/_snaps/ggplot-ribbon/ribbon-colour.svg index 263e5feea0..3e5f1e8823 100644 --- a/tests/testthat/_snaps/ggplot-ribbon/ribbon-colour.svg +++ b/tests/testthat/_snaps/ggplot-ribbon/ribbon-colour.svg @@ -1 +1 @@ --5.0-2.50.02.55.0576578580582factor(decade)1880189019001910192019301940195019601970diff +-5.0-2.50.02.55.0576578580582factor(decade)1880189019001910192019301940195019601970diff diff --git a/tests/testthat/_snaps/ggplot-segment/segment-multiple-non-numeric.svg b/tests/testthat/_snaps/ggplot-segment/segment-multiple-non-numeric.svg index 0cf0830070..e87801858c 100644 --- a/tests/testthat/_snaps/ggplot-segment/segment-multiple-non-numeric.svg +++ b/tests/testthat/_snaps/ggplot-segment/segment-multiple-non-numeric.svg @@ -1 +1 @@ -0.81.21.62.0901001101201301.001.251.501.752.00campaigncampaigndonation +0.81.21.62.0901001101201301.001.251.501.752.00campaigncampaigndonation diff --git a/tests/testthat/_snaps/ggplot-size/size-global-scaling.svg b/tests/testthat/_snaps/ggplot-size/size-global-scaling.svg index 37f34b2d06..b903812934 100644 --- a/tests/testthat/_snaps/ggplot-size/size-global-scaling.svg +++ b/tests/testthat/_snaps/ggplot-size/size-global-scaling.svg @@ -1 +1 @@ -2340.40.81.21.6countrypopulationParaguayPeruPhilippineseduilln +2340.40.81.21.6countrypopulationParaguayPeruPhilippineseduilln diff --git a/tests/testthat/_snaps/ggplot-step/step-gg-hv.svg b/tests/testthat/_snaps/ggplot-step/step-gg-hv.svg index c838d11505..881037778c 100644 --- a/tests/testthat/_snaps/ggplot-step/step-gg-hv.svg +++ b/tests/testthat/_snaps/ggplot-step/step-gg-hv.svg @@ -1 +1 @@ -4008001200160050100150200factor(Tree)12agecircumference +4008001200160050100150200factor(Tree)12agecircumference diff --git a/tests/testthat/_snaps/ggplot-text/text-colour.svg b/tests/testthat/_snaps/ggplot-text/text-colour.svg index 0c231a0d8a..9704eff777 100644 --- a/tests/testthat/_snaps/ggplot-text/text-colour.svg +++ b/tests/testthat/_snaps/ggplot-text/text-colour.svg @@ -1 +1 @@ -HUNTSVILLEMOBILEBIRMINGHAMMONTGOMERYTUCSONPEORIA01020-505DivisionEast South CentralAaMountainAacoord.1coord.2 +HUNTSVILLEMOBILEBIRMINGHAMMONTGOMERYTUCSONPEORIA01020-505DivisionEast South CentralAaMountainAacoord.1coord.2 diff --git a/tests/testthat/_snaps/ggplot-ticks/ticks-boxes-facet-grid.svg b/tests/testthat/_snaps/ggplot-ticks/ticks-boxes-facet-grid.svg index 05c9fc6417..3262aa00b4 100644 --- a/tests/testthat/_snaps/ggplot-ticks/ticks-boxes-facet-grid.svg +++ b/tests/testthat/_snaps/ggplot-ticks/ticks-boxes-facet-grid.svg @@ -1 +1 @@ -ctrltrt1trt23.54.04.55.05.56.0ctrltrt1trt2groupweightcontroltreatment +ctrltrt1trt23.54.04.55.05.56.0ctrltrt1trt2groupweightcontroltreatment diff --git a/tests/testthat/_snaps/ggplot-tooltip/heatmap-discrete-tooltip.svg b/tests/testthat/_snaps/ggplot-tooltip/heatmap-discrete-tooltip.svg index 19469c5e2b..2b1cd17a00 100644 --- a/tests/testthat/_snaps/ggplot-tooltip/heatmap-discrete-tooltip.svg +++ b/tests/testthat/_snaps/ggplot-tooltip/heatmap-discrete-tooltip.svg @@ -1 +1 @@ -1020304680.20.40.6densitympgfactor(cyl) +1020304680.20.40.6densitympgfactor(cyl) diff --git a/tests/testthat/_snaps/mean-error-bars/error-rect-alpha.svg b/tests/testthat/_snaps/mean-error-bars/error-rect-alpha.svg index ceefe8ed6f..a5ae73351e 100644 --- a/tests/testthat/_snaps/mean-error-bars/error-rect-alpha.svg +++ b/tests/testthat/_snaps/mean-error-bars/error-rect-alpha.svg @@ -1 +1 @@ -024612345grouponetwoxy +024612345grouponetwoxy diff --git a/tests/testthat/_snaps/plotly-color/plotly-color-bar-color-factor-custom.svg b/tests/testthat/_snaps/plotly-color/plotly-color-bar-color-factor-custom.svg index 0d55e50c69..7db2e49f2f 100644 --- a/tests/testthat/_snaps/plotly-color/plotly-color-bar-color-factor-custom.svg +++ b/tests/testthat/_snaps/plotly-color/plotly-color-bar-color-factor-custom.svg @@ -1 +1 @@ -ABCDE012345ABCDECategoryValue +ABCDE012345ABCDECategoryValue diff --git a/tests/testthat/_snaps/plotly-color/plotly-color-color-manual.svg b/tests/testthat/_snaps/plotly-color/plotly-color-color-manual.svg index 0af50a426b..47752d4746 100644 --- a/tests/testthat/_snaps/plotly-color/plotly-color-color-manual.svg +++ b/tests/testthat/_snaps/plotly-color/plotly-color-color-manual.svg @@ -1 +1 @@ -1015202530355010015020025030035040045001mpgdisp +1015202530355010015020025030035040045001mpgdisp diff --git a/tests/testthat/_snaps/plotly-color/plotly-color-scatterplot-color-factor.svg b/tests/testthat/_snaps/plotly-color/plotly-color-scatterplot-color-factor.svg index 1c237d0e92..4ba7d31f0e 100644 --- a/tests/testthat/_snaps/plotly-color/plotly-color-scatterplot-color-factor.svg +++ b/tests/testthat/_snaps/plotly-color/plotly-color-scatterplot-color-factor.svg @@ -1 +1 @@ -354045505560170180190200210220230AdelieChinstrapGentoobill_length_mmflipper_length_mm +354045505560170180190200210220230AdelieChinstrapGentoobill_length_mmflipper_length_mm diff --git a/tests/testthat/_snaps/plotly-color/plotly-color-scatterplot-color-numeric-custom.svg b/tests/testthat/_snaps/plotly-color/plotly-color-scatterplot-color-numeric-custom.svg index 854462136a..0ea13134b4 100644 --- a/tests/testthat/_snaps/plotly-color/plotly-color-scatterplot-color-numeric-custom.svg +++ b/tests/testthat/_snaps/plotly-color/plotly-color-scatterplot-color-numeric-custom.svg @@ -1 +1 @@ -35404550556017018019020021022023014161820bill_depth_mmbill_length_mmflipper_length_mm +35404550556017018019020021022023014161820bill_depth_mmbill_length_mmflipper_length_mm diff --git a/tests/testthat/_snaps/plotly-color/plotly-color-scatterplot-color-numeric.svg b/tests/testthat/_snaps/plotly-color/plotly-color-scatterplot-color-numeric.svg index a90227ebfc..55c5f845aa 100644 --- a/tests/testthat/_snaps/plotly-color/plotly-color-scatterplot-color-numeric.svg +++ b/tests/testthat/_snaps/plotly-color/plotly-color-scatterplot-color-numeric.svg @@ -1 +1 @@ -35404550556017018019020021022023014161820bill_depth_mmbill_length_mmflipper_length_mm +35404550556017018019020021022023014161820bill_depth_mmbill_length_mmflipper_length_mm diff --git a/tests/testthat/_snaps/plotly-color/plotly-color-scatterplot-scatter3d-axes.svg b/tests/testthat/_snaps/plotly-color/plotly-color-scatterplot-scatter3d-axes.svg index 3024d18ae5..964a2551d0 100644 --- a/tests/testthat/_snaps/plotly-color/plotly-color-scatterplot-scatter3d-axes.svg +++ b/tests/testthat/_snaps/plotly-color/plotly-color-scatterplot-scatter3d-axes.svg @@ -1 +1 @@ - + diff --git a/tests/testthat/_snaps/plotly-colorbar/plotly-colorbar-expand.svg b/tests/testthat/_snaps/plotly-colorbar/plotly-colorbar-expand.svg index 1ac30e3341..6891216019 100644 --- a/tests/testthat/_snaps/plotly-colorbar/plotly-colorbar-expand.svg +++ b/tests/testthat/_snaps/plotly-colorbar/plotly-colorbar-expand.svg @@ -1 +1 @@ -234544.555.566.577.5805101520cylwtcyl +234544.555.566.577.5805101520cylwtcyl diff --git a/tests/testthat/_snaps/plotly-colorbar/plotly-colorbar-restrict.svg b/tests/testthat/_snaps/plotly-colorbar/plotly-colorbar-restrict.svg index cd82102cc4..74a1834f69 100644 --- a/tests/testthat/_snaps/plotly-colorbar/plotly-colorbar-restrict.svg +++ b/tests/testthat/_snaps/plotly-colorbar/plotly-colorbar-restrict.svg @@ -1 +1 @@ -234544.555.566.577.5855.566.57cylwtcyl +234544.555.566.577.5855.566.57cylwtcyl diff --git a/tests/testthat/_snaps/plotly-colorbar/plotly-colorbar-z-expand.svg b/tests/testthat/_snaps/plotly-colorbar/plotly-colorbar-z-expand.svg index 86738a9778..e8e0a7da30 100644 --- a/tests/testthat/_snaps/plotly-colorbar/plotly-colorbar-z-expand.svg +++ b/tests/testthat/_snaps/plotly-colorbar/plotly-colorbar-z-expand.svg @@ -1 +1 @@ -0102030405060010203040506070800100200300volcano +0102030405060010203040506070800100200300volcano diff --git a/tests/testthat/_snaps/plotly-colorbar/plotly-colorbar-z-restrict.svg b/tests/testthat/_snaps/plotly-colorbar/plotly-colorbar-z-restrict.svg index f61f0c00f2..70ae6d6246 100644 --- a/tests/testthat/_snaps/plotly-colorbar/plotly-colorbar-z-restrict.svg +++ b/tests/testthat/_snaps/plotly-colorbar/plotly-colorbar-z-restrict.svg @@ -1 +1 @@ -010203040506001020304050607080140145150155160volcano +010203040506001020304050607080140145150155160volcano diff --git a/tests/testthat/_snaps/plotly-colorbar/plotly-colorbar.svg b/tests/testthat/_snaps/plotly-colorbar/plotly-colorbar.svg index 84ae4a1945..e6a1aa3a22 100644 --- a/tests/testthat/_snaps/plotly-colorbar/plotly-colorbar.svg +++ b/tests/testthat/_snaps/plotly-colorbar/plotly-colorbar.svg @@ -1 +1 @@ -234544.555.566.577.5845678cylwtcyl +234544.555.566.577.5845678cylwtcyl diff --git a/tests/testthat/_snaps/plotly-colorscale/colorramp.svg b/tests/testthat/_snaps/plotly-colorscale/colorramp.svg index 8ba1fab29c..11b22714a4 100644 --- a/tests/testthat/_snaps/plotly-colorscale/colorramp.svg +++ b/tests/testthat/_snaps/plotly-colorscale/colorramp.svg @@ -1 +1 @@ -246810246810246810 +246810246810246810 diff --git a/tests/testthat/_snaps/plotly-colorscale/contour-alpha.svg b/tests/testthat/_snaps/plotly-colorscale/contour-alpha.svg index c4fb0f6b63..87fbd024a1 100644 --- a/tests/testthat/_snaps/plotly-colorscale/contour-alpha.svg +++ b/tests/testthat/_snaps/plotly-colorscale/contour-alpha.svg @@ -1 +1 @@ -010203040506001020304050607080100120140160180 +010203040506001020304050607080100120140160180 diff --git a/tests/testthat/_snaps/plotly-colorscale/contour-colorscale.svg b/tests/testthat/_snaps/plotly-colorscale/contour-colorscale.svg index 647258b2a7..943bae3a25 100644 --- a/tests/testthat/_snaps/plotly-colorscale/contour-colorscale.svg +++ b/tests/testthat/_snaps/plotly-colorscale/contour-colorscale.svg @@ -1 +1 @@ -−8−6−4−201234567481216 +−8−6−4−201234567481216 diff --git a/tests/testthat/_snaps/plotly-colorscale/marker-colorscale.svg b/tests/testthat/_snaps/plotly-colorscale/marker-colorscale.svg index a8c2fb0a8e..d5fc23f86b 100644 --- a/tests/testthat/_snaps/plotly-colorscale/marker-colorscale.svg +++ b/tests/testthat/_snaps/plotly-colorscale/marker-colorscale.svg @@ -1 +1 @@ -−8−6−4−20123456711.522.533.544.55 +−8−6−4−20123456711.522.533.544.55 diff --git a/tests/testthat/_snaps/plotly-colorscale/test-df.svg b/tests/testthat/_snaps/plotly-colorscale/test-df.svg index af30638074..e25107c366 100644 --- a/tests/testthat/_snaps/plotly-colorscale/test-df.svg +++ b/tests/testthat/_snaps/plotly-colorscale/test-df.svg @@ -1 +1 @@ -246810246810123456789 +246810246810123456789 diff --git a/tests/testthat/_snaps/plotly-colorscale/test-list-2.svg b/tests/testthat/_snaps/plotly-colorscale/test-list-2.svg index 664be27807..2c3249c151 100644 --- a/tests/testthat/_snaps/plotly-colorscale/test-list-2.svg +++ b/tests/testthat/_snaps/plotly-colorscale/test-list-2.svg @@ -1 +1 @@ -246810246810123456789 +246810246810123456789 diff --git a/tests/testthat/_snaps/plotly-colorscale/test-list-3.svg b/tests/testthat/_snaps/plotly-colorscale/test-list-3.svg index 664be27807..2c3249c151 100644 --- a/tests/testthat/_snaps/plotly-colorscale/test-list-3.svg +++ b/tests/testthat/_snaps/plotly-colorscale/test-list-3.svg @@ -1 +1 @@ -246810246810123456789 +246810246810123456789 diff --git a/tests/testthat/_snaps/plotly-colorscale/test-list.svg b/tests/testthat/_snaps/plotly-colorscale/test-list.svg index af30638074..e25107c366 100644 --- a/tests/testthat/_snaps/plotly-colorscale/test-list.svg +++ b/tests/testthat/_snaps/plotly-colorscale/test-list.svg @@ -1 +1 @@ -246810246810123456789 +246810246810123456789 diff --git a/tests/testthat/_snaps/plotly-colorscale/test-matrix.svg b/tests/testthat/_snaps/plotly-colorscale/test-matrix.svg index af30638074..e25107c366 100644 --- a/tests/testthat/_snaps/plotly-colorscale/test-matrix.svg +++ b/tests/testthat/_snaps/plotly-colorscale/test-matrix.svg @@ -1 +1 @@ -246810246810123456789 +246810246810123456789 diff --git a/tests/testthat/_snaps/plotly-group/plotly-nas-within-color.svg b/tests/testthat/_snaps/plotly-group/plotly-nas-within-color.svg index cd41cdf840..442d6db24b 100644 --- a/tests/testthat/_snaps/plotly-group/plotly-nas-within-color.svg +++ b/tests/testthat/_snaps/plotly-group/plotly-nas-within-color.svg @@ -1 +1 @@ -19701980199020002010050k100k150k200k250k300kpcepoppsavertuempmedunemploydatevalue +19701980199020002010050k100k150k200k250k300kpcepoppsavertuempmedunemploydatevalue diff --git a/tests/testthat/_snaps/plotly-linetype/plotly-linetype-alphabetical.svg b/tests/testthat/_snaps/plotly-linetype/plotly-linetype-alphabetical.svg index 621611956d..14789f237c 100644 --- a/tests/testthat/_snaps/plotly-linetype/plotly-linetype-alphabetical.svg +++ b/tests/testthat/_snaps/plotly-linetype/plotly-linetype-alphabetical.svg @@ -1 +1 @@ -101520253035152025303540452seatercompactmidsizepickupsubcompactsuvctyhwy +101520253035152025303540452seatercompactmidsizepickupsubcompactsuvctyhwy diff --git a/tests/testthat/_snaps/plotly-linetype/plotly-linetype-linetype.svg b/tests/testthat/_snaps/plotly-linetype/plotly-linetype-linetype.svg index 8db01b0abb..4969c67973 100644 --- a/tests/testthat/_snaps/plotly-linetype/plotly-linetype-linetype.svg +++ b/tests/testthat/_snaps/plotly-linetype/plotly-linetype-linetype.svg @@ -1 +1 @@ -200020052010201550k100k150k200k250kAbileneAmarilloArlingtonAustinBay Areadatemedian +200020052010201550k100k150k200k250kAbileneAmarilloArlingtonAustinBay Areadatemedian diff --git a/tests/testthat/_snaps/plotly-size/sizemode.svg b/tests/testthat/_snaps/plotly-size/sizemode.svg index 79808cc224..4feeda5d2f 100644 --- a/tests/testthat/_snaps/plotly-size/sizemode.svg +++ b/tests/testthat/_snaps/plotly-size/sizemode.svg @@ -1 +1 @@ -23451.522.533.544.555.5123468wtwt +23451.522.533.544.555.5123468wtwt diff --git a/tests/testthat/_snaps/plotly-subplot/plotly-subplot-geo-cartesian.svg b/tests/testthat/_snaps/plotly-subplot/plotly-subplot-geo-cartesian.svg index 5f17ea4af7..60dbed2a50 100644 --- a/tests/testthat/_snaps/plotly-subplot/plotly-subplot-geo-cartesian.svg +++ b/tests/testthat/_snaps/plotly-subplot/plotly-subplot-geo-cartesian.svg @@ -1 +1 @@ -05k10k15k20k0200040006000012020406005101502040600501001500200k400kPopulationIncomeIlliteracyLife ExpMurderHS GradFrostArea0.20.40.60.8density +05k10k15k20k0200040006000012020406005101502040600501001500200k400kPopulationIncomeIlliteracyLife ExpMurderHS GradFrostArea0.20.40.60.8density diff --git a/tests/testthat/_snaps/plotly-subplot/plotly-subplot-ggmatrix.svg b/tests/testthat/_snaps/plotly-subplot/plotly-subplot-ggmatrix.svg index 9d607819ae..91e0858391 100644 --- a/tests/testthat/_snaps/plotly-subplot/plotly-subplot-ggmatrix.svg +++ b/tests/testthat/_snaps/plotly-subplot/plotly-subplot-ggmatrix.svg @@ -1 +1 @@ -0.02.55.07.50.02.55.07.556780.02.55.07.50.00.51.01.52.02.52462.02.53.03.54.04.50.00.10.20.30.42.02.53.03.54.04.5Corr:-0.118246Corr:-0.428***Corr:0.872***0.00.51.01.52.02.5Corr:0.963***Corr:-0.366***Corr:0.818***setosaversicolorvirginicaSepal.LengthSepal.WidthPetal.LengthPetal.WidthSpeciesPetal.WidthPetal.LengthSepal.WidthSepal.Lengthsetosaversicolorvirginicasetosaversicolorvirginicasetosaversicolorvirginicasetosaversicolorvirginica +0.02.55.07.50.02.55.07.556780.02.55.07.50.00.51.01.52.02.52462.02.53.03.54.04.50.00.10.20.30.42.02.53.03.54.04.5Corr:-0.118246Corr:-0.428***Corr:0.872***0.00.51.01.52.02.5Corr:0.963***Corr:-0.366***Corr:0.818***setosaversicolorvirginicaSepal.LengthSepal.WidthPetal.LengthPetal.WidthSpeciesPetal.WidthPetal.LengthSepal.WidthSepal.Lengthsetosaversicolorvirginicasetosaversicolorvirginicasetosaversicolorvirginicasetosaversicolorvirginica diff --git a/tests/testthat/_snaps/plotly-subplot/plotly-subplot-shareboth.svg b/tests/testthat/_snaps/plotly-subplot/plotly-subplot-shareboth.svg index 96e471340a..97cc7c9931 100644 --- a/tests/testthat/_snaps/plotly-subplot/plotly-subplot-shareboth.svg +++ b/tests/testthat/_snaps/plotly-subplot/plotly-subplot-shareboth.svg @@ -1 +1 @@ -00.20.40.60.810.511.500.20.40.60.810.511.5trace 0trace 1trace 2trace 3 +00.20.40.60.810.511.500.20.40.60.810.511.5trace 0trace 1trace 2trace 3 diff --git a/tests/testthat/_snaps/plotly-subplot/plotly-subplot-simple.svg b/tests/testthat/_snaps/plotly-subplot/plotly-subplot-simple.svg index e5c90c3a1a..4ed99cb0ea 100644 --- a/tests/testthat/_snaps/plotly-subplot/plotly-subplot-simple.svg +++ b/tests/testthat/_snaps/plotly-subplot/plotly-subplot-simple.svg @@ -1 +1 @@ -0.511.522.500.20.40.60.810.511.522.500.20.40.60.81trace 0trace 1 +0.511.522.500.20.40.60.810.511.522.500.20.40.60.81trace 0trace 1 diff --git a/tests/testthat/_snaps/plotly-subplot/plotly-subplot-subplot-legendgroup.svg b/tests/testthat/_snaps/plotly-subplot/plotly-subplot-subplot-legendgroup.svg index d460d28c26..770ff1a7e4 100644 --- a/tests/testthat/_snaps/plotly-subplot/plotly-subplot-subplot-legendgroup.svg +++ b/tests/testthat/_snaps/plotly-subplot/plotly-subplot-subplot-legendgroup.svg @@ -1 +1 @@ -0510−3−2−10123x1x2x3 +0510−3−2−10123x1x2x3 diff --git a/tests/testthat/_snaps/plotly-subplot/subplot-reposition-annotation.svg b/tests/testthat/_snaps/plotly-subplot/subplot-reposition-annotation.svg index ee5ead7d9b..3697bf870f 100644 --- a/tests/testthat/_snaps/plotly-subplot/subplot-reposition-annotation.svg +++ b/tests/testthat/_snaps/plotly-subplot/subplot-reposition-annotation.svg @@ -1 +1 @@ -0246−1012340246−101234foobar +0246−1012340246−101234foobar diff --git a/tests/testthat/_snaps/plotly-symbol/plotly-symbol-logical.svg b/tests/testthat/_snaps/plotly-symbol/plotly-symbol-logical.svg index 461401d867..a8d862f110 100644 --- a/tests/testthat/_snaps/plotly-symbol/plotly-symbol-logical.svg +++ b/tests/testthat/_snaps/plotly-symbol/plotly-symbol-logical.svg @@ -1 +1 @@ -246810246810FALSETRUE +246810246810FALSETRUE diff --git a/tests/testthat/_snaps/plotly/layout-grid.svg b/tests/testthat/_snaps/plotly/layout-grid.svg index 3e174605f4..67da328d14 100644 --- a/tests/testthat/_snaps/plotly/layout-grid.svg +++ b/tests/testthat/_snaps/plotly/layout-grid.svg @@ -1 +1 @@ -00.511.521234500.511.521234500.511.521234500.511.521234500.511.521234500.511.5212345trace 0trace 1trace 2trace 3trace 4trace 5 +00.511.521234500.511.521234500.511.521234500.511.521234500.511.521234500.511.5212345trace 0trace 1trace 2trace 3trace 4trace 5 diff --git a/tests/testthat/_snaps/plotly/plotly-alpha-blending.svg b/tests/testthat/_snaps/plotly/plotly-alpha-blending.svg index 282bba28b8..dfc59bce2d 100644 --- a/tests/testthat/_snaps/plotly/plotly-alpha-blending.svg +++ b/tests/testthat/_snaps/plotly/plotly-alpha-blending.svg @@ -1 +1 @@ -−3−2−1012−2−10123trace 0trace 1−202rnorm(100) +−3−2−1012−2−10123trace 0trace 1−202rnorm(100) diff --git a/tests/testthat/_snaps/plotly/plotly-box-data-array.svg b/tests/testthat/_snaps/plotly/plotly-box-data-array.svg index 1ce66a81fd..7d158da74d 100644 --- a/tests/testthat/_snaps/plotly/plotly-box-data-array.svg +++ b/tests/testthat/_snaps/plotly/plotly-box-data-array.svg @@ -1 +1 @@ - + diff --git a/tests/testthat/_snaps/plotly/plotly-character-axis.svg b/tests/testthat/_snaps/plotly/plotly-character-axis.svg index 879495417b..d6ca87256a 100644 --- a/tests/testthat/_snaps/plotly/plotly-character-axis.svg +++ b/tests/testthat/_snaps/plotly/plotly-character-axis.svg @@ -1 +1 @@ -ABCDEFGHIJKLMNOPQRSTUVWXYZ0510152025a1a2 +ABCDEFGHIJKLMNOPQRSTUVWXYZ0510152025a1a2 diff --git a/tests/testthat/_snaps/plotly/plotly-time-series-summary.svg b/tests/testthat/_snaps/plotly/plotly-time-series-summary.svg index a4abc437b6..2d31546eac 100644 --- a/tests/testthat/_snaps/plotly/plotly-time-series-summary.svg +++ b/tests/testthat/_snaps/plotly/plotly-time-series-summary.svg @@ -1 +1 @@ -200020052010201550k100k150k200k250k300kTexan CitiesmedianIQRdatemedian +200020052010201550k100k150k200k250k300kTexan CitiesmedianIQRdatemedian From 95dbd878a2108bb0025d547ac55631a9cb66ea7e Mon Sep 17 00:00:00 2001 From: Carson Date: Fri, 2 Jul 2021 18:24:21 -0500 Subject: [PATCH 31/42] missed one --- .../plotly-color-scatterplot-color-factor-custom.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testthat/_snaps/plotly-color/plotly-color-scatterplot-color-factor-custom.svg b/tests/testthat/_snaps/plotly-color/plotly-color-scatterplot-color-factor-custom.svg index 7a11cdb822..b01c65cca9 100644 --- a/tests/testthat/_snaps/plotly-color/plotly-color-scatterplot-color-factor-custom.svg +++ b/tests/testthat/_snaps/plotly-color/plotly-color-scatterplot-color-factor-custom.svg @@ -1 +1 @@ -354045505560170180190200210220230AdelieChinstrapGentoobill_length_mmflipper_length_mm +354045505560170180190200210220230AdelieChinstrapGentoobill_length_mmflipper_length_mm From 11ea89a85f01720f235ca6e82ec4bb9540d10fb6 Mon Sep 17 00:00:00 2001 From: Carson Date: Fri, 2 Jul 2021 18:30:43 -0500 Subject: [PATCH 32/42] install --- .github/workflows/R-CMD-check.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index e78c6c3302..81ea7989e8 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -114,6 +114,10 @@ jobs: sessioninfo::session_info(pkgs, include_base = TRUE) shell: Rscript {0} + - name: Install package + run: R CMD install . + shell: bash + # Run test() before R CMD check since, for some reason, rcmdcheck::rcmdcheck() skips vdiffr tests - name: Run Tests run: | From 79f646b248ebef9dd23d832aeea87c92a792b14c Mon Sep 17 00:00:00 2001 From: Carson Date: Wed, 14 Jul 2021 15:47:47 -0500 Subject: [PATCH 33/42] accept new baselines --- .../plotly-color-scatterplot-color-factor-custom.svg | 2 +- tests/testthat/_snaps/plotly-symbol/plotly-symbol-ordering.svg | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/testthat/_snaps/plotly-color/plotly-color-scatterplot-color-factor-custom.svg b/tests/testthat/_snaps/plotly-color/plotly-color-scatterplot-color-factor-custom.svg index b01c65cca9..7a11cdb822 100644 --- a/tests/testthat/_snaps/plotly-color/plotly-color-scatterplot-color-factor-custom.svg +++ b/tests/testthat/_snaps/plotly-color/plotly-color-scatterplot-color-factor-custom.svg @@ -1 +1 @@ -354045505560170180190200210220230AdelieChinstrapGentoobill_length_mmflipper_length_mm +354045505560170180190200210220230AdelieChinstrapGentoobill_length_mmflipper_length_mm diff --git a/tests/testthat/_snaps/plotly-symbol/plotly-symbol-ordering.svg b/tests/testthat/_snaps/plotly-symbol/plotly-symbol-ordering.svg index 17d00d3104..05744071da 100644 --- a/tests/testthat/_snaps/plotly-symbol/plotly-symbol-ordering.svg +++ b/tests/testthat/_snaps/plotly-symbol/plotly-symbol-ordering.svg @@ -1 +1 @@ -1015202530355010015020025030035040045010mpgdisp +1015202530355010015020025030035040045010mpgdisp From ee06116777a7c2a0418211cf2bfaecdeb9627857 Mon Sep 17 00:00:00 2001 From: Carson Date: Wed, 14 Jul 2021 15:58:58 -0500 Subject: [PATCH 34/42] fix install --- .github/workflows/R-CMD-check.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 81ea7989e8..7efe2041ae 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -115,8 +115,8 @@ jobs: shell: Rscript {0} - name: Install package - run: R CMD install . - shell: bash + run: pak::pak() + shell: Rscript {0} # Run test() before R CMD check since, for some reason, rcmdcheck::rcmdcheck() skips vdiffr tests - name: Run Tests From 9bb78ecc34ac6a64a87659d67be66aea705d67f9 Mon Sep 17 00:00:00 2001 From: Carson Date: Wed, 14 Jul 2021 15:59:09 -0500 Subject: [PATCH 35/42] update news --- NEWS.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/NEWS.md b/NEWS.md index 0d8ed408a7..690324610d 100644 --- a/NEWS.md +++ b/NEWS.md @@ -8,6 +8,10 @@ * `ggplotly()` now uses the `layout.legend.title` (instead of `layout.annotations`) plotly.js API to convert guides for discrete scales. (#1961) +## New Features + +* Added new `kaleido()` function for static image exporting via the + ## Improvements * `ggplotly()` now better positions axis titles for `facet_wrap()`/`facet_grid()`. (#1975) From 5c948f457c691e6a41b2720515d31d0fa87a4271 Mon Sep 17 00:00:00 2001 From: Carson Date: Wed, 14 Jul 2021 15:59:48 -0500 Subject: [PATCH 36/42] add installation section --- R/kaleido.R | 13 +++++++++++++ man/kaleido.Rd | 11 +++++++++++ 2 files changed, 24 insertions(+) diff --git a/R/kaleido.R b/R/kaleido.R index 088ee24fd0..5ac8127cb4 100644 --- a/R/kaleido.R +++ b/R/kaleido.R @@ -5,6 +5,19 @@ #' kaleido into a \pkg{reticulate}d Python session and returns a `$transform()` #' method for converting R plots into static images (see examples below). #' +#' @section Installation: +#' +#' `kaleido()` requires [the kaleido python +#' package](https://github.com/plotly/Kaleido/) to be usable via the \pkg{reticulate} package. Here is a recommended way to do the installation: +#' +#' ``` +#' install.packages('reticulate') +#' reticulate::install_miniconda() +#' reticulate::conda_install('r-reticulate', 'python-kaleido') +#' reticulate::conda_install('r-reticulate', 'plotly', channel = 'plotly') +#' reticulate::use_miniconda('r-reticulate') +#' ``` +#' #' @param ... not currently used. #' @export #' @return an environment which contains: diff --git a/man/kaleido.Rd b/man/kaleido.Rd index e7658096b5..40f733ec18 100644 --- a/man/kaleido.Rd +++ b/man/kaleido.Rd @@ -38,6 +38,17 @@ Static image exporting via \href{https://github.com/plotly/Kaleido/}{the kaleido kaleido into a \pkg{reticulate}d Python session and returns a \verb{$transform()} method for converting R plots into static images (see examples below). } +\section{Installation}{ + + +\code{kaleido()} requires \href{https://github.com/plotly/Kaleido/}{the kaleido python package} to be usable via the \pkg{reticulate} package. Here is a recommended way to do the installation:\preformatted{install.packages('reticulate') +reticulate::install_miniconda() +reticulate::conda_install('r-reticulate', 'python-kaleido') +reticulate::conda_install('r-reticulate', 'plotly', channel = 'plotly') +reticulate::use_miniconda('r-reticulate') +} +} + \examples{ \dontrun{ From 0a37c6a4dbb2f76bf041d4999a727c920ae27209 Mon Sep 17 00:00:00 2001 From: Carson Date: Wed, 14 Jul 2021 16:04:13 -0500 Subject: [PATCH 37/42] update news --- NEWS.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/NEWS.md b/NEWS.md index 690324610d..619b797338 100644 --- a/NEWS.md +++ b/NEWS.md @@ -10,7 +10,7 @@ ## New Features -* Added new `kaleido()` function for static image exporting via the +* Added new `kaleido()` function for static image exporting via the [kaleido python package](https://github.com/plotly/Kaleido). See `help(kaleido, package = "plotly")` for installation info and example usage. (#1971) ## Improvements From b8eb4bd636a9a8eb81d69ba2cf5513e227e0d183 Mon Sep 17 00:00:00 2001 From: Carson Date: Wed, 14 Jul 2021 16:04:53 -0500 Subject: [PATCH 38/42] add back sf --- DESCRIPTION | 1 + 1 file changed, 1 insertion(+) diff --git a/DESCRIPTION b/DESCRIPTION index 86df1578ba..2ece4f7c43 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -67,6 +67,7 @@ Suggests: dendextend, maptools, rgeos, + sf, png, IRdisplay, processx, From 6963800af5758d9f0d72182a94403d462a45126a Mon Sep 17 00:00:00 2001 From: Carson Date: Wed, 14 Jul 2021 16:16:34 -0500 Subject: [PATCH 39/42] don't upgrade --- .github/workflows/R-CMD-check.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 7efe2041ae..a2f73ea338 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -89,7 +89,7 @@ jobs: - name: Install dependencies run: | if (Sys.info()[['sysname']] == 'Darwin') options(pkgType = 'mac.binary') - pak::local_install_dev_deps(upgrade = TRUE) + pak::local_install_dev_deps(upgrade = FALSE) pak::pkg_install("rcmdcheck") shell: Rscript {0} From 225be140b8e01e68b7f33874dc9f8f31f89e4053 Mon Sep 17 00:00:00 2001 From: Carson Date: Wed, 14 Jul 2021 16:25:48 -0500 Subject: [PATCH 40/42] don't upgrade --- .github/workflows/R-CMD-check.yaml | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index a2f73ea338..28bbdbba2b 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -78,20 +78,19 @@ jobs: pak::local_system_requirements(execute = TRUE) pak::pkg_system_requirements("rcmdcheck", execute = TRUE) shell: Rscript {0} - - - name: Install phantomjs - if: matrix.config.shinytest == true - run: | - pak::pak("shinytest") - shinytest::installDependencies() - shell: Rscript {0} - + - name: Install dependencies run: | if (Sys.info()[['sysname']] == 'Darwin') options(pkgType = 'mac.binary') pak::local_install_dev_deps(upgrade = FALSE) pak::pkg_install("rcmdcheck") shell: Rscript {0} + + - name: Install phantomjs + if: matrix.config.shinytest == true + run: | + shinytest::installDependencies() + shell: Rscript {0} - name: Set up Python 3.8 uses: actions/setup-python@v2 @@ -115,7 +114,7 @@ jobs: shell: Rscript {0} - name: Install package - run: pak::pak() + run: pak::pak(upgrade = FALSE) shell: Rscript {0} # Run test() before R CMD check since, for some reason, rcmdcheck::rcmdcheck() skips vdiffr tests From 283900403856189b845d35e693ba8d460e3fc7d9 Mon Sep 17 00:00:00 2001 From: Carson Date: Wed, 14 Jul 2021 16:43:38 -0500 Subject: [PATCH 41/42] approve new visual baselines --- tests/testthat/_snaps/ggplot-facets/3-panels.svg | 2 +- tests/testthat/_snaps/ggplot-facets/barley.svg | 2 +- tests/testthat/_snaps/ggplot-facets/facet-grid-free-x.svg | 2 +- tests/testthat/_snaps/ggplot-facets/facet-grid-free.svg | 2 +- tests/testthat/_snaps/ggplot-facets/facet-grid-labeller.svg | 2 +- tests/testthat/_snaps/ggplot-facets/facet-wrap-free-mult.svg | 2 +- tests/testthat/_snaps/ggplot-facets/facet-wrap-free-y-2.svg | 2 +- tests/testthat/_snaps/ggplot-facets/facet-wrap-free.svg | 2 +- tests/testthat/_snaps/ggplot-facets/facet-wrap-labeller.svg | 2 +- tests/testthat/_snaps/ggplot-facets/facet-wrap.svg | 2 +- .../_snaps/ggplot-histogram/histogram-fill-factor-facets.svg | 2 +- tests/testthat/_snaps/ggplot-map/map-facet.svg | 2 +- tests/testthat/_snaps/ggplot-point/all-shapes.svg | 2 +- tests/testthat/_snaps/ggplot-sf/sf-fill-text.svg | 2 +- tests/testthat/_snaps/ggplot-smooth/smooth-facet.svg | 2 +- tests/testthat/_snaps/ggplot-ticks/ticks-boxes-facet-grid.svg | 2 +- tests/testthat/_snaps/ggplot-ticks/ticks-boxes-scales-free.svg | 2 +- tests/testthat/_snaps/ggplot-ticks/ticks-boxes-space-free.svg | 2 +- tests/testthat/_snaps/ggplot-ticks/ticks-flip-grid-free.svg | 2 +- tests/testthat/_snaps/ggplot-ticks/ticks-flip-grid.svg | 2 +- tests/testthat/_snaps/plotly-symbol/plotly-symbol-ordering.svg | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/tests/testthat/_snaps/ggplot-facets/3-panels.svg b/tests/testthat/_snaps/ggplot-facets/3-panels.svg index 641300c8cb..348e943a8c 100644 --- a/tests/testthat/_snaps/ggplot-facets/3-panels.svg +++ b/tests/testthat/_snaps/ggplot-facets/3-panels.svg @@ -1 +1 @@ -0.000.250.500.751.000.000.250.500.751.000.000.250.500.751.000.000.250.500.751.00xyabc +0.000.250.500.751.000.000.250.500.751.000.000.250.500.751.000.000.250.500.751.00xyabc diff --git a/tests/testthat/_snaps/ggplot-facets/barley.svg b/tests/testthat/_snaps/ggplot-facets/barley.svg index 145e0fab63..158b85e640 100644 --- a/tests/testthat/_snaps/ggplot-facets/barley.svg +++ b/tests/testthat/_snaps/ggplot-facets/barley.svg @@ -1 +1 @@ -SvansotaNo. 462ManchuriaNo. 475VelvetPeatlandGlabronNo. 457Wisconsin No. 38TrebiSvansotaNo. 462ManchuriaNo. 475VelvetPeatlandGlabronNo. 457Wisconsin No. 38TrebiSvansotaNo. 462ManchuriaNo. 475VelvetPeatlandGlabronNo. 457Wisconsin No. 38TrebiSvansotaNo. 462ManchuriaNo. 475VelvetPeatlandGlabronNo. 457Wisconsin No. 38TrebiSvansotaNo. 462ManchuriaNo. 475VelvetPeatlandGlabronNo. 457Wisconsin No. 38Trebi2030405060SvansotaNo. 462ManchuriaNo. 475VelvetPeatlandGlabronNo. 457Wisconsin No. 38Trebiyear19321931yieldvarietyGrand RapidsDuluthUniversity FarmMorrisCrookstonWaseca +SvansotaNo. 462ManchuriaNo. 475VelvetPeatlandGlabronNo. 457Wisconsin No. 38TrebiSvansotaNo. 462ManchuriaNo. 475VelvetPeatlandGlabronNo. 457Wisconsin No. 38TrebiSvansotaNo. 462ManchuriaNo. 475VelvetPeatlandGlabronNo. 457Wisconsin No. 38TrebiSvansotaNo. 462ManchuriaNo. 475VelvetPeatlandGlabronNo. 457Wisconsin No. 38TrebiSvansotaNo. 462ManchuriaNo. 475VelvetPeatlandGlabronNo. 457Wisconsin No. 38Trebi2030405060SvansotaNo. 462ManchuriaNo. 475VelvetPeatlandGlabronNo. 457Wisconsin No. 38Trebiyear19321931yieldvarietyGrand RapidsDuluthUniversity FarmMorrisCrookstonWaseca diff --git a/tests/testthat/_snaps/ggplot-facets/facet-grid-free-x.svg b/tests/testthat/_snaps/ggplot-facets/facet-grid-free-x.svg index 7eace54ee1..fc7d74af40 100644 --- a/tests/testthat/_snaps/ggplot-facets/facet-grid-free-x.svg +++ b/tests/testthat/_snaps/ggplot-facets/facet-grid-free-x.svg @@ -1 +1 @@ -234510152025234515202530mpgwt0101 +234510152025234515202530mpgwt0101 diff --git a/tests/testthat/_snaps/ggplot-facets/facet-grid-free.svg b/tests/testthat/_snaps/ggplot-facets/facet-grid-free.svg index f27841664e..f3a51db618 100644 --- a/tests/testthat/_snaps/ggplot-facets/facet-grid-free.svg +++ b/tests/testthat/_snaps/ggplot-facets/facet-grid-free.svg @@ -1 +1 @@ -2345101520251.52.02.53.03.515202530mpgwt0101 +2345101520251.52.02.53.03.515202530mpgwt0101 diff --git a/tests/testthat/_snaps/ggplot-facets/facet-grid-labeller.svg b/tests/testthat/_snaps/ggplot-facets/facet-grid-labeller.svg index 90cd4fd68f..62f258f0da 100644 --- a/tests/testthat/_snaps/ggplot-facets/facet-grid-labeller.svg +++ b/tests/testthat/_snaps/ggplot-facets/facet-grid-labeller.svg @@ -1 +1 @@ -23451015202530352345101520253035mpgwtam: 0am: 1vs: 0vs: 1 +23451015202530352345101520253035mpgwtam: 0am: 1vs: 0vs: 1 diff --git a/tests/testthat/_snaps/ggplot-facets/facet-wrap-free-mult.svg b/tests/testthat/_snaps/ggplot-facets/facet-wrap-free-mult.svg index 7d03989d38..230fc69b70 100644 --- a/tests/testthat/_snaps/ggplot-facets/facet-wrap-free-mult.svg +++ b/tests/testthat/_snaps/ggplot-facets/facet-wrap-free-mult.svg @@ -1 +1 @@ -25301.52.02.53.0181920212.753.003.253.5010.012.515.017.53.54.04.55.05.5mpgwt468 +25301.52.02.53.0181920212.753.003.253.5010.012.515.017.53.54.04.55.05.5mpgwt468 diff --git a/tests/testthat/_snaps/ggplot-facets/facet-wrap-free-y-2.svg b/tests/testthat/_snaps/ggplot-facets/facet-wrap-free-y-2.svg index 2b5fcb1510..91add35b11 100644 --- a/tests/testthat/_snaps/ggplot-facets/facet-wrap-free-y-2.svg +++ b/tests/testthat/_snaps/ggplot-facets/facet-wrap-free-y-2.svg @@ -1 +1 @@ -025005000750010000125005101519701980199020002010400080001200020000022500025000027500030000032500019701980199020002010510152025datevaluepcepoppsavertuempmedunemploy +025005000750010000125005101519701980199020002010400080001200020000022500025000027500030000032500019701980199020002010510152025datevaluepcepoppsavertuempmedunemploy diff --git a/tests/testthat/_snaps/ggplot-facets/facet-wrap-free.svg b/tests/testthat/_snaps/ggplot-facets/facet-wrap-free.svg index 0e3af757f7..f9d5253d1e 100644 --- a/tests/testthat/_snaps/ggplot-facets/facet-wrap-free.svg +++ b/tests/testthat/_snaps/ggplot-facets/facet-wrap-free.svg @@ -1 +1 @@ -10.012.515.017.53.54.04.55.05.5182022242.502.753.003.253.50151821242.42.83.23.625301.52.02.5mpgwt00011011 +10.012.515.017.53.54.04.55.05.5182022242.502.753.003.253.50151821242.42.83.23.625301.52.02.5mpgwt00011011 diff --git a/tests/testthat/_snaps/ggplot-facets/facet-wrap-labeller.svg b/tests/testthat/_snaps/ggplot-facets/facet-wrap-labeller.svg index e6250c252c..3b0802bb2c 100644 --- a/tests/testthat/_snaps/ggplot-facets/facet-wrap-labeller.svg +++ b/tests/testthat/_snaps/ggplot-facets/facet-wrap-labeller.svg @@ -1 +1 @@ -1015202530352345101520253035mpgwtam: 0am: 1 +1015202530352345101520253035mpgwtam: 0am: 1 diff --git a/tests/testthat/_snaps/ggplot-facets/facet-wrap.svg b/tests/testthat/_snaps/ggplot-facets/facet-wrap.svg index 038084b2ba..cdac041803 100644 --- a/tests/testthat/_snaps/ggplot-facets/facet-wrap.svg +++ b/tests/testthat/_snaps/ggplot-facets/facet-wrap.svg @@ -1 +1 @@ -1015202530352345101520253035101520253035mpgwt468 +1015202530352345101520253035101520253035mpgwt468 diff --git a/tests/testthat/_snaps/ggplot-histogram/histogram-fill-factor-facets.svg b/tests/testthat/_snaps/ggplot-histogram/histogram-fill-factor-facets.svg index 9bf236a9eb..96a5a2f728 100644 --- a/tests/testthat/_snaps/ggplot-histogram/histogram-fill-factor-facets.svg +++ b/tests/testthat/_snaps/ggplot-histogram/histogram-fill-factor-facets.svg @@ -1 +1 @@ -234502462345factor(vs)01wtcount01 +234502462345factor(vs)01wtcount01 diff --git a/tests/testthat/_snaps/ggplot-map/map-facet.svg b/tests/testthat/_snaps/ggplot-map/map-facet.svg index 6dcca7fd73..95e8a8e456 100644 --- a/tests/testthat/_snaps/ggplot-map/map-facet.svg +++ b/tests/testthat/_snaps/ggplot-map/map-facet.svg @@ -1 +1 @@ -253035404550-120-100-80253035404550-120-100-80100200300valuexyAssaultMurderRapeUrbanPop +253035404550-120-100-80253035404550-120-100-80100200300valuexyAssaultMurderRapeUrbanPop diff --git a/tests/testthat/_snaps/ggplot-point/all-shapes.svg b/tests/testthat/_snaps/ggplot-point/all-shapes.svg index 4b50918226..8a3abdcb25 100644 --- a/tests/testthat/_snaps/ggplot-point/all-shapes.svg +++ b/tests/testthat/_snaps/ggplot-point/all-shapes.svg @@ -1 +1 @@ --0.050-0.0250.0000.0250.050-0.050-0.0250.0000.0250.050-0.050-0.0250.0000.0250.050-0.050-0.0250.0000.0250.050-0.050-0.0250.0000.0250.050-0.050-0.0250.0000.0250.050-0.050-0.0250.0000.0250.050-0.050-0.0250.0000.0250.050-0.050-0.0250.0000.0250.050-0.050-0.0250.0000.0250.0500123456789101112131415161718192021222324xy0123456789101112131415161718192021222324 +-0.050-0.0250.0000.0250.050-0.050-0.0250.0000.0250.050-0.050-0.0250.0000.0250.050-0.050-0.0250.0000.0250.050-0.050-0.0250.0000.0250.050-0.050-0.0250.0000.0250.050-0.050-0.0250.0000.0250.050-0.050-0.0250.0000.0250.050-0.050-0.0250.0000.0250.050-0.050-0.0250.0000.0250.0500123456789101112131415161718192021222324xy0123456789101112131415161718192021222324 diff --git a/tests/testthat/_snaps/ggplot-sf/sf-fill-text.svg b/tests/testthat/_snaps/ggplot-sf/sf-fill-text.svg index 3b69f6c9f7..7fd6eb8fce 100644 --- a/tests/testthat/_snaps/ggplot-sf/sf-fill-text.svg +++ b/tests/testthat/_snaps/ggplot-sf/sf-fill-text.svg @@ -1 +1 @@ -84 ° W82 ° W80 ° W78 ° W76 ° W34.0 ° N34.5 ° N35.0 ° N35.5 ° N36.0 ° N36.5 ° N0.050.100.150.20AREA +84 ° W82 ° W80 ° W78 ° W76 ° W34.0 ° N34.5 ° N35.0 ° N35.5 ° N36.0 ° N36.5 ° N0.050.100.150.20AREA diff --git a/tests/testthat/_snaps/ggplot-smooth/smooth-facet.svg b/tests/testthat/_snaps/ggplot-smooth/smooth-facet.svg index 6b9d354bdb..53d2a52291 100644 --- a/tests/testthat/_snaps/ggplot-smooth/smooth-facet.svg +++ b/tests/testthat/_snaps/ggplot-smooth/smooth-facet.svg @@ -1 +1 @@ -0500010000150002000012305000100001500020000123123cutFairGoodVery GoodPremiumIdealcaratpriceFairGoodVery GoodPremiumIdeal +0500010000150002000012305000100001500020000123123cutFairGoodVery GoodPremiumIdealcaratpriceFairGoodVery GoodPremiumIdeal diff --git a/tests/testthat/_snaps/ggplot-ticks/ticks-boxes-facet-grid.svg b/tests/testthat/_snaps/ggplot-ticks/ticks-boxes-facet-grid.svg index 3262aa00b4..00e03cb0f7 100644 --- a/tests/testthat/_snaps/ggplot-ticks/ticks-boxes-facet-grid.svg +++ b/tests/testthat/_snaps/ggplot-ticks/ticks-boxes-facet-grid.svg @@ -1 +1 @@ -ctrltrt1trt23.54.04.55.05.56.0ctrltrt1trt2groupweightcontroltreatment +ctrltrt1trt23.54.04.55.05.56.0ctrltrt1trt2groupweightcontroltreatment diff --git a/tests/testthat/_snaps/ggplot-ticks/ticks-boxes-scales-free.svg b/tests/testthat/_snaps/ggplot-ticks/ticks-boxes-scales-free.svg index 85d854e17f..c6abb1e335 100644 --- a/tests/testthat/_snaps/ggplot-ticks/ticks-boxes-scales-free.svg +++ b/tests/testthat/_snaps/ggplot-ticks/ticks-boxes-scales-free.svg @@ -1 +1 @@ -ctrl3.54.04.55.05.56.0trt1trt2groupweightcontroltreatment +ctrl3.54.04.55.05.56.0trt1trt2groupweightcontroltreatment diff --git a/tests/testthat/_snaps/ggplot-ticks/ticks-boxes-space-free.svg b/tests/testthat/_snaps/ggplot-ticks/ticks-boxes-space-free.svg index 85d854e17f..c6abb1e335 100644 --- a/tests/testthat/_snaps/ggplot-ticks/ticks-boxes-space-free.svg +++ b/tests/testthat/_snaps/ggplot-ticks/ticks-boxes-space-free.svg @@ -1 +1 @@ -ctrl3.54.04.55.05.56.0trt1trt2groupweightcontroltreatment +ctrl3.54.04.55.05.56.0trt1trt2groupweightcontroltreatment diff --git a/tests/testthat/_snaps/ggplot-ticks/ticks-flip-grid-free.svg b/tests/testthat/_snaps/ggplot-ticks/ticks-flip-grid-free.svg index 5a5aa3dbd6..9ea33bd957 100644 --- a/tests/testthat/_snaps/ggplot-ticks/ticks-flip-grid-free.svg +++ b/tests/testthat/_snaps/ggplot-ticks/ticks-flip-grid-free.svg @@ -1 +1 @@ -ctrl3.54.04.55.05.56.0trt1trt2weightgroupcontroltreatment +ctrl3.54.04.55.05.56.0trt1trt2weightgroupcontroltreatment diff --git a/tests/testthat/_snaps/ggplot-ticks/ticks-flip-grid.svg b/tests/testthat/_snaps/ggplot-ticks/ticks-flip-grid.svg index 4c48d7fc7d..40aa38b7f5 100644 --- a/tests/testthat/_snaps/ggplot-ticks/ticks-flip-grid.svg +++ b/tests/testthat/_snaps/ggplot-ticks/ticks-flip-grid.svg @@ -1 +1 @@ -ctrltrt1trt23.54.04.55.05.56.0ctrltrt1trt2weightgroupcontroltreatment +ctrltrt1trt23.54.04.55.05.56.0ctrltrt1trt2weightgroupcontroltreatment diff --git a/tests/testthat/_snaps/plotly-symbol/plotly-symbol-ordering.svg b/tests/testthat/_snaps/plotly-symbol/plotly-symbol-ordering.svg index 05744071da..17d00d3104 100644 --- a/tests/testthat/_snaps/plotly-symbol/plotly-symbol-ordering.svg +++ b/tests/testthat/_snaps/plotly-symbol/plotly-symbol-ordering.svg @@ -1 +1 @@ -1015202530355010015020025030035040045010mpgdisp +1015202530355010015020025030035040045010mpgdisp From a9280964f4ac02945470e7c7c34f0a6832b8b14a Mon Sep 17 00:00:00 2001 From: Carson Date: Wed, 14 Jul 2021 17:01:27 -0500 Subject: [PATCH 42/42] pak isn't ready for prod --- .github/workflows/R-CMD-check.yaml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 28bbdbba2b..9130ae3125 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -85,12 +85,6 @@ jobs: pak::local_install_dev_deps(upgrade = FALSE) pak::pkg_install("rcmdcheck") shell: Rscript {0} - - - name: Install phantomjs - if: matrix.config.shinytest == true - run: | - shinytest::installDependencies() - shell: Rscript {0} - name: Set up Python 3.8 uses: actions/setup-python@v2 @@ -113,9 +107,12 @@ jobs: sessioninfo::session_info(pkgs, include_base = TRUE) shell: Rscript {0} - - name: Install package - run: pak::pak(upgrade = FALSE) - shell: Rscript {0} + - name: Install shinytest deps + if: matrix.config.shinytest == true + run: | + Rscript -e 'shinytest::installDependencies()' + R CMD install . + shell: bash # Run test() before R CMD check since, for some reason, rcmdcheck::rcmdcheck() skips vdiffr tests - name: Run Tests