compat

DESCRIPTION

@@ -9,7 +9,7 @@ Description: Function-oriented Make-like declarative pipelines for
   reproducible pipelines concisely and compactly.
   The methods in this package were influenced by the 'drake' R package
   by Will Landau (2018) <doi:10.21105/joss.00550>.
-Version: 0.7.9.9000
+Version: 0.7.10
 License: MIT + file LICENSE
 URL: https://docs.ropensci.org/tarchetypes/, https://github.com/ropensci/tarchetypes
 BugReports: https://github.com/ropensci/tarchetypes/issues
@@ -45,7 +45,7 @@ Imports:
   fs (>= 1.4.2),
   parallel,
   rlang (>= 0.4.7),
-  targets (>= 1.3.2.9001),
+  targets (>= 1.3.2),
   tibble (>= 3.0.1),
   tidyselect (>= 1.1.0),
   utils,

NAMESPACE

@@ -202,8 +202,6 @@ importFrom(targets,tar_path_target)
 importFrom(targets,tar_read)
 importFrom(targets,tar_runtime_object)
 importFrom(targets,tar_script)
-importFrom(targets,tar_seed_create)
-importFrom(targets,tar_seed_set)
 importFrom(targets,tar_target)
 importFrom(targets,tar_target_raw)
 importFrom(targets,tar_test)

NEWS.md

@@ -1,6 +1,7 @@
-# tarchetypes 0.7.9.9000 (development)
+# tarchetypes 0.7.10
 
-* Use `tar_seed_create()` (https://github.com/ropensci/targets/issues/1139).
+* Prepare to use `tar_seed_create()` (https://github.com/ropensci/targets/issues/1139).
+* Migrate tests to `targets` >= 1.3.2.9004 progress statuses ("completed" instead of "built", "dispatched" instead of "started").
 
 # tarchetypes 0.7.9
 

R/tar_map2_raw.R

@@ -342,7 +342,7 @@ tar_map2_run_rep <- function(
       )
     }
   )
-  if_any(anyNA(seed), NULL, targets::tar_seed_set(seed = seed))
+  if_any(anyNA(seed), NULL, tar_seed_set(seed = seed))
   out <- eval(command, envir = envir)
   out <- tar_append_static_values(out, values[, columns])
   out[["tar_batch"]] <- as.integer(batch)

R/tar_package.R

@@ -30,7 +30,7 @@
 #'   tar_cue tar_definition tar_deparse_language tar_deparse_safe
 #'   tar_dir tar_envir tar_exist_meta tar_group tar_load tar_meta
 #'   tar_option_get tar_option_set tar_path_target tar_read
-#'   tar_runtime_object tar_script tar_seed_create tar_seed_set
+#'   tar_runtime_object tar_script
 #'   tar_target tar_target_raw tar_test tar_tidy_eval
 #'   tar_throw_validate tar_warn_deprecate tar_warn_validate
 #' @importFrom tibble as_tibble

R/tar_quarto_rep_raw.R

@@ -510,7 +510,7 @@ tar_quarto_rep_rep <- function(
   args$execute_params[["output_file"]] <- NULL
   args$execute_params[["tar_group"]] <- NULL
   seed <- as.integer(if_any(anyNA(seeds), NA_integer_, seeds[rep]))
-  if_any(anyNA(seed), NULL, targets::tar_seed_set(seed = seed))
+  if_any(anyNA(seed), NULL, tar_seed_set(seed = seed))
   result <- do.call(quarto::quarto_render, args)
   file.rename(temporary_file, destination_file)
   sort(as.character(fs::path_rel(unlist(destination_file))))

R/tar_render_rep_raw.R

@@ -337,7 +337,7 @@ tar_render_rep_rep <- function(rep, params, args, path, seeds) {
   args$params[["tar_group"]] <- NULL
   args$intermediates_dir <- fs::dir_create(tempfile())
   seed <- as.integer(if_any(anyNA(seeds), NA_integer_, seeds[rep]))
-  if_any(anyNA(seed), NULL, targets::tar_seed_set(seed = seed))
+  if_any(anyNA(seed), NULL, tar_seed_set(seed = seed))
   output <- do.call(rmarkdown::render, args)
   tar_render_paths(output, path)
 }

R/tar_rep2_raw.R

@@ -201,7 +201,7 @@ tar_rep2_run <- function(command, batches, iteration, rep_workers) {
 #' # See the examples of tar_rep2().
 tar_rep2_run_rep <- function(rep, slice, command, batch, seeds, envir) {
   seed <- as.integer(if_any(anyNA(seeds), NA_integer_, seeds[rep]))
-  if_any(anyNA(seed), NULL, targets::tar_seed_set(seed = seed))
+  if_any(anyNA(seed), NULL, tar_seed_set(seed = seed))
   out <- eval(command, envir = slice, enclos = envir)
   out$tar_batch <- as.integer(batch)
   out$tar_rep <- as.integer(rep)

R/tar_rep_raw.R

@@ -314,7 +314,7 @@ tar_rep_run_map <- function(expr, batch, reps, rep_workers) {
 #' # See the examples of tar_rep().
 tar_rep_run_map_rep <- function(rep, expr, batch, seeds, envir) {
   seed <- as.integer(if_any(anyNA(seeds), NA_integer_, seeds[rep]))
-  if_any(anyNA(seed), NULL, targets::tar_seed_set(seed = seed))
+  if_any(anyNA(seed), NULL, tar_seed_set(seed = seed))
   out <- eval(expr, envir = envir)
   if (is.list(out)) {
     out[["tar_batch"]] <- as.integer(batch)
@@ -326,7 +326,8 @@ tar_rep_run_map_rep <- function(rep, expr, batch, seeds, envir) {
 
 produce_batch_seeds <- function(name, batch, reps) {
   strings <- paste(name, as.character(seq_len(reps) + reps * (batch - 1)))
-  unname(map_int(x = strings, f = targets::tar_seed_create))
+  # TODO: use targets::tar_seed_create() when CRAN targets has it.
+  unname(map_int(x = strings, f = tar_seed_create))
 }
 
 tar_assert_rep_workers <- function(rep_workers) {

R/utils_seed.R

@@ -0,0 +1,31 @@
+# TODO: use targets::tar_seed_create() when CRAN targets has it.
+tar_seed_create <- function (name, global_seed = NULL) {
+  if (is.null(global_seed)) {
+    global_seed <- targets::tar_option_get("seed")
+  }
+  if (is.null(global_seed) || anyNA(global_seed)) {
+    return(NA_integer_)
+  }
+  name <- as.character(name)
+  hash <- digest::digest(
+    object = name,
+    algo = "sha512",
+    serialize = FALSE, 
+    file = FALSE,
+    seed = 0L
+  )
+  digest::digest2int(x = hash, seed = global_seed)
+}
+
+# TODO: same
+tar_seed_set <- function (seed) {
+  if (!is.null(seed) && !anyNA(seed)) {
+    set.seed(
+      seed = seed,
+      kind = "default",
+      normal.kind = "default", 
+      sample.kind = "default"
+    )
+  }
+  invisible()
+}