Skip to content

Clear merge debris #6416

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Closed
wants to merge 36 commits into from
Closed

Clear merge debris #6416

wants to merge 36 commits into from

Conversation

teunbrand
Copy link
Collaborator

This PR aims to clean up some fallout from releasing 3.5.2.

Briefly:

  • Cleans up NEWS.md (Release 3.5.2 #6403 (comment))
  • Adds element_geom(), element_polygon() and element_point() to is_theme_element(type) options.
  • Consistently use the new is_*() functions.
  • Convert remaining internal is.*() functions to is_*() functions.

thomasp85 and others added 30 commits April 22, 2024 11:50
@thomasp85
Increment version number to 3.5.1
70c3dab
@thomasp85
update cran comments
3e585a8
@thomasp85
fix wrong automatic version bump
8fa3974
@teunbrand
remove tests for ragg/svglite
4b67b19
@teunbrand
Forward compatibility: cherry-pick accessors (tidyverse#6387)
7960366
@teunbrand
Forward compatibility: is_*() functions (tidyverse#6388)
836d820
@teunbrand
Forward compatibility: fix mistakes (tidyverse#6394)
bb2c405
@thomasp85
Fix deprecation calls
2663bb1
@thomasp85
Prep tests for next svglite release
19f2ed6
@thomasp85
rename is_element -> is_theme_element
be1b49f
@thomasp85
Add back deleted functions
4ed6abe
@thomasp85
run revdepcheck
ff44403
@thomasp85
update news
92032f2
@thomasp85
fix urls
3255f65
@thomasp85
better forward compat for svglite
35f02b9
@thomasp85
Fix links
ceb5a37
@thomasp85
correctly ref new is_ggproto() in docs
78100d3
@thomasp85
update cran comments
2271567
@thomasp85
Increment version number to 3.5.2
8b27990
@thomasp85
Fix feedback from CRAN
0e7c028
@thomasp85
Increment version number to 3.5.2.9000
99e9b7e
@teunbrand
Resolve merge conflict with RC branch (tidyverse#6415)
2ff77b1
@teunbrand
resolve merge conflict
ec9e909 
Merge branch 'main' into rc/3.5.2

# Conflicts:
#	DESCRIPTION
#	NAMESPACE
#	R/aes.R
#	R/bin.R
#	R/coord-.R
#	R/coord-cartesian-.R
#	R/facet-.R
#	R/fortify.R
#	R/geom-.R
#	R/geom-defaults.R
#	R/geom-label.R
#	R/ggproto.R
#	R/guide-.R
#	R/guide-axis.R
#	R/guides-.R
#	R/layer.R
#	R/margins.R
#	R/plot-build.R
#	R/plot-construction.R
#	R/plot.R
#	R/position-.R
#	R/save.R
#	R/scale-.R
#	R/scale-colour.R
#	R/stat-.R
#	R/stat-ellipse.R
#	R/theme-current.R
#	R/theme-elements.R
#	R/theme.R
#	README.Rmd
#	cran-comments.md
#	man/coord_polar.Rd
#	man/element.Rd
#	man/get_geom_defaults.Rd
#	man/is_tests.Rd
#	man/stat_connect.Rd
#	man/stat_ellipse.Rd
#	revdep/README.md
#	revdep/cran.md
#	revdep/failures.md
#	revdep/problems.md
#	tests/testthat/_snaps/utilities-checks.md
#	tests/testthat/test-utilities-checks.R
@teunbrand
Merge pull request tidyverse#6403 from tidyverse/rc/3.5.2
e1cdee0 
Release 3.5.2
@teunbrand
move 3.5.2 news behind dev news
039aca7
@teunbrand
rename is.waiver() -> is_waiver() for consistency
2a3875c
@teunbrand
more consistently use new test functions
587b87c
@teunbrand
include new elements in is_theme_element(type)
884b0b0
@teunbrand
replace is.zero() with is_zero()
ba76efc
@teunbrand
replace is.rel() with is_rel()
8f72633
@teunbrand teunbrand marked this pull request as draft April 11, 2025 10:10
@teunbrand teunbrand mentioned this pull request Apr 16, 2025
Open
@teunbrand
Copy link
Collaborator Author

Closing this in favour of #6432

@teunbrand teunbrand closed this Apr 16, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@teunbrand @thomasp85