skip vdiffr checks on cran + update R version dependency

corybrunson · Jul 14, 2020 · 17e2237 · 17e2237
1 parent a2ac64d
commit 17e2237
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 6 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -2,7 +2,7 @@ Package: ggalluvial
 Type: Package
 Title: Alluvial Plots in 'ggplot2'
 Version: 0.12.0
-Date: 2020-07-05
+Date: 2020-07-13
 Authors@R: 
     person(given = "Jason Cory",
            family = "Brunson",
@@ -21,7 +21,7 @@ Description: Alluvial plots use variable-width ribbons and stacked bar plots to
     <doi:10.1198/jcgs.2009.07098> layered grammar of graphics to generate
     alluvial plots from tidy data.
 Depends:
-    R (>= 3.3),
+    R (>= 3.5),
     ggplot2 (>= 2.2)
 Imports:
     stats,
@@ -46,5 +46,5 @@ LazyData: true
 URL: http://corybrunson.github.io/ggalluvial/
 BugReports: https://github.com/corybrunson/ggalluvial/issues
 VignetteBuilder: knitr
-RoxygenNote: 7.1.0
+RoxygenNote: 7.1.1
 Roxygen: list(markdown = TRUE)
diff --git a/cran-comments.md b/cran-comments.md
@@ -4,15 +4,26 @@
 * Rhub (via `rhub::check_for_cran()`)
 * win-builder (devel, current, and previous; via `devtools::check_win_*()`)
 
-There were no ERRORs, WARNINGs, or NOTEs.
-In response to a previous failed submission, **vdiffr** tests are now skipped on CRAN.
+In response to a previous failed submission, **vdiffr** tests are now skipped on CRAN and when not installed, using `testthat::skip_*()`.
 
-## R CMD check results
+### R CMD check results
 
 There were no ERRORs, WARNINGs, or NOTEs.
 
 One comment flagged that examples for one reference page (`stat_alluvium`) took > 10s to run. I have trimmed the total number of examples, but each showcases functionality that has previously caused users difficulty.
 
+### Rhub
+
+There were no ERRORs or WARNINGs.
+
+On several platforms, one NOTE flagged the example runtime issue above (with a 5s threshold). On one platform (Fedora Linux, R-devel, clang, gfortran), several NOTEs flagged additional example runtime issues.
+
+On one platform (Ubuntu Linux 16.04 LTS, R-release, GCC), one NOTE was due to **vdiffr** being suggested but not available, and two NOTEs flagged possibly invalid URLs, both of which have been verified.
+
+### WinBuilder
+
+There were no ERRORs or WARNINGs. On the current release, one NOTE flagged the example runtime issue above.
+
 ## Downstream dependencies
 
 There are three downstream dependencies on CRAN:

diff --git a/tests/testthat/test-geom-alluvium.r b/tests/testthat/test-geom-alluvium.r
@@ -10,6 +10,7 @@ test_that("`geom_alluvium` draws correctly", {
   a3 <- aes(y = refugees, x = year, alluvium = country)
 
   skip_on_cran()
+  skip_if_not_installed("vdiffr")
   vdiffr::expect_doppelganger(
     "`geom_alluvium`: basic",
     ggplot(d1, a1) + geom_alluvium()
@@ -36,6 +37,7 @@ test_that("`geom_alluvium()` recognizes alternative curves", {
   data(vaccinations)
 
   skip_on_cran()
+  skip_if_not_installed("vdiffr")
   vdiffr::expect_doppelganger(
     "`geom_alluvium`: unscaled knot positions",
     ggplot(vaccinations,

diff --git a/tests/testthat/test-geom-flow.r b/tests/testthat/test-geom-flow.r
@@ -8,6 +8,7 @@ test_that("`geom_flow` draws correctly", {
   a2 <- aes(y = Freq, axis1 = Class, axis2 = Sex)
 
   skip_on_cran()
+  skip_if_not_installed("vdiffr")
   vdiffr::expect_doppelganger(
     "`geom_flow`: basic",
     ggplot(d, a1) + geom_flow()
@@ -28,6 +29,7 @@ data(vaccinations)
 
 test_that("`geom_flow` orients flows correctly", {
   skip_on_cran()
+  skip_if_not_installed("vdiffr")
   vdiffr::expect_doppelganger(
     "`geom_flow`: forward orientation",
     ggplot(vaccinations,
@@ -46,6 +48,7 @@ test_that("`geom_flow` orients flows correctly", {
 
 test_that("`geom_flow()` recognizes alternative curves", {
   skip_on_cran()
+  skip_if_not_installed("vdiffr")
   vdiffr::expect_doppelganger(
     "`geom_flow`: unscaled knot positions",
     ggplot(vaccinations,

diff --git a/tests/testthat/test-geom-lode.r b/tests/testthat/test-geom-lode.r
@@ -8,6 +8,7 @@ test_that("`geom_lode` draws correctly", {
   a2 <- aes(y = Freq, axis1 = Class, axis2 = Sex, axis3 = Age, fill = Survived)
 
   skip_on_cran()
+  skip_if_not_installed("vdiffr")
   vdiffr::expect_doppelganger(
     "`geom_lode`: one axis",
     ggplot(d, a1) + geom_lode(aes(fill = Class, alpha = Survived)) +

diff --git a/tests/testthat/test-geom-stratum.r b/tests/testthat/test-geom-stratum.r
@@ -8,6 +8,7 @@ test_that("`geom_stratum` draws correctly", {
   a2 <- aes(y = Freq, axis1 = Class, axis2 = Sex)
 
   skip_on_cran()
+  skip_if_not_installed("vdiffr")
   vdiffr::expect_doppelganger(
     "`geom_stratum`: basic",
     ggplot(d, a1) + geom_stratum()