fix: address various check/test/CI issues (#2441)

* Follow up to #1999: update test expectation to not expect warning

* Temporarily test against CRAN ggplot2

* Avoid :: on old ggplot2 function

* Disable oldrel-4; roxygen stuff

* Update URL

* Try to fix kaliedo install

* Fix more roxygen issues

* Pass data to use_defaults() method (this way GeomSf default aes logic will actually work as expected)

* Approve new snapshots

* Revert "Pass data to use_defaults() method (this way GeomSf default aes logic will actually work as expected)"

This reverts commit 01e73fb.

Author: cpsievert

.github/workflows/R-CMD-check.yaml

@@ -35,7 +35,7 @@ jobs:
           - {os: ubuntu-latest,   r: 'oldrel-1'}
           - {os: ubuntu-latest,   r: 'oldrel-2'}
           - {os: ubuntu-latest,   r: 'oldrel-3'}
-          - {os: ubuntu-latest,   r: 'oldrel-4'}
+          # - {os: ubuntu-latest,   r: 'oldrel-4'} # dependency issues with oldrel-4
 
     env:
       VISUAL_TESTS: ${{ matrix.config.visual_tests }}
@@ -63,10 +63,16 @@ jobs:
           cache-version: 3
           needs: check
 
+      - name: Set up Python (for reticulate)
+        if: matrix.config.visual_tests == true
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.11'
+
       - name: Install kaleido
         if: matrix.config.visual_tests == true
         run: |
-          Rscript -e 'library(reticulate); use_python(install_python()); py_install(c("kaleido", "plotly"))'
+          Rscript -e 'library(reticulate); use_python(Sys.which("python")); py_install(c("kaleido", "plotly"))'
         
         # Run test() before R CMD check since, for some reason, rcmdcheck::rcmdcheck() skips vdiffr tests
       - name: Run Tests

DESCRIPTION

@@ -78,11 +78,10 @@ Suggests:
     rsvg,
     ggridges
 LazyData: true
-RoxygenNote: 7.3.1
+RoxygenNote: 7.3.2
 Encoding: UTF-8
 Roxygen: list(markdown = TRUE)
 Config/Needs/check:
-    tidyverse/ggplot2,
     rcmdcheck,
     devtools,
     reshape2,

NAMESPACE

@@ -40,6 +40,9 @@ S3method(print,api_grid_local)
 S3method(print,api_plot)
 S3method(print,kaleidoScope)
 S3method(print,plotly_data)
+S3method(process,api_image)
+S3method(process,api_plot)
+S3method(process,default)
 S3method(to_basic,GeomAbline)
 S3method(to_basic,GeomAlluvium)
 S3method(to_basic,GeomAnnotationMap)

R/animate.R

@@ -122,7 +122,6 @@ animation_opts_defaults <- function() {
 }
 
 
-#' @inheritParams animation_opts
 #' @param hide remove the animation slider?
 #' @param ... for `animation_slider`, attributes are passed to a special
 #' layout.sliders object tied to the animation frames. 
@@ -149,7 +148,6 @@ animation_slider <- function(p, hide = FALSE, ...) {
 }
 
 
-#' @inheritParams animation_slider
 #' @param label a character string used for the animation button's label
 #' @export
 #' @rdname animation

R/api_exports.R

@@ -108,9 +108,6 @@
 #' 
 #' }
 #' 
-
-
-#' @rdname api
 #' @export
 api_create <- function(x = last_plot(), filename = NULL, 
                        fileopt = c("overwrite", "new"),

R/ggplotly.R

@@ -1157,8 +1157,9 @@ utils::globalVariables(c("groupDomains", "layers", "prestats_data", "scales", "s
 
 # Get the "complete" set of theme elements and their calculated values
 calculated_theme_elements <- function(plot) {
-  if (is.function(asNamespace("ggplot2")$complete_theme)) {
-    theme <- ggplot2::complete_theme(plot$theme)
+  complete_theme <- ggfun("complete_theme")
+  if (is.function(complete_theme)) {
+    theme <- complete_theme(plot$theme)
     elements <- names(theme)
   } else {
     theme <- ggfun("plot_theme")(plot)

R/orca.R

@@ -97,7 +97,6 @@ orca <- function(p, file = "plot.png", format = tools::file_ext(file),
 
 #' Orca image export server
 #' 
-#' @inheritParams orca
 #' @param port Sets the server's port number.
 #' @param keep_alive Turn on keep alive mode where orca will (try to) relaunch server if process unexpectedly exits.
 #' @param window_max_number Sets maximum number of browser windows the server can keep open at a given time.

R/process.R

@@ -6,14 +6,17 @@ process <- function(resp) {
   UseMethod("process")
 }
 
+#' @export
 process.default <- function(resp) {
   json_content(relay_error(resp))
 }
 
+#' @export
 process.api_plot <- function(resp) {
   json_content(relay_error(resp))
 }
 
+#' @export
 process.api_image <- function(resp) {
   relay_error(resp)
   type <- resp[["headers"]][["content-type"]]

README.md

@@ -142,8 +142,7 @@ test_that("Character strings correctly mapped to a positional axis", {
   letters <- LETTERS[as.numeric(sort(as.character(1:26)))]
   p <- plot_ly(x = letters, y = seq_along(letters)) %>% 
     add_bars(color = rep(c("a1", "a2"), length.out = 26))
-  l <- expect_warning(expect_traces(p, 2, "character-axis"), 
-                      regexp = "minimal value for n is 3")
+  l <- expect_traces(p, 2, "character-axis")
   expect_equivalent(l$layout$xaxis$type, "category")
   expect_equivalent(l$layout$xaxis$categoryorder, "array")
   expect_equivalent(l$layout$xaxis$categoryarray, LETTERS)