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, 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. 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) ) } 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 {