Prepare for release and fix issues

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: ggplot2
-Version: 3.4.1.9000
+Version: 3.4.2
 Title: Create Elegant Data Visualisations Using the Grammar of Graphics
 Authors@R: c(
  person("Hadley", "Wickham", , "hadley@posit.co", role = "aut",

NEWS.md

@@ -1,28 +1,44 @@
-# ggplot2 (development version)
+# ggplot2 3.4.2
+This is a hotfix release anticipating changes in r-devel, but folds in upkeep
+changes and a few bug fixes as well.
+
+## Minor improvements
+
+* Various type checks and their messages have been standardised 
+ (@teunbrand, #4834).
+
+* ggplot2 now uses `scales::DiscreteRange` and `scales::ContinuousRange`, which
+ are available to write scale extensions from scratch (@teunbrand, #2710).
+
+* The `layer_data()`, `layer_scales()` and `layer_grob()` now have the default
+ `plot = last_plot()` (@teunbrand, #5166).
+
+* The `datetime_scale()` scale constructor is now exported for use in extension
+ packages (@teunbrand, #4701).
+
+## Bug fixes
+
+* `update_geom_defaults()` and `update_stat_defaults()` now return properly 
+ classed objects and have updated docs (@dkahle, #5146).
+
+* For the purposes of checking required or non-missing aesthetics, character 
+ vectors are no longer considered non-finite (@teunbrand, @4284).
 
 * `annotation_logticks()` skips drawing ticks when the scale range is non-finite
  instead of throwing an error (@teunbrand, #5229).
+
 * Fixed spurious warnings when the `weight` was used in `stat_bin_2d()`, 
  `stat_boxplot()`, `stat_contour()`, `stat_bin_hex()` and `stat_quantile()`
  (@teunbrand, #5216).
-* Various type checks and their messages have been standardised 
- (@teunbrand, #4834).
-* The `layer_data()`, `layer_scales()` and `layer_grob()` now have the default
- `plot = last_plot()` (@teunbrand, #5166).
+
 * To prevent changing the plotting order, `stat_sf()` is now computed per panel 
  instead of per group (@teunbrand, #4340).
-* ggplot2 now uses `scales::DiscreteRange` and `scales::ContinuousRange`, which
- are available to write scale extensions from scratch (@teunbrand, #2710).
-* For the purposes of checking required or non-missing aesthetics, character 
- vectors are no longer considered non-finite (@teunbrand, @4284).
+
 * Fixed bug in `coord_sf()` where graticule lines didn't obey 
- `panel.grid.major`'s linewidth setting (@teunbrand, #5179)
-* The `datetime_scale()` scale constructor is now exported for use in extension
- packages (@teunbrand, #4701).
+ `panel.grid.major`'s linewidth setting (@teunbrand, #5179).
+
 * `geom_text()` drops observations where `angle = NA` instead of throwing an
  error (@teunbrand, #2757).
-* `update_geom_defaults()` and `update_stat_defaults()` now return properly 
- classed objects and have updated docs (@dkahle, #5146)
 
 # ggplot2 3.4.1
 This is a small release focusing on fixing regressions in the 3.4.0 release

R/facet-grid-.R

@@ -116,7 +116,7 @@ facet_grid <- function(rows = NULL, cols = NULL, scales = "fixed",
  # `facets` is deprecated and renamed to `rows`
  if (lifecycle::is_present(facets)) {
  deprecate_warn0("2.2.0", "facet_grid(facets)", "facet_grid(rows)")
- row <- facets
+ rows <- facets
  }
 
  # Should become a warning in a future release

R/quick-plot.R

@@ -142,7 +142,7 @@ qplot <- function(x, y, ..., data, facets = NULL, margins = FALSE,
  } else if (is.formula(facets) && length(facets) == 2) {
  p <- p + facet_wrap(facets)
  } else {
- p <- p + facet_grid(facets = deparse(facets), margins = margins)
+ p <- p + facet_grid(rows = deparse(facets), margins = margins)
  }
 
  if (!is.null(main)) p <- p + ggtitle(main)

R/stat-smooth.R

@@ -113,7 +113,7 @@ StatSmooth <- ggproto("StatSmooth", Stat,
  msg <- c(msg, paste0("formula = '", deparse(params$formula), "'"))
  }
  if (identical(params$method, "gam")) {
- params$method <- mgcv::gam
+ params$method <- gam_method()
  }
 
  if (length(msg) > 0) {
@@ -161,13 +161,13 @@ StatSmooth <- ggproto("StatSmooth", Stat,
 
  if (is.character(method)) {
  if (identical(method, "gam")) {
- method <- mgcv::gam
+ method <- gam_method()
  } else {
  method <- match.fun(method)
  }
  }
  # If gam and gam's method is not specified by the user then use REML
- if (identical(method, mgcv::gam) && is.null(method.args$method)) {
+ if (identical(method, gam_method()) && is.null(method.args$method)) {
  method.args$method <- "REML"
  }
 
@@ -187,3 +187,6 @@ StatSmooth <- ggproto("StatSmooth", Stat,
 
  required_aes = c("x", "y")
 )
+
+# This function exists to silence an undeclared import warning
+gam_method <- function() mgcv::gam

cran-comments.md

@@ -1,70 +1,73 @@
-This is a patch release fixing a couple of regressions in the last release. We
-see two failing revdeps at the time of submission. Both have been notified 16 
-days ago.
+This is a patch release responding to a request from CRAN about new warnings in 
+R-devel. It also includes a small batch of of bug fixes since last release. 
+There are no user facing changes.
+
+All breaking reverse dependencies have been notified.
 
 ## revdepcheck results
 
-We checked 4375 reverse dependencies (4350 from CRAN + 25 from Bioconductor), comparing R CMD check results across CRAN and dev versions of this package.
+We checked 4503 reverse dependencies (4468 from CRAN + 35 from Bioconductor), comparing R CMD check results across CRAN and dev versions of this package.
 
- * We saw 2 new problems
- * We failed to check 46 packages
+ * We saw 8 new problems
+ * We failed to check 29 packages
 
 Issues with CRAN packages are summarised below.
 
 ### New problems
 (This reports the first line of each new failure)
 
-* listdown
- checking tests ... ERROR
+* afex
+ checking re-building of vignette outputs ... WARNING
+
+* dalmatian
+ checking re-building of vignette outputs ... WARNING
+
+* DriveML
+ checking re-building of vignette outputs ... WARNING
+
+* EcoEnsemble
+ checking re-building of vignette outputs ... WARNING
+
+* ggtern
+ checking Rd files ... WARNING
+
+* siland
+ checking re-building of vignette outputs ... WARNING
+
+* TCIU
+ checking re-building of vignette outputs ... WARNING
 
 * xpose
  checking tests ... ERROR
 
 ### Failed to check
 
-* AFM (NA)
-* AssetCorr (NA)
-* bayesnec (NA)
-* bayesrules (NA)
-* cinaR (NA)
-* eefAnalytics (NA)
-* escalation (NA)
-* ESTER (NA)
-* genekitr (NA)
-* ggPMX (NA)
-* grandR (NA)
-* hmmTMB (NA)
-* immcp (NA)
-* INSPECTumours (NA)
-* IRexamples (NA)
-* loon.ggplot (NA)
-* MarketMatching (NA)
-* MARVEL (NA)
-* multilevelcoda (NA)
-* nestedcv (NA)
-* nlmixr2 (NA)
-* nlmixr2extra (NA)
-* nlmixr2plot (NA)
-* nlmixr2rpt (NA)
-* numbat (NA)
-* OlinkAnalyze (NA)
-* OpenMx (NA)
-* ordbetareg (NA)
-* PFIM (NA)
-* PlasmaMutationDetector2 (NA)
-* Platypus (NA)
-* RcppCensSpatial (NA)
-* rdddr (NA)
-* rdss (NA)
-* rstan (NA)
-* RVA (NA)
-* SCpubr (NA)
-* tidyposterior (NA)
-* tidySEM (NA)
-* tinyarray (NA)
-* TVMM (NA)
-* valse (NA)
-* vivid (NA)
-* wearables (NA)
-* webSDM (NA)
-* xpose.nlmixr2 (NA)
+* beadplexr (NA)
+* CausalImpact (NA)
+* CensMFM (NA)
+* cinaR (NA)
+* ctsem (NA)
+* genekitr (NA)
+* ggh4x (NA)
+* glmmPen (NA)
+* grandR (NA)
+* immcp (NA)
+* loon.ggplot (NA)
+* MACP (NA)
+* MarketMatching (NA)
+* MARVEL (NA)
+* nlmixr2rpt (NA)
+* numbat (NA)
+* OlinkAnalyze (NA)
+* OpenMx (NA)
+* Platypus (NA)
+* PsychWordVec (NA)
+* RcppCensSpatial (NA)
+* rstan (NA)
+* RVA (NA)
+* rxode2 (NA)
+* SCpubr (NA)
+* tidySEM (NA)
+* tinyarray (NA)
+* valse (NA)
+* vivid (NA)