Merge pull request #364 from ggobi/rc-v2.0.0

.Rbuildignore

@@ -31,3 +31,5 @@ ggduo_paper.txt
 ^\.github$
 ^doc$
 ^Meta$
+^CRAN-RELEASE$
+^vignettes$

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

@@ -5,6 +5,7 @@ on:
   pull_request:
     branches:
       - master
+      - rc-*
 
 name: R-CMD-check
 

.github/workflows/pkgdown.yaml

@@ -6,6 +6,7 @@ on:
   pull_request:
     branches:
       - master
+      - rc-*
 
 
 name: pkgdown
@@ -52,7 +53,7 @@ jobs:
           CAN_PRINT: "TRUE"
         run: |
           pkgdown::build_site()
-          stopifnot(length(warnings) == 0)
+          stopifnot(length(warnings()) == 0)
         shell: Rscript {0}
 
       - name: Build and Deploy Site

.github/workflows/test-coverage.yaml

@@ -5,6 +5,7 @@ on:
   pull_request:
     branches:
       - master
+      - rc-*
 
 name: test-coverage
 

CRAN-RELEASE

@@ -0,0 +1,2 @@
+This package was submitted to CRAN on 2020-06-05.
+Once it is accepted, delete this file and tag the release (commit 11d821418b).

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: GGally
-Version: 1.5.0.9000
+Version: 2.0.0
 License: GPL (>= 2.0)
 Title: Extension to 'ggplot2'
 Type: Package
@@ -64,7 +64,7 @@ Suggests:
     spelling
 Roxygen: list(markdown = FALSE)
 RoxygenNote: 7.1.0
-VignetteBuilder: knitr
 SystemRequirements: openssl
 Encoding: UTF-8
 Language: en-US
+RdMacros: lifecycle

NAMESPACE

@@ -116,6 +116,7 @@ export(stat_prop)
 export(stat_weighted_mean)
 export(uppertriangle)
 export(v1_ggmatrix_theme)
+export(vig_ggally)
 export(weighted_mean_sd)
 export(weighted_median_iqr)
 export(wrap)

NEWS.md

@@ -1,23 +1,22 @@
-GGally (development version)
----------------------
+# GGally 2.0.0
 
 ### New Vignettes
-* `vignette("ggally_plots", package = "GGally")` - List of available high-level plots
-* `vignette("ggally_stats", package = "GGally")` - Additional statistics for ggplot2
-* `vignette("ggbivariate", package = "GGally")` - ggbivariate(): Plot an outcome with several potential explanatory variables
-* `vignette("ggtable", package = "GGally")` - ggtable(): Cross-tabulated tables
-* Call `browseVignettes(package = "GGally")` to view all vignettes for `GGally`
+* `vig_ggally("ggally_plots")` - ggally_*(): List of available high-level plots
+* `vig_ggally("ggally_stats")` - stat_*(): Additional statistics for ggplot2
+* `vig_ggally("ggbivariate")` - ggbivariate(): Plot an outcome with several potential explanatory variables
+* `vig_ggally("ggtable")` - ggtable(): Cross-tabulated tables
+* To view all vignettes for `GGally`, call `GGally::vig_ggally()`
 
 
 ### New functions
 
 `ggbivariate()` (@larmarange, #324)
 * Display an outcome using several potential explanatory variables
-* `vignette("ggbivariate")`
+* `vig_ggally("ggbivariate")`
 
 `ggtable()` (@larmarange, #351)
 * Cross-tabulated tables of discrete variables
-* `vignette("ggtable")`
+* `vig_ggally("ggtable")`
 
 `add_to_ggmatrix()` (#362)
 * Add ggplot2 objects to `ggmatrix` objects at selected locations

R/deprecated.R

@@ -1,13 +1,15 @@
 #' Modify a \code{\link{ggmatrix}} object by adding an \pkg{ggplot2} object to all
 #'
-# \Sexpr[results=rd, stage=render]{lifecycle::badge("deprecated")}
+# \lifecycle{deprecated}
 #'
 #' @export
 #' @examples
+#' # Small function to display plots only if it's interactive
+#' p_ <- GGally::print_if_interactive
 #'
-#' ggpairs(iris, 1:2) + v1_ggmatrix_theme()
+#' p_(ggpairs(iris, 1:2) + v1_ggmatrix_theme())
 #' # move the column names to the left and bottom
-#' ggpairs(iris, 1:2, switch = "both") + v1_ggmatrix_theme()
+#' p_(ggpairs(iris, 1:2, switch = "both") + v1_ggmatrix_theme())
 v1_ggmatrix_theme <- function() {
   theme(
     strip.background = element_rect(fill = "white"),
@@ -18,7 +20,7 @@ v1_ggmatrix_theme <- function() {
 
 #' Correlation value plot
 #'
-# \Sexpr[results=rd, stage=render]{lifecycle::badge("deprecated")}
+# \lifecycle{deprecated}
 #'
 #' (Deprecated. See \code{\link{ggally_cor}}.)
 #'
@@ -40,27 +42,33 @@ v1_ggmatrix_theme <- function() {
 #' @export
 #' @keywords hplot
 #' @examples
-#'  data(tips, package = "reshape")
-#'  ggally_cor_v1_5(tips, mapping = ggplot2::aes_string(x = "total_bill", y = "tip"))
-#'  # display with no grid
-#'  ggally_cor_v1_5(
-#'    tips,
-#'    mapping = ggplot2::aes_string(x = "total_bill", y = "tip"),
-#'    displayGrid = FALSE
-#'  )
-#'  # change text attributes
-#'  ggally_cor_v1_5(
-#'    tips,
-#'    mapping = ggplot2::aes(x = total_bill, y = tip),
-#'    size = 15,
-#'    colour = I("red")
-#'  )
-#'  # split by a variable
-#'  ggally_cor_v1_5(
-#'    tips,
-#'    mapping = ggplot2::aes_string(x = "total_bill", y = "tip", color = "sex"),
-#'    size = 5
-#'  )
+#' # Small function to display plots only if it's interactive
+#' p_ <- GGally::print_if_interactive
+#'
+#' data(tips, package = "reshape")
+#' p_(ggally_cor_v1_5(tips, mapping = ggplot2::aes_string(x = "total_bill", y = "tip")))
+#'
+#' # display with no grid
+#' p_(ggally_cor_v1_5(
+#'   tips,
+#'   mapping = ggplot2::aes_string(x = "total_bill", y = "tip"),
+#'   displayGrid = FALSE
+#' ))
+#'
+#' # change text attributes
+#' p_(ggally_cor_v1_5(
+#'   tips,
+#'   mapping = ggplot2::aes(x = total_bill, y = tip),
+#'   size = 15,
+#'   colour = I("red")
+#' ))
+#'
+#' # split by a variable
+#' p_(ggally_cor_v1_5(
+#'   tips,
+#'   mapping = ggplot2::aes_string(x = "total_bill", y = "tip", color = "sex"),
+#'   size = 5
+#' ))
 ggally_cor_v1_5 <- function(
   data,
   mapping,