From f570ae446ba2e0f98ec19edf425686d04883aea6 Mon Sep 17 00:00:00 2001 From: Hadley Wickham Date: Wed, 24 Sep 2025 07:41:42 -0500 Subject: [PATCH 1/4] Fix partial match warning --- R/wrap_add_dimred.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/R/wrap_add_dimred.R b/R/wrap_add_dimred.R index e3020ae..85690a0 100755 --- a/R/wrap_add_dimred.R +++ b/R/wrap_add_dimred.R @@ -58,8 +58,8 @@ add_dimred <- function( if (is.matrix(dimred) || is.data.frame(dimred)) { dimred <- process_dimred(dataset, dimred) assert_that( - rownames(dimred) %all_in% dataset$cell_id, - dataset$cell_id %all_in% rownames(dimred) + rownames(dimred) %all_in% dataset$cell_ids, + dataset$cell_ids %all_in% rownames(dimred) ) } else { From a13f904932df684c1d99633ecdcc80893bef7b72 Mon Sep 17 00:00:00 2001 From: Hadley Wickham Date: Wed, 24 Sep 2025 07:44:03 -0500 Subject: [PATCH 2/4] Replace `invoke()` with `exec()` --- R/method_process_definition.R | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/R/method_process_definition.R b/R/method_process_definition.R index 14ec9ca..9c04afb 100755 --- a/R/method_process_definition.R +++ b/R/method_process_definition.R @@ -320,12 +320,12 @@ is_ti_method <- function(method) { #' @export convert_definition <- function(definition_raw) { definition( - method = purrr::invoke(def_method, definition_raw$method %||% list()), - wrapper = purrr::invoke(def_wrapper, definition_raw$wrapper %||% list()), - container = purrr::invoke(def_container, definition_raw$container %||% list()), - package = purrr::invoke(def_package, definition_raw$package %||% list()), - manuscript = purrr::invoke(def_manuscript, definition_raw$manuscript %||% list()), - parameters = dynparam::as_parameter_set(definition_raw$parameters %||% list()) + method = purrr::exec(def_method, !!!definition_raw$method), + wrapper = purrr::exec(def_wrapper, !!!definition_raw$wrapper), + container = purrr::exec(def_container, !!!definition_raw$container), + package = purrr::exec(def_package, !!!definition_raw$package), + manuscript = purrr::exec(def_manuscript, !!!definition_raw$manuscript), + parameters = dynparam::as_parameter_set(definition_raw$parameters) ) } From 17c5da018bc15cc52d1ae6436f0409fe4482f1f0 Mon Sep 17 00:00:00 2001 From: Robrecht Cannoodt Date: Wed, 26 Nov 2025 08:50:55 +0100 Subject: [PATCH 3/4] add entry to news --- NEWS.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/NEWS.md b/NEWS.md index aff7084..cf389aa 100755 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,7 @@ +# dynwrap 1.2.5 + +* BUG FIX `convert_definition()`: Fix for purrr having deprecated `invoke` in favour of `exec` (PR #166). + # dynwrap 1.2.4 * Resubmission after babelwhale was removed from CRAN. From 7a7a8bd915b74d786ed5999320a80c4a58b0ca8c Mon Sep 17 00:00:00 2001 From: Robrecht Cannoodt Date: Wed, 26 Nov 2025 08:52:39 +0100 Subject: [PATCH 4/4] add minimal version --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index c770eb9..054439e 100755 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -43,7 +43,7 @@ Imports: magrittr, Matrix, methods, - purrr, + purrr (>= 1.0.0), processx, readr, stringr,