Skip to content

Commit

Permalink
Merge pull request #4525 from tidyverse/v3.3.5-rc
Browse files Browse the repository at this point in the history
Quick patch release to fix issues surfaced in 3.3.4
  • Loading branch information
thomasp85 committed Jun 28, 2021
2 parents 389b864 + e94c9fe commit acaa98e
Show file tree
Hide file tree
Showing 12 changed files with 496 additions and 1,136 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Package: ggplot2
Version: 3.3.4.9000
Version: 3.3.5.9000
Title: Create Elegant Data Visualisations Using the Grammar of Graphics
Description: A system for 'declaratively' creating graphics,
based on "The Grammar of Graphics". You provide the data, tell 'ggplot2'
Expand Down
14 changes: 14 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# ggplot2 (development version)

# ggplot2 3.3.5
This is a very small release focusing on fixing a couple of untenable issues
that surfaced with the 3.3.4 release

* Revert changes made in #4434 (apply transform to intercept in `geom_abline()`)
as it introduced undesirable issues far worse than the bug it fixed
(@thomasp85, #4514)
* Fixes an issue in `ggsave()` when producing emf/wmf files (@yutannihilation,
#4521)
* Warn when grDevices specific arguments are passed to ragg devices (@thomasp85,
#4524)
* Fix an issue where `coord_sf()` was reporting that it is non-linear
even when data is provided in projected coordinates (@clauswilke, #4527)

# ggplot2 3.3.4
This is a larger patch release fixing a huge number of bugs and introduces a
small selection of feature refinements.
Expand Down
2 changes: 1 addition & 1 deletion R/coord-sf.R
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ CoordSf <- ggproto("CoordSf", CoordCartesian,

params <- list(
crs = crs,
default_crs = self$default_crs %||% crs
default_crs = self$default_crs
)
self$params <- params

Expand Down
7 changes: 3 additions & 4 deletions R/ggplot-global.R
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ ggplot_global$element_tree <- list()
"colour", "fg", "fill", "group", "hjust", "label", "linetype", "lower",
"lty", "lwd", "max", "middle", "min", "pch", "radius", "sample", "shape",
"size", "srt", "upper", "vjust", "weight", "width", "x", "xend", "xmax",
"xmin", "xintercept", "y", "yend", "ymax", "ymin", "yintercept", "z",
"intercept"
"xmin", "xintercept", "y", "yend", "ymax", "ymin", "yintercept", "z"
)

ggplot_global$all_aesthetics <- .all_aesthetics
Expand Down Expand Up @@ -49,7 +48,7 @@ ggplot_global$base_to_ggplot <- .base_to_ggplot
# These two vectors must match in length and position of symmetrical aesthetics
# xintercept2 is a filler to match to the intercept aesthetic in geom_abline
ggplot_global$x_aes <- c("x", "xmin", "xmax", "xend", "xintercept",
"xmin_final", "xmax_final", "xlower", "xmiddle", "xupper", "x0", "xintercept2")
"xmin_final", "xmax_final", "xlower", "xmiddle", "xupper", "x0")

ggplot_global$y_aes <- c("y", "ymin", "ymax", "yend", "yintercept",
"ymin_final", "ymax_final", "lower", "middle", "upper", "y0", "intercept")
"ymin_final", "ymax_final", "lower", "middle", "upper", "y0")
20 changes: 15 additions & 5 deletions R/save.r
Original file line number Diff line number Diff line change
Expand Up @@ -178,9 +178,9 @@ plot_dev <- function(device, filename = NULL, dpi = 300) {
paper = "special")
}
if (requireNamespace('ragg', quietly = TRUE)) {
png_dev <- ragg::agg_png
jpeg_dev <- ragg::agg_jpeg
tiff_dev <- ragg::agg_tiff
png_dev <- absorb_grdevice_args(ragg::agg_png)
jpeg_dev <- absorb_grdevice_args(ragg::agg_jpeg)
tiff_dev <- absorb_grdevice_args(ragg::agg_tiff)
} else {
png_dev <- grDevices::png
jpeg_dev <- grDevices::jpeg
Expand All @@ -192,8 +192,9 @@ plot_dev <- function(device, filename = NULL, dpi = 300) {
tex = function(filename, ...) grDevices::pictex(file = filename, ...),
pdf = function(filename, ..., version = "1.4") grDevices::pdf(file = filename, ..., version = version),
svg = function(filename, ...) svglite::svglite(file = filename, ...),
emf = function(...) grDevices::win.metafile(...),
wmf = function(...) grDevices::win.metafile(...),
# win.metafile() doesn't have `bg` arg so we need to absorb it before passing `...`
emf = function(..., bg = NULL) grDevices::win.metafile(...),
wmf = function(..., bg = NULL) grDevices::win.metafile(...),
png = function(...) png_dev(..., res = dpi, units = "in"),
jpg = function(...) jpeg_dev(..., res = dpi, units = "in"),
jpeg = function(...) jpeg_dev(..., res = dpi, units = "in"),
Expand All @@ -220,3 +221,12 @@ plot_dev <- function(device, filename = NULL, dpi = 300) {
grid.draw.ggplot <- function(x, recording = TRUE) {
print(x)
}

absorb_grdevice_args <- function(f) {
function(..., type, antialias) {
if (!missing(type) || !missing(antialias)) {
warn("Using ragg device as default. Ignoring `type` and `antialias` arguments")
}
f(...)
}
}
9 changes: 7 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,15 @@ documentation pages. Currently, there are three good places to start:
get you up to speed with the essentials of ggplot2 as quickly as
possible.

2. If you’d like to follow a webinar, try [Plotting Anything with
2. If you’d like to take an online course, try [Data Visualization in R
With
ggplot2](https://learning.oreilly.com/videos/data-visualization-in/9781491963661/)
by Kara Woo.

3. If you’d like to follow a webinar, try [Plotting Anything with
ggplot2](https://youtu.be/h29g21z0a68) by Thomas Lin Pedersen.

3. If you want to dive into making common graphics as quickly as
4. If you want to dive into making common graphics as quickly as
possible, I recommend [The R Graphics
Cookbook](https://r-graphics.org) by Winston Chang. It provides a
set of recipes to solve common graphics problems.
Expand Down
97 changes: 3 additions & 94 deletions cran-comments.md
Original file line number Diff line number Diff line change
@@ -1,98 +1,7 @@
This is mainly a patch release, though we have folded in a couple of new
features. The release contains a couple of internal breaking changes which can
affect packages that inspects the internals of ggplot objects. All failing
reverse dependencies have been notified 3 weeks ago with information about what
needs to be fixed and how. Most of these have already published a fix or is in
the process of doing so.
This is a very quick patch release addressing some unforeseen issues with the
latest release. It does not contain any breaking changes and no changes to worse
in the reverse dependencies was detected.

## R CMD check results

0 errors | 0 warnings | 0 note

## revdepcheck results

We checked 3149 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package.

* We saw 11 new problems
* We failed to check 39 packages

Issues with CRAN packages are summarised below.

### New problems
(This reports the first line of each new failure)

* bayesAB
checking tests ... ERROR

* BayesianReasoning
checking tests ... ERROR

* cvms
checking tests ... ERROR

* ezEDA
checking tests ... ERROR

* ggseg
checking examples ... ERROR
checking tests ... ERROR

* HRM
checking dependencies in R code ... NOTE

* plotly
checking tests ... ERROR

* ratPASTA
checking tests ... ERROR

* rBiasCorrection
checking tests ... ERROR

* tricolore
checking examples ... ERROR

* xpose
checking tests ... ERROR

### Failed to check

* ActivePathways (NA)
* apc (NA)
* apisensr (NA)
* backShift (NA)
* bayesdfa (NA)
* bayesGAM (NA)
* bayesZIB (NA)
* bmgarch (NA)
* CausalImpact (NA)
* CB2 (NA)
* cbar (NA)
* dfpk (NA)
* diceR (NA)
* GenHMM1d (NA)
* ggmsa (NA)
* ggtern (NA)
* glmmfields (NA)
* MarketMatching (NA)
* mcmcabn (NA)
* metagam (NA)
* mlr3pipelines (NA)
* OncoBayes2 (NA)
* osmplotr (NA)
* pcalg (NA)
* penaltyLearning (NA)
* phylopath (NA)
* rabhit (NA)
* raw (NA)
* rstap (NA)
* scoper (NA)
* spectralAnalysis (NA)
* StroupGLMM (NA)
* SynthETIC (NA)
* tigger (NA)
* trackr (NA)
* valse (NA)
* vivid (NA)
* wrswoR (NA)
* zenplots (NA)
108 changes: 52 additions & 56 deletions revdep/README.md
Original file line number Diff line number Diff line change
@@ -1,62 +1,58 @@
# Revdeps

## Failed to check (39)
## Failed to check (45)

|package |version |error |warning |note |
|:------------------------------------|:-------|:------|:-------|:----|
|ActivePathways |? | | | |
|apc |? | | | |
|apisensr |? | | | |
|backShift |? | | | |
|bayesdfa |1.1.0 |1 | | |
|bayesGAM |0.0.1 |1 | | |
|bayesZIB |0.0.2 |1 | | |
|bmgarch |1.0.0 |1 | | |
|CausalImpact |? | | | |
|CB2 |? | | | |
|cbar |? | | | |
|dfpk |3.5.1 |1 | | |
|diceR |? | | | |
|GenHMM1d |? | | | |
|ggmsa |? | | | |
|[ggtern](failures.md#ggtern) |3.3.0 |__+1__ | |1 -2 |
|glmmfields |0.1.4 |1 | | |
|MarketMatching |? | | | |
|mcmcabn |? | | | |
|metagam |? | | | |
|mlr3pipelines |? | | | |
|[OncoBayes2](failures.md#oncobayes2) |0.7-0 |__+1__ | |-2 |
|osmplotr |? | | | |
|pcalg |? | | | |
|penaltyLearning |? | | | |
|phylopath |? | | | |
|rabhit |? | | | |
|raw |? | | | |
|rstap |1.0.3 |1 | | |
|scoper |? | | | |
|spectralAnalysis |? | | | |
|StroupGLMM |? | | | |
|SynthETIC |? | | | |
|tigger |? | | | |
|trackr |? | | | |
|valse |0.1-0 |1 | | |
|vivid |? | | | |
|wrswoR |? | | | |
|zenplots |? | | | |
|package |version |error |warning |note |
|:----------------|:-------|:-----|:-------|:----|
|ActivePathways |? | | | |
|apc |? | | | |
|apisensr |? | | | |
|backShift |? | | | |
|bayesdfa |1.1.0 |1 | | |
|bayesZIB |0.0.2 |1 | | |
|NA |? | | | |
|NA |? | | | |
|btergm |1.9.13 |1 | | |
|CausalImpact |? | | | |
|CB2 |? | | | |
|cbar |? | | | |
|NA |? | | | |
|dfpk |3.5.1 |1 | | |
|diceR |? | | | |
|GenHMM1d |? | | | |
|ggmsa |? | | | |
|ggtern |3.3.0 |1 | |1 |
|glmmfields |0.1.4 |1 | | |
|NA |? | | | |
|mcmcabn |? | | | |
|NA |? | | | |
|metagam |? | | | |
|MoMPCA |? | | | |
|osmplotr |? | | | |
|pcalg |? | | | |
|penaltyLearning |? | | | |
|phylopath |? | | | |
|NA |? | | | |
|rabhit |? | | | |
|raw |? | | | |
|rstap |1.0.3 |1 | | |
|scoper |? | | | |
|spectralAnalysis |? | | | |
|NA |? | | | |
|StroupGLMM |? | | | |
|superb |? | | | |
|SynthETIC |? | | | |
|NA |? | | | |
|tigger |? | | | |
|trackr |? | | | |
|valse |0.1-0 |1 | | |
|vivid |? | | | |
|wrswoR |? | | | |
|zenplots |? | | | |

## New problems (11)
## New problems (1)

|package |version |error |warning |note |
|:--------------------------------------------------|:-------|:------|:-------|:------|
|[bayesAB](problems.md#bayesab) |1.1.2 |__+1__ | | |
|[BayesianReasoning](problems.md#bayesianreasoning) |0.3.2 |__+1__ | | |
|[cvms](problems.md#cvms) |1.3.0 |__+1__ | | |
|[ezEDA](problems.md#ezeda) |0.1.0 |__+1__ | | |
|[ggseg](problems.md#ggseg) |1.6.3 |__+2__ | | |
|[HRM](problems.md#hrm) |1.2.1 | | |__+1__ |
|[plotly](problems.md#plotly) |4.9.4 |__+1__ | |1 |
|[ratPASTA](problems.md#ratpasta) |0.2.1 |__+1__ | |1 |
|[rBiasCorrection](problems.md#rbiascorrection) |0.3.0 |__+1__ | | |
|[tricolore](problems.md#tricolore) |1.2.2 |__+1__ | | |
|[xpose](problems.md#xpose) |0.4.12 |__+1__ | | |
|package |version |error |warning |note |
|:----------------------------------------|:---------|:-----|:-------|:------|
|[rvinecopulib](problems.md#rvinecopulib) |0.5.5.1.1 |-1 | |__+1__ |

Loading

0 comments on commit acaa98e

Please sign in to comment.