Merge branch 'main' into rc_datawizard_1.2.0

Author: etiennebacher

NEWS.md

@@ -1,5 +1,11 @@
 # datawizard 1.2.0
 
+BREAKING CHANGES
+
+* The following deprecated arguments have been removed (#603):
+  - `drop_na` in `data_match()`
+  - `safe`, `pattern`, and `verbose` in `data_rename()`
+
 CHANGES
 
 * `data_read()` and `data_write()` now support the `.parquet` file format, via
@@ -58,7 +64,7 @@ CHANGES
 
 * `data_codebook()` gives an informative warning when no column names matched
   the selection pattern (#601).
-
+  
 * `data_to_long()` now errors when columns selected to reshape do not exist in
   the data, to avoid nonsensical results that could be missed (#602).
 

R/data_match.R

@@ -26,7 +26,6 @@
 #'   character vector (e.g. `c("x > 4", "y == 2")`) or a variable that contains
 #'   the string representation of a logical expression. These might be useful
 #'   when used in packages to avoid defining undefined global variables.
-#' @param drop_na Deprecated, please use `remove_na` instead.
 #'
 #' @return A filtered data frame, or the row indices that match the specified
 #' configuration.
@@ -106,19 +105,12 @@ data_match <- function(x,
                        match = "and",
                        return_indices = FALSE,
                        remove_na = TRUE,
-                       drop_na,
                        ...) {
   if (!is.data.frame(to)) {
     to <- as.data.frame(to)
   }
   original_x <- x
 
-  ## TODO: remove deprecated argument later
-  if (!missing(drop_na)) {
-    insight::format_warning("Argument `drop_na` is deprecated. Please use `remove_na` instead.")
-    remove_na <- drop_na
-  }
-
   # evaluate
   match <- match.arg(tolower(match), c("and", "&", "&&", "or", "|", "||", "!", "not"))
   match <- switch(match,

R/data_rename.R

@@ -40,8 +40,6 @@
 #'
 #' If `select` is a named vector, `replacement` is ignored.
 #' @param rows Vector of row names.
-#' @param safe Deprecated. Passing unknown column names now always errors.
-#' @param pattern Deprecated. Use `select` instead.
 #' @param ... Other arguments passed to or from other functions.
 #'
 #' @details
@@ -87,27 +85,11 @@
 data_rename <- function(data,
                         select = NULL,
                         replacement = NULL,
-                        safe = TRUE,
-                        verbose = TRUE,
-                        pattern = NULL,
                         ...) {
   # check for valid input
   if (!is.data.frame(data)) {
     insight::format_error("Argument `data` must be a data frame.")
   }
-  # If the user does data_rename(iris, pattern = "Sepal.Length", "length"),
-  # then "length" is matched to select by position while it's the replacement
-  # => do the switch manually
-  if (!is.null(pattern)) {
-    .is_deprecated("pattern", "select")
-    if (!is.null(select)) {
-      replacement <- select
-    }
-    select <- pattern
-  }
-  if (isFALSE(safe)) {
-    insight::format_warning("In `data_rename()`, argument `safe` is no longer used and will be removed in a future release.") # nolint
-  }
 
   # change all names if no pattern specified
   select <- .select_nse(
@@ -117,7 +99,6 @@ data_rename <- function(data,
     ignore_case = NULL,
     regex = NULL,
     allow_rename = TRUE,
-    verbose = verbose,
     ifnotfound = "error"
   )
 
@@ -189,25 +170,17 @@ data_rename <- function(data,
 
   for (i in seq_along(select)) {
     if (!is.na(replacement[i])) {
-      data <- .data_rename(data, select[i], replacement[i], safe, verbose)
+      data <- .data_rename(data, select[i], replacement[i])
     }
   }
 
   data
 }
 
 #' @keywords internal
-.data_rename <- function(data, pattern, replacement, safe = TRUE, verbose = TRUE) {
+.data_rename <- function(data, pattern, replacement) {
   if (!pattern %in% names(data)) {
-    if (isTRUE(safe)) {
-      # only give message when verbose is TRUE
-      if (verbose) {
-        insight::format_alert(paste0("Variable `", pattern, "` is not in your data frame :/"))
-      }
-      # if not safe, always error, no matter what verbose is
-    } else {
-      insight::format_error(paste0("Variable `", pattern, "` is not in your data frame :/"))
-    }
+    insight::format_error(paste0("Variable `", pattern, "` is not in your data frame :/"))
   }
 
   names(data) <- replace(names(data), names(data) == pattern, replacement)

man/data_match.Rd

@@ -90,19 +90,6 @@ test_that("data_rename errors when select = NULL", {
 
 # other --------------
 
-test_that("data_rename: argument 'safe' is deprecated", {
-  expect_error(
-    data_rename(iris, "FakeCol", "length", verbose = FALSE),
-    "were not found"
-  )
-  expect_error(
-    expect_warning(
-      data_rename(iris, "FakeCol", "length", safe = FALSE, verbose = FALSE),
-      "used"
-    )
-  )
-})
-
 test_that("data_rename deals correctly with duplicated replacement", {
   x <- data_rename(test,
     select = names(test)[1:4],
@@ -214,14 +201,6 @@ withr::with_environment(
   })
 )
 
-test_that("Argument `pattern` is deprecated", {
-  expect_warning(
-    head(data_rename(iris, pattern = "Sepal.Length", "length")),
-    "Argument `pattern` is deprecated. Please use `select` instead.",
-    fixed = TRUE
-  )
-})
-
 test_that("works with lists", {
   result <- list(x = 1, y = 2)
   expect_error(