Update infrastructure to new best practices

.github/CODE_OF_CONDUCT.md

@@ -0,0 +1,126 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our
+community a harassment-free experience for everyone, regardless of age, body
+size, visible or invisible disability, ethnicity, sex characteristics, gender
+identity and expression, level of experience, education, socio-economic status,
+nationality, personal appearance, race, caste, color, religion, or sexual
+identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming,
+diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our
+community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes,
+  and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the overall
+  community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or advances of
+  any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email address,
+  without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of
+acceptable behavior and will take appropriate and fair corrective action in
+response to any behavior that they deem inappropriate, threatening, offensive,
+or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject
+comments, commits, code, wiki edits, issues, and other contributions that are
+not aligned to this Code of Conduct, and will communicate reasons for moderation
+decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when
+an individual is officially representing the community in public spaces.
+Examples of representing our community include using an official e-mail address,
+posting via an official social media account, or acting as an appointed
+representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported to the community leaders responsible for enforcement at codeofconduct@rstudio.com. 
+All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the
+reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining
+the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed
+unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing
+clarity around the nature of the violation and an explanation of why the
+behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series of
+actions.
+
+**Consequence**: A warning with consequences for continued behavior. No
+interaction with the people involved, including unsolicited interaction with
+those enforcing the Code of Conduct, for a specified period of time. This
+includes avoiding interactions in community spaces as well as external channels
+like social media. Violating these terms may lead to a temporary or permanent
+ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including
+sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public
+communication with the community for a specified period of time. No public or
+private interaction with the people involved, including unsolicited interaction
+with those enforcing the Code of Conduct, is allowed during this period.
+Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community
+standards, including sustained inappropriate behavior, harassment of an
+individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within the
+community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage],
+version 2.1, available at
+<https://www.contributor-covenant.org/version/2/1/code_of_conduct.html>.
+
+Community Impact Guidelines were inspired by
+[Mozilla's code of conduct enforcement ladder][https://github.com/mozilla/inclusion].
+
+For answers to common questions about this code of conduct, see the FAQ at
+<https://www.contributor-covenant.org/faq>. Translations are available at <https://www.contributor-covenant.org/translations>.
+
+[homepage]: https://www.contributor-covenant.org

DESCRIPTION

@@ -30,12 +30,14 @@ BugReports: https://github.com/tidyverse/ggplot2/issues
 Depends:
     R (>= 3.3)
 Imports: 
+    cli,
     digest,
     glue,
     grDevices,
     grid,
     gtable (>= 0.1.1),
     isoband,
+    lifecycle,
     MASS,
     mgcv,
     rlang (>= 0.4.10),
@@ -79,7 +81,7 @@ Config/testthat/edition: 3
 Encoding: UTF-8
 LazyData: true
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.1.1
+RoxygenNote: 7.1.2
 Collate: 
     'ggproto.r'
     'ggplot-global.R'
@@ -168,7 +170,7 @@ Collate:
     'geom-tile.r'
     'geom-violin.r'
     'geom-vline.r'
-    'ggplot2.r'
+    'ggplot2-package.R'
     'grob-absolute.r'
     'grob-dotstack.r'
     'grob-null.r'

NAMESPACE

@@ -673,6 +673,7 @@ import(rlang)
 import(scales)
 importFrom(glue,glue)
 importFrom(glue,glue_collapse)
+importFrom(lifecycle,deprecated)
 importFrom(stats,setNames)
 importFrom(tibble,tibble)
 importFrom(utils,.DollarNames)

NEWS.md

@@ -1,5 +1,8 @@
 # ggplot2 (development version)
 
+* referring to `x` in backquoted expressions with `label_bquote()` is no longer
+  possible.
+
 * `position_stack()` now works fully with `geom_text()` (@thomasp85, #4367)
 
 * `geom_tile()` now correctly recognises missing data in `xmin`, `xmax`, `ymin`,

R/aes.r

@@ -212,6 +212,9 @@ is_position_aes <- function(vars) {
 
 #' Define aesthetic mappings programmatically
 #'
+#' @description
+#' `r lifecycle::badge("deprecated")`
+#'
 #' Aesthetic mappings describe how variables in the data are mapped to visual
 #' properties (aesthetics) of geoms. [aes()] uses non-standard
 #' evaluation to capture the variable names. `aes_()` and `aes_string()`
@@ -239,6 +242,9 @@ is_position_aes <- function(vars) {
 #' @param x,y,... List of name value pairs. Elements must be either
 #'   quoted calls, strings, one-sided formulas or constants.
 #' @seealso [aes()]
+#'
+#' @keywords internal
+#'
 #' @export
 #' @examples
 #' # Three ways of generating the same aesthetics
@@ -258,6 +264,11 @@ is_position_aes <- function(vars) {
 #' aes(col = x)
 #' aes_(col = as.name(var))
 aes_ <- function(x, y, ...) {
+  lifecycle::deprecate_soft(
+    "3.0.0",
+    "aes_()",
+    details = "Please use tidy evaluation ideoms with `aes()`"
+  )
   mapping <- list(...)
   if (!missing(x)) mapping["x"] <- list(x)
   if (!missing(y)) mapping["y"] <- list(y)
@@ -280,6 +291,11 @@ aes_ <- function(x, y, ...) {
 #' @rdname aes_
 #' @export
 aes_string <- function(x, y, ...) {
+  lifecycle::deprecate_soft(
+    "3.0.0",
+    "aes_string()",
+    details = "Please use tidy evaluation ideoms with `aes()`"
+  )
   mapping <- list(...)
   if (!missing(x)) mapping["x"] <- list(x)
   if (!missing(y)) mapping["y"] <- list(y)
@@ -321,12 +337,15 @@ aes_all <- function(vars) {
 
 #' Automatic aesthetic mapping
 #'
+#' @description
+#' `r lifecycle::badge("deprecated")`
+#'
 #' @param data data.frame or names of variables
 #' @param ... aesthetics that need to be explicitly mapped.
 #' @keywords internal
 #' @export
 aes_auto <- function(data = NULL, ...) {
-  warn("aes_auto() is deprecated")
+  lifecycle::deprecate_warn("2.0.0", "aes_auto()")
 
   # detect names of data
   if (is.null(data)) {

R/backports.R

@@ -15,6 +15,8 @@ if (getRversion() < 3.3) {
   backport_unit_methods <- function() {}
 }
 
+on_load(backport_unit_methods())
+
 # isFALSE() is available on R (>=3.5)
 if (getRversion() < 3.5) {
   isFALSE <- function(x) is.logical(x) && length(x) == 1L && !is.na(x) && !x

R/bin.R

@@ -1,7 +1,7 @@
-bins <- function(breaks, closed = c("right", "left"),
+bins <- function(breaks, closed = "right",
                  fuzz = 1e-08 * stats::median(diff(breaks))) {
   if (!is.numeric(breaks)) abort("`breaks` must be a numeric vector")
-  closed <- match.arg(closed)
+  closed <- arg_match0(closed, c("right", "left"))
 
   breaks <- sort(breaks)
   # Adapted base::hist - this protects from floating point rounding errors

R/compat-plyr.R

@@ -338,6 +338,15 @@ rbind_dfs <- function(dfs) {
   )
   out
 }
+
+# Info needed for rbind_dfs date/time handling
+on_load({
+  date <- Sys.Date()
+  ggplot_global$date_origin <- date - unclass(date)
+  time <- Sys.time()
+  ggplot_global$time_origin <- time - unclass(time)
+})
+
 #' Apply function to unique subsets of a data.frame
 #'
 #' This function is akin to `plyr::ddply`. It takes a single data.frame,

R/coord-polar.r

@@ -59,7 +59,7 @@
 #' }
 #' }
 coord_polar <- function(theta = "x", start = 0, direction = 1, clip = "on") {
-  theta <- match.arg(theta, c("x", "y"))
+  theta <- arg_match0(theta, c("x", "y"))
   r <- if (theta == "x") "y" else "x"
 
   ggproto(NULL, CoordPolar,

R/coord-sf.R

@@ -656,7 +656,7 @@ coord_sf <- function(xlim = NULL, ylim = NULL, expand = TRUE,
                      crs = NULL, default_crs = NULL,
                      datum = sf::st_crs(4326),
                      label_graticule = waiver(),
-                     label_axes = waiver(), lims_method = c("cross", "box", "orthogonal", "geometry_bbox"),
+                     label_axes = waiver(), lims_method = "cross",
                      ndiscr = 100, default = FALSE, clip = "on") {
 
   if (is.waive(label_graticule) && is.waive(label_axes)) {
@@ -688,7 +688,7 @@ coord_sf <- function(xlim = NULL, ylim = NULL, expand = TRUE,
   if (is.null(default_crs) && is_missing(lims_method)) {
     lims_method <- "orthogonal"
   } else {
-    lims_method <- match.arg(lims_method)
+    lims_method <- arg_match0(lims_method, c("cross", "box", "orthogonal", "geometry_bbox"))
   }
 
   ggproto(NULL, CoordSf,

R/coord-transform.r

@@ -10,7 +10,7 @@
 #'
 #' @inheritParams coord_cartesian
 #' @param x,y Transformers for x and y axes or their names.
-#' @param limx,limy **Deprecated**: use `xlim` and `ylim` instead.
+#' @param limx,limy `r lifecycle::badge("deprecated")` use `xlim` and `ylim` instead.
 #' @export
 #' @examples
 #' \donttest{
@@ -75,13 +75,13 @@
 #' plot + coord_trans(x = "sqrt")
 #' }
 coord_trans <- function(x = "identity", y = "identity", xlim = NULL, ylim = NULL,
-                        limx = "DEPRECATED", limy = "DEPRECATED", clip = "on", expand = TRUE) {
-  if (!missing(limx)) {
-    warn("`limx` argument is deprecated; please use `xlim` instead.")
+                        limx = deprecated(), limy = deprecated(), clip = "on", expand = TRUE) {
+  if (lifecycle::is_present(limx)) {
+    lifecycle::deprecate_warn("3.3.0", "coord_trans(limx)", "coord_trans(xlim)")
     xlim <- limx
   }
-  if (!missing(limy)) {
-    warn("`limy` argument is deprecated; please use `ylim` instead.")
+  if (lifecycle::is_present(limy)) {
+    lifecycle::deprecate_warn("3.3.0", "coord_trans(limy)", "coord_trans(ylim)")
     ylim <- limy
   }
 

R/facet-grid-.r

@@ -123,13 +123,13 @@ facet_grid <- function(rows = NULL, cols = NULL, scales = "fixed",
     cols <- NULL
   }
 
-  scales <- match.arg(scales, c("fixed", "free_x", "free_y", "free"))
+  scales <- arg_match0(scales, c("fixed", "free_x", "free_y", "free"))
   free <- list(
     x = any(scales %in% c("free_x", "free")),
     y = any(scales %in% c("free_y", "free"))
   )
 
-  space <- match.arg(space, c("fixed", "free_x", "free_y", "free"))
+  space <- arg_match0(space, c("fixed", "free_x", "free_y", "free"))
   space_free <- list(
     x = any(space %in% c("free_x", "free")),
     y = any(space %in% c("free_y", "free"))

R/facet-wrap.r

@@ -79,9 +79,10 @@ NULL
 #' }
 facet_wrap <- function(facets, nrow = NULL, ncol = NULL, scales = "fixed",
                        shrink = TRUE, labeller = "label_value", as.table = TRUE,
-                       switch = NULL, drop = TRUE, dir = "h", strip.position = 'top') {
-  scales <- match.arg(scales, c("fixed", "free_x", "free_y", "free"))
-  dir <- match.arg(dir, c("h", "v"))
+                       switch = deprecated(), drop = TRUE, dir = "h",
+                       strip.position = 'top') {
+  scales <- arg_match0(scales, c("fixed", "free_x", "free_y", "free"))
+  dir <- arg_match0(dir, c("h", "v"))
   free <- list(
     x = any(scales %in% c("free_x", "free")),
     y = any(scales %in% c("free_y", "free"))
@@ -93,11 +94,11 @@ facet_wrap <- function(facets, nrow = NULL, ncol = NULL, scales = "fixed",
   # Flatten all facets dimensions into a single one
   facets <- wrap_as_facets_list(facets)
 
-  if (!is.null(switch)) {
-    .Deprecated("strip.position", old = "switch")
+  if (lifecycle::is_present(switch)) {
+    lifecycle::deprecate_warn("2.2.0", "facet_wrap(switch)", "facet_wrap(strip.position)")
     strip.position <- if (switch == "x") "bottom" else "left"
   }
-  strip.position <- match.arg(strip.position, c("top", "bottom", "left", "right"))
+  strip.position <- arg_match0(strip.position, c("top", "bottom", "left", "right"))
   if (identical(dir, "v")) {
     # swap
     nrow_swap <- ncol