Merge branch 'master' into fix/geom-function-and-override-aes-449

Author: jgabry

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

@@ -29,6 +29,7 @@ jobs:
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
       R_KEEP_PKG_SOURCE: yes
+      R_VERSION_TYPE: ${{ matrix.config.r }}
 
     steps:
       - uses: actions/checkout@v6

DESCRIPTION

@@ -30,13 +30,14 @@ SystemRequirements: pandoc (>= 1.12.3), pandoc-citeproc
 Depends:
     R (>= 4.1.0)
 Imports:
-    dplyr (>= 0.8.0),
+    dplyr (>= 1.0.0),
     ggplot2 (>= 3.4.0),
     ggridges (>= 0.5.5),
     glue,
+    lifecycle,
     posterior,
     reshape2,
-    rlang (>= 0.3.0),
+    rlang (>= 1.0.0),
     stats,
     tibble (>= 2.0.0),
     tidyr,

NAMESPACE

@@ -226,3 +226,6 @@ importFrom(dplyr,top_n)
 importFrom(dplyr,ungroup)
 importFrom(dplyr,vars)
 importFrom(ggplot2,"%+replace%")
+importFrom(lifecycle,deprecate_warn)
+importFrom(lifecycle,deprecated)
+importFrom(lifecycle,is_present)

NEWS.md

@@ -1,5 +1,7 @@
 # bayesplot (development version)
 
+* Fix assignment-in-call bug in `mcmc_rank_ecdf()` (#).
+* Replaced deprecated `dplyr` and `tidyselect` functions (`top_n`, `one_of`, `group_indices`) with their modern equivalents to ensure future compatibility. (#431)
 * Documentation added for all exported `*_data()` functions (#209)
 * Improved documentation for `binwidth`, `bins`, and `breaks` arguments to clarify they are passed to `ggplot2::geom_area()` and `ggdist::stat_dots()` in addition to `ggplot2::geom_histogram()`
 * Improved documentation for `freq` argument to clarify it applies to frequency polygons in addition to histograms

R/bayesplot-helpers.R

@@ -446,19 +446,28 @@ plot_bg <- function(on = TRUE, ...) {
 
 #' @rdname bayesplot-helpers
 #' @export
-#' @param color,size Passed to [ggplot2::element_line()].
-#'
-grid_lines <- function(color = "gray50", size = 0.2) {
+#' @param color,linewidth Passed to [ggplot2::element_line()].
+#' @param size `r lifecycle::badge("deprecated")` Use `linewidth` instead.
+#'
+grid_lines <- function(color = "gray50", linewidth = 0.2, size = deprecated()) {
+  if (lifecycle::is_present(size)) {
+    lifecycle::deprecate_warn(
+      "1.16.0",
+      "grid_lines(size)",
+      "grid_lines(linewidth)"
+    )
+    linewidth <- size
+  }
   theme(
-    panel.grid.major = element_line(color = color, linewidth = size),
-    panel.grid.minor = element_line(color = color, linewidth = size * 0.5)
+    panel.grid.major = element_line(color = color, linewidth = linewidth),
+    panel.grid.minor = element_line(color = color, linewidth = linewidth * 0.5)
   )
 }
 
-grid_lines_y <- function(color = "gray50", size = 0.2) {
+grid_lines_y <- function(color = "gray50", linewidth = 0.2) {
   theme(
-    panel.grid.major.y = element_line(color = color, linewidth = size),
-    panel.grid.minor.y = element_line(color = color, linewidth = size * 0.5)
+    panel.grid.major.y = element_line(color = color, linewidth = linewidth),
+    panel.grid.minor.y = element_line(color = color, linewidth = linewidth * 0.5)
   )
 }
 

R/bayesplot-package.R

@@ -5,6 +5,7 @@
 #'
 #' @import ggplot2 stats rlang
 #' @importFrom dplyr %>% summarise group_by select
+#' @importFrom lifecycle deprecated deprecate_warn is_present
 #'
 #' @description
 #' \if{html}{

R/helpers-gg.R

@@ -24,17 +24,10 @@ geom_ignore <- function(...) {
 
 #' Add new aesthetic mappings to a list of aesthetic mappings
 #'
-#' @param mapping a list of `uneval` aesthetic mappings (created by `aes_()`)
-#' @param ... additional mappings to add, e.g., `color = ~ parameter`
+#' @param mapping a list of `uneval` aesthetic mappings (created by `aes()`)
+#' @param ... additional mappings to add using `.data$` syntax
 #' @return the updated list
 #' @noRd
-modify_aes_ <- function(mapping, ...) {
-  utils::modifyList(mapping, aes_(...))
-}
-
-#' Same as `modify_aes_` but using `aes()` instead of `aes_()` (now deprecated).
-#' Often `...` will need to contain expression of the form `.data$x` to avoid R cmd check warnings
-#' @noRd
 modify_aes <- function(mapping, ...) {
   utils::modifyList(mapping, aes(...))
 }

R/mcmc-diagnostics.R

@@ -77,7 +77,7 @@
 #' (p <- mcmc_acf_bar(x, pars = c("alpha", "beta[1]")))
 #'
 #' # add horiztonal dashed line at 0.5
-#' p + hline_at(0.5, linetype = 2, size = 0.15, color = "gray")
+#' p + hline_at(0.5, linetype = 2, linewidth = 0.15, color = "gray")
 #' }
 #'
 #' # fake rhat values to use for demonstration

R/mcmc-distributions.R

@@ -489,7 +489,7 @@ mcmc_dots_by_chain <- function(
   data <- melt_mcmc(x, value.name = "value")
   n_param <- num_params(data)
 
-  graph <- ggplot(data, aes(x = ~ value)) +
+  graph <- ggplot(data, aes(x = .data$value)) +
     geom_histogram(
       set_hist_aes(freq),
       fill = get_color("mid"),

R/mcmc-intervals.R

@@ -647,7 +647,7 @@ mcmc_intervals_data <- function(x,
 
     rhat_tbl <- rhat %>%
       mcmc_rhat_data() %>%
-      select(one_of("parameter"),
+      select(all_of("parameter"),
              rhat_value = "value",
              rhat_rating = "rating",
              rhat_description = "description") %>%
@@ -663,7 +663,7 @@ mcmc_intervals_data <- function(x,
 # Don't import `filter`: otherwise, you get a warning when using
 # `devtools::load_all(".")` because stats also has a `filter` function
 
-#' @importFrom dplyr inner_join one_of top_n
+#' @importFrom dplyr inner_join all_of slice_min
 #' @rdname MCMC-intervals
 #' @export
 mcmc_areas_data <- function(x,
@@ -736,14 +736,14 @@ mcmc_areas_data <- function(x,
 
   # Find the density values closest to the point estimate
   point_ests <- intervals %>%
-    select(one_of("parameter", "m"))
+    select(all_of(c("parameter", "m")))
 
   point_centers <- data_inner %>%
     inner_join(point_ests, by = "parameter") %>%
     group_by(.data$parameter) %>%
     mutate(diff = abs(.data$m - .data$x)) %>%
-    dplyr::top_n(1, -.data$diff) %>%
-    select(one_of("parameter", "x", "m")) %>%
+    dplyr::slice_min(order_by = .data$diff, n = 1) %>%
+    select(all_of(c("parameter", "x", "m"))) %>%
     rename(center = "x") %>%
     ungroup()
 
@@ -765,15 +765,15 @@ mcmc_areas_data <- function(x,
   }
 
   data <- dplyr::bind_rows(data_inner, data_outer, points) %>%
-    select(one_of("parameter", "interval", "interval_width",
-                  "x", "density", "scaled_density")) %>%
+    select(all_of(c("parameter", "interval", "interval_width",
+                  "x", "density", "scaled_density"))) %>%
     # Density scaled so the highest in entire dataframe has height 1
     mutate(plotting_density = .data$density / max(.data$density))
 
   if (rlang::has_name(intervals, "rhat_value")) {
     rhat_info <- intervals %>%
-      select(one_of("parameter", "rhat_value",
-                    "rhat_rating", "rhat_description"))
+      select(all_of(c("parameter", "rhat_value",
+                    "rhat_rating", "rhat_description")))
     data <- inner_join(data, rhat_info, by = "parameter")
   }
   data
@@ -824,18 +824,15 @@ compute_column_density <- function(df, group_vars, value_var, ...) {
     syms()
 
   # Tuck away the subgroups to compute densities on into nested dataframes
-  sub_df <- dplyr::select(df, !!! group_cols, !! value_var)
-
   group_df <- df %>%
     dplyr::select(!!! group_cols, !! value_var) %>%
     group_by(!!! group_cols)
 
   by_group <- group_df %>%
-    split(dplyr::group_indices(group_df)) %>%
+    dplyr::group_split() %>%
     lapply(pull, !! value_var)
 
-  nested <- df %>%
-    dplyr::distinct(!!! group_cols) %>%
+  nested <- dplyr::group_keys(group_df) %>%
     mutate(data = by_group)
 
   nested$density <- lapply(nested$data, compute_interval_density, ...)