Merge pull request #1256 from ropensci/ggplot2-cran

cpsievert · web-flow · commit 2d400cfb0725 · 2018-07-10T13:49:16.000+10:00
drop ggplot2 2.2.1 support (i.e., require most recent CRAN release)
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -6,6 +6,7 @@ CONDUCT.md
 CONTRIBUTING.md
 build_site.R
 travis_debug.R
+revdep_email.R
 todo.R
 .github/
 inst/examples/rmd/*.html
@@ -17,3 +18,4 @@ revdep/
 ^LICENSE\.md$
 README.Rmd
 abbvie.R
+^\.httr-oauth$
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@ Rapp.history
 *.DS_Store
 node_modules/
 build_site.R
+revdep_email.R
 abbvie.R
 todo.R
 inst/examples/rmd/*.html
@@ -15,3 +16,4 @@ Untitled*
 rsconnect/
 revdep/
 travis_debug.R
+.httr-oauth
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -22,7 +22,7 @@ URL: https://plot.ly/r, https://cpsievert.github.io/plotly_book/, https://github
 BugReports: https://github.com/ropensci/plotly/issues
 Depends:
     R (>= 3.2.0),
-    ggplot2 (>= 2.2.1)
+    ggplot2 (>= 3.0.0)
 Imports:
     tools,
     scales,
@@ -72,8 +72,6 @@ Suggests:
     plotlyGeoAssets,
     rstudioapi,
     forcats
-Remotes:
-  tidyverse/ggplot2
 LazyData: true
 RoxygenNote: 6.0.1.9000
 Encoding: UTF-8
diff --git a/R/ggplotly-legacy.R b/R/ggplotly-legacy.R
diff --git a/R/ggplotly.R b/R/ggplotly.R
@@ -210,26 +210,6 @@ gg2list <- function(p, width = NULL, height = NULL,
     )
   }
   
-  # we currently support ggplot2 >= 2.2.1 (see DESCRIPTION)
-  # there are too many naming changes in 2.2.1.9000 to realistically 
-  if (!is_dev_ggplot2()) {
-    message(
-      "We recommend that you use the dev version of ggplot2 with `ggplotly()`\n",
-      "Install it with: `devtools::install_github('tidyverse/ggplot2')`"
-    )
-    if (!identical(dynamicTicks, FALSE)) {
-      warning(
-        "You need the dev version of ggplot2 to use `dynamicTicks`", call. = FALSE
-      )
-    }
-    return(
-      gg2list_legacy(
-        p, width = width, height = height, tooltip = tooltip,
-        layerData = layerData, originalData = originalData, source = source, ...
-      )
-    )
-  }
-  
   # ------------------------------------------------------------------------
   # Our internal version of ggplot2::ggplot_build(). Modified from
   # https://github.com/hadley/ggplot2/blob/0cd0ba/R/plot-build.r#L18-L92
@@ -264,8 +244,7 @@ gg2list <- function(p, width = NULL, height = NULL,
   # save the domain of the group for display in tooltips
   groupDomains <- Map(function(x, y) {
     aes_g <- y$mapping[["group"]] %||% plot$mapping[["group"]]
-    eval_ <- if (is_dev_ggplot2()) rlang::eval_tidy else base::eval
-    tryNULL(eval_(aes_g, x))
+    tryNULL(rlang::eval_tidy(aes_g, x))
   }, data, layers)
   
   # for simple (StatIdentity) geoms, add crosstalk key to aes mapping
@@ -1295,10 +1274,6 @@ rect2shape <- function(rekt = ggplot2::element_rect()) {
   )
 }
 
-is_dev_ggplot2 <- function() {
-  packageVersion("ggplot2") > "2.2.1"
-}
-
 # We need access to internal ggplot2 functions in several places
 # this helps us import functions in a way that R CMD check won't cry about
 ggfun <- function(x) {
diff --git a/R/layers2traces.R b/R/layers2traces.R
@@ -82,7 +82,6 @@ layers2traces <- function(data, prestats_data, layout, p) {
   # 2. geom_smooth() is really geom_path() + geom_ribbon()
   datz <- list()
   paramz <- list()
-  layout <- if (is_dev_ggplot2()) layout else list(layout = layout)
   for (i in seq_along(data)) {
     # This has to be done in a loop, since some layers are really two layers,
     # (and we need to replicate the data/params in those cases)
diff --git a/tests/testthat.R b/tests/testthat.R
@@ -150,9 +150,7 @@ test_run <- function(...) {
   test_check(...)
 }
 
-if (packageVersion("ggplot2") > "2.2.1") {
-  test_run("plotly")
-}
+test_run("plotly")
 
 # now, actually build the table (if necessary)
 if (build_table) {
diff --git a/tests/testthat/test-ggplot-contour.R b/tests/testthat/test-ggplot-contour.R
@@ -1,12 +1,15 @@
 context("Contour")
 
-volcano3d <- reshape2::melt(volcano)
-names(volcano3d) <- c("x", "y", "z")
-# Draw a contour plot using geom_contour
-gg <- ggplot(volcano3d) + geom_contour(aes(x=x, y=y, z=z))
-L <- save_outputs(gg, "contour")
+
 
 test_that("geom_contour is translated to a path", {
+  skip_if_not_installed("reshape2")
+  
+  volcano3d <- getFromNamespace("melt", "reshape2")(volcano)
+  names(volcano3d) <- c("x", "y", "z")
+  # Draw a contour plot using geom_contour
+  gg <- ggplot(volcano3d) + geom_contour(aes(x=x, y=y, z=z))
+  L <- save_outputs(gg, "contour")
   expect_equivalent(length(L$data), 1)
   expect_identical(L$data[[1]]$type, "scatter")
   expect_identical(L$data[[1]]$mode, "lines")
diff --git a/tests/testthat/test-ggplot-facets.R b/tests/testthat/test-ggplot-facets.R
@@ -1,7 +1,18 @@
 context("Facets")
 
 test_that("6 facets becomes 6 panels", {
-  data(barley, package = "lattice")
+  
+  # data(barley, package = "lattice")
+  # dput(barley)
+  barley <- structure(list(
+    yield = c(27, 48.86667, 27.43334, 39.93333, 32.96667, 28.96667, 43.06666, 55.2, 28.76667, 38.13333, 29.13333, 29.66667, 35.13333, 47.33333, 25.76667, 40.46667, 29.66667, 25.7, 39.9, 50.23333, 26.13333, 41.33333, 23.03333, 26.3, 36.56666, 63.8333, 43.76667, 46.93333, 29.76667, 33.93333, 43.26667, 58.1, 28.7, 45.66667, 32.16667, 33.6, 36.6, 65.7667, 30.36667, 48.56666, 24.93334, 28.1, 32.76667, 48.56666, 29.86667, 41.6, 34.7, 32, 24.66667, 46.76667, 22.6, 44.1, 19.7, 33.06666, 39.3, 58.8, 29.46667, 49.86667, 34.46667, 31.6, 26.9, 33.46667, 34.36666, 32.96667, 22.13333, 22.56667, 36.8, 37.73333, 35.13333, 26.16667, 14.43333, 25.86667, 27.43334, 38.5, 35.03333, 20.63333, 16.63333, 22.23333, 26.8, 37.4, 38.83333, 32.06666, 32.23333, 22.46667, 29.06667, 49.2333, 46.63333, 41.83333, 20.63333, 30.6, 26.43334, 42.2, 43.53334, 34.33333, 19.46667, 22.7, 25.56667, 44.7, 47, 30.53333, 19.9, 22.5, 28.06667, 36.03333, 43.2, 25.23333, 26.76667, 31.36667, 30, 41.26667, 44.23333, 32.13333, 15.23333, 27.36667, 38, 58.16667, 47.16667, 35.9, 20.66667, 29.33333), 
+    variety = structure(c(3L, 3L, 3L, 3L, 3L, 3L, 7L, 7L, 7L, 7L, 7L, 7L, 1L, 1L, 1L, 1L, 1L, 1L, 5L, 5L, 5L, 5L, 5L, 5L, 10L, 10L, 10L, 10L, 10L, 10L, 8L, 8L, 8L, 8L, 8L, 8L, 2L, 2L, 2L, 2L, 2L, 2L, 6L, 6L, 6L, 6L, 6L, 6L, 4L, 4L, 4L, 4L, 4L, 4L, 9L, 9L, 9L, 9L, 9L, 9L, 3L, 3L, 3L, 3L, 3L, 3L, 7L, 7L, 7L, 7L, 7L, 7L, 1L, 1L, 1L, 1L, 1L, 1L, 5L, 5L, 5L, 5L, 5L, 5L, 10L, 10L, 10L, 10L, 10L, 10L, 8L, 8L, 8L, 8L, 8L, 8L, 2L, 2L, 2L, 2L, 2L, 2L, 6L, 6L, 6L, 6L, 6L, 6L, 4L, 4L, 4L, 4L, 4L, 4L, 9L, 9L, 9L, 9L, 9L, 9L), 
+                        .Label = c("Svansota", "No. 462", "Manchuria", "No. 475", "Velvet", "Peatland", "Glabron", "No. 457", "Wisconsin No. 38", "Trebi"), class = "factor"), 
+    year = structure(c(2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 2L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L), .Label = c("1932", "1931"), class = "factor"), 
+    site = structure(c(3L, 6L, 4L, 5L, 1L, 2L, 3L, 6L, 4L, 5L, 1L, 2L, 3L, 6L, 4L, 5L, 1L, 2L, 3L, 6L, 4L, 5L, 1L, 2L, 3L, 6L, 4L, 5L, 1L, 2L, 3L, 6L, 4L, 5L, 1L, 2L, 3L, 6L, 4L, 5L, 1L, 2L, 3L, 6L, 4L, 5L, 1L, 2L, 3L, 6L, 4L, 5L, 1L, 2L, 3L, 6L, 4L, 5L, 1L, 2L, 3L, 6L, 4L, 5L, 1L, 2L, 3L, 6L, 4L, 5L, 1L, 2L, 3L, 6L, 4L, 5L, 1L, 2L, 3L, 6L, 4L, 5L, 1L, 2L, 3L, 6L, 4L, 5L, 1L, 2L, 3L, 6L, 4L, 5L, 1L, 2L, 3L, 6L, 4L, 5L, 1L, 2L, 3L, 6L, 4L, 5L, 1L, 2L, 3L, 6L, 4L, 5L, 1L, 2L, 3L, 6L, 4L, 5L, 1L, 2L), .Label = c("Grand Rapids", "Duluth", "University Farm", "Morris", "Crookston", "Waseca"), class = "factor")), 
+    row.names = c("1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31", "32", "33", "34", "35", "36", "37", "38", "39", "40", "41", "42", "43", "44", "45", "46", "47", "48", "49", "50", "51", "52", "53", "54", "55", "56", "57", "58", "59", "60", "61", "62", "63", "64", "65", "66", "67", "68", "69", "70", "71", "72", "73", "74", "75", "76", "77", "78", "79", "80", "81", "82", "83", "84", "85", "86", "87", "88", "89", "90", "91", "92", "93", "94", "95", "96", "97", "98", "99", "100", "101", "102", "103", "104", "105", "106", "107", "108", "109", "110", "111", "112", "113", "114", "115", "116", "117", "118", "119", "120"), 
+    class = "data.frame"
+  )
   gg <- qplot(yield, variety, data = barley, 
               color = year, facets = site ~ ., pch = I(1))+
     theme_bw() +
diff --git a/tests/testthat/test-ggplot-heatmap.R b/tests/testthat/test-ggplot-heatmap.R
@@ -7,13 +7,16 @@ workweek <- matrix(
   nrow = 5, ncol = 3, byrow = TRUE,
   dimnames = list(day = wdays, time = dtimes)
 )
-ww <- reshape2::melt(workweek)
-ww$day <- factor(ww$day, wdays)
-ww$time <- factor(ww$time, dtimes)
-# Plot a heatmap using geom_tile
-hm <- ggplot(ww) + geom_tile(aes(x = day, y = time, fill = value))
 
 test_that("geom_tile is translated to type=heatmap", {
+  skip_if_not_installed("reshape2")
+  
+  ww <- getFromNamespace("melt", "reshape2")(workweek)
+  ww$day <- factor(ww$day, wdays)
+  ww$time <- factor(ww$time, dtimes)
+  # Plot a heatmap using geom_tile
+  hm <- ggplot(ww) + geom_tile(aes(x = day, y = time, fill = value))
+  
   L <- save_outputs(hm, "heatmap")
   # one trace is for the colorbar
   expect_equivalent(length(L$data), 2)
diff --git a/tests/testthat/test-ggplot-ticks.R b/tests/testthat/test-ggplot-ticks.R
@@ -175,13 +175,15 @@ test_that("The breaks can be spaced unevenly", {
 })
 
 test_that("R line breaks are translated to HTML line breaks", {
+  skip_if_not_installed("stringr")
+  
   df_x <- data.frame(
     x = "this is very loooooooooooong text to illustrate",
     y = 100
   )
   p <- ggplot(aes(x = x, y = y), data = df_x) +
     geom_bar(stat = "identity") +
-    scale_x_discrete(labels = function(x) stringr::str_wrap(x, width = 10))
+    scale_x_discrete(labels = function(x) getFromNamespace("str_wrap", "stringr")(x, width = 10))
   info <- expect_traces(p, 1, "line-breaks")
   expect_length(
     strsplit(info$layout$xaxis$ticktext, "<br />", fixed = T)[[1]], 5
diff --git a/tests/testthat/test-plotly-sf.R b/tests/testthat/test-plotly-sf.R
@@ -3,6 +3,10 @@ context("add_sf")
 nc <- sf::st_read(system.file("shape/nc.shp", package = "sf"), quiet = TRUE)
 storms <- sf::st_read(system.file("shape/storms_xyz.shp", package = "sf"), quiet = TRUE)
 
+has_mapbox <- function() {
+  !is.null(tryNULL(mapbox_token()))
+}
+
 test_that("add_sf() is optional", {
   skip_if_not_installed("sf")
   
@@ -44,6 +48,7 @@ test_that("plot_geo() lat/lon range is set", {
 
 test_that("plot_mapbox() fitbounds is set", {
   skip_if_not_installed("sf")
+  skip_if_not(has_mapbox())
   
   p <- plotly_build(plot_mapbox(nc))
   expect_equal(
@@ -56,6 +61,7 @@ test_that("plot_mapbox() fitbounds is set", {
 
 test_that("sf defaults can be overriden", {
   skip_if_not_installed("sf")
+  skip_if_not(has_mapbox())
   
   # when applied to fillcolor, alpha defaults to 0.5
   p <- plotly_build(plot_mapbox(nc, color = I("red")))
@@ -115,6 +121,7 @@ test_that("plot_ly() defaults to blank axes", {
 
 test_that("discrete color informs fillcolor", {
   skip_if_not_installed("sf")
+  skip_if_not(has_mapbox())
   
   res <- unique(res_mn$INDRESNAME)
   cols <- viridisLite::magma(length(res))
@@ -136,6 +143,7 @@ test_that("discrete color informs fillcolor", {
 
 test_that("discrete color informs fillcolor", {
   skip_if_not_installed("sf")
+  skip_if_not(has_mapbox())
   
   res <- unique(res_mn$INDRESNAME)
   cols <- viridisLite::magma(length(res))
@@ -171,6 +179,7 @@ test_that("discrete color informs fillcolor", {
 
 test_that("numeric color informs fillcolor", {
   skip_if_not_installed("sf")
+  skip_if_not(has_mapbox())
   
   p <- plot_mapbox(res_mn, color = ~AREA)
   expect_warning(plotly_build(p), "Only one fillcolor per trace allowed")
@@ -214,6 +223,7 @@ test_that("numeric color informs fillcolor", {
 
 test_that("sizing constants", {
   skip_if_not_installed("sf")
+  skip_if_not(has_mapbox())
   
   # span controls 'stroke-size'
   p <- plot_mapbox(res_mn, span = I(5)) %>% plotly_build()
@@ -259,6 +269,7 @@ test_that("sizing constants", {
 
 test_that("size mappings", {
   skip_if_not_installed("sf")
+  skip_if_not(has_mapbox())
   
   expect_warning(
     plotly_build(plot_mapbox(res_mn, span = ~PERIMETER)), 
@@ -294,6 +305,7 @@ test_that("size mappings", {
 
 test_that("altogether now", {
   skip_if_not_installed("sf")
+  skip_if_not(has_mapbox())
   
   s <- subplot(plot_ly(nc), plot_geo(nc), plot_mapbox(nc), nrows = 3) %>% plotly_build()
   d <- s$x$data
@@ -328,6 +340,7 @@ test_that("altogether now", {
 
 test_that("color and stroke scales can be set independently", {
   skip_if_not_installed("sf")
+  skip_if_not(has_mapbox())
   
   n <- length(unique(res_mn$INDRESNAME))
   p <- plot_mapbox(res_mn, split = ~INDRESNAME, color = ~AREA, stroke = ~PERIMETER, span = I(2)) %>%

Original file line number	Diff line number	Diff line change
`@@ -150,9 +150,7 @@ test_run <- function(...) {`
`150`	`150`	`test_check(...)`
`151`	`151`	`}`
`152`	`152`
`153`		`-if (packageVersion("ggplot2") > "2.2.1") {`
`154`		`- test_run("plotly")`
`155`		`-}`
	`153`	`+test_run("plotly")`
`156`	`154`
`157`	`155`	`# now, actually build the table (if necessary)`
`158`	`156`	`if (build_table) {`