Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Imports:
magrittr,
Matrix,
methods,
purrr,
purrr (>= 1.0.0),
processx,
readr,
stringr,
Expand Down
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
12 changes: 6 additions & 6 deletions R/method_process_definition.R
Original file line number Diff line number Diff line change
Expand Up @@ -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)
)
}

Expand Down
4 changes: 2 additions & 2 deletions R/wrap_add_dimred.R
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading