wlandau/crew#217 compatibility

Author: wlandau-lilly

DESCRIPTION

@@ -49,7 +49,7 @@ Authors@R: c(
 Depends:
   R (>= 4.0.0)
 Imports:
-  crew (>= 1.1.0),
+  crew (>= 1.1.2.9004),
   ps,
   lifecycle,
   R6,

NEWS.md

@@ -1,6 +1,6 @@
 # crew.cluster 0.3.7.9001 (development)
 
-* Use `expect_no_error()` instead of `expect_silent()` to ensure compatibility with the deprecations to fix https://github.com/wlandau/crew/issues/217.
+* Use `expect_no_error()` instead of `expect_silent()` to ensure compatibility with the deprecation cycle to fix https://github.com/wlandau/crew/issues/217.
 
 # crew.cluster 0.3.7
 

R/crew_controller_lsf.R

@@ -9,9 +9,9 @@
 #'   with caution and report bugs to
 #'   <https://github.com/wlandau/crew.cluster>.
 #' @inheritSection crew.cluster-package Attribution
+#' @inheritParams crew::crew_controller
 #' @inheritParams crew_launcher_lsf
 #' @inheritParams crew::crew_client
-#' @inheritParams crew::crew_controller
 #' @param seconds_exit Deprecated on 2023-09-21 in version 0.1.2.9000.
 #'   No longer necessary.
 #' @examples
@@ -100,10 +100,6 @@ crew_controller_lsf <- function(
     seconds_wall = seconds_wall,
     tasks_max = tasks_max,
     tasks_timers = tasks_timers,
-    reset_globals = reset_globals,
-    reset_packages = reset_packages,
-    reset_options = reset_options,
-    garbage_collection = garbage_collection,
     tls = tls,
     r_arguments = r_arguments,
     options_metrics = options_metrics,
@@ -124,6 +120,10 @@ crew_controller_lsf <- function(
   controller <- crew::crew_controller(
     client = client,
     launcher = launcher,
+    reset_globals = reset_globals,
+    reset_packages = reset_packages,
+    reset_options = reset_options,
+    garbage_collection = garbage_collection,
     crashes_max = crashes_max,
     backup = backup
   )

R/crew_controller_pbs.R

@@ -5,9 +5,9 @@
 #' @description Create an `R6` object to submit tasks and
 #'   launch workers on a PBS or TORQUE cluster.
 #' @inheritSection crew.cluster-package Attribution
+#' @inheritParams crew::crew_controller
 #' @inheritParams crew_launcher_pbs
 #' @inheritParams crew::crew_client
-#' @inheritParams crew::crew_controller
 #' @param seconds_exit Deprecated on 2023-09-21 in version 0.1.2.9000.
 #'   No longer necessary.
 #' @examples
@@ -97,10 +97,6 @@ crew_controller_pbs <- function(
     seconds_wall = seconds_wall,
     tasks_max = tasks_max,
     tasks_timers = tasks_timers,
-    reset_globals = reset_globals,
-    reset_packages = reset_packages,
-    reset_options = reset_options,
-    garbage_collection = garbage_collection,
     tls = tls,
     r_arguments = r_arguments,
     options_metrics = options_metrics,
@@ -122,6 +118,10 @@ crew_controller_pbs <- function(
   controller <- crew::crew_controller(
     client = client,
     launcher = launcher,
+    reset_globals = reset_globals,
+    reset_packages = reset_packages,
+    reset_options = reset_options,
+    garbage_collection = garbage_collection,
     crashes_max = crashes_max,
     backup = backup
   )

R/crew_controller_sge.R

@@ -5,9 +5,9 @@
 #' @description Create an `R6` object to submit tasks and
 #'   launch workers on Sun Grid Engine (SGE) workers.
 #' @inheritSection crew.cluster-package Attribution
+#' @inheritParams crew::crew_controller
 #' @inheritParams crew_launcher_sge
 #' @inheritParams crew::crew_client
-#' @inheritParams crew::crew_controller
 #' @param seconds_exit Deprecated on 2023-09-21 in version 0.1.2.9000.
 #'   No longer necessary.
 #' @examples
@@ -99,10 +99,6 @@ crew_controller_sge <- function(
     seconds_wall = seconds_wall,
     tasks_max = tasks_max,
     tasks_timers = tasks_timers,
-    reset_globals = reset_globals,
-    reset_packages = reset_packages,
-    reset_options = reset_options,
-    garbage_collection = garbage_collection,
     tls = tls,
     r_arguments = r_arguments,
     options_metrics = options_metrics,
@@ -126,6 +122,10 @@ crew_controller_sge <- function(
   controller <- crew::crew_controller(
     client = client,
     launcher = launcher,
+    reset_globals = reset_globals,
+    reset_packages = reset_packages,
+    reset_options = reset_options,
+    garbage_collection = garbage_collection,
     crashes_max = crashes_max,
     backup = backup
   )

R/crew_controller_slurm.R

@@ -9,9 +9,9 @@
 #'   with caution and report bugs to
 #'   <https://github.com/wlandau/crew.cluster>.
 #' @inheritSection crew.cluster-package Attribution
+#' @inheritParams crew::crew_controller
 #' @inheritParams crew_launcher_slurm
 #' @inheritParams crew::crew_client
-#' @inheritParams crew::crew_controller
 #' @param seconds_exit Deprecated on 2023-09-21 in version 0.1.2.9000.
 #'   No longer necessary.
 #' @examples
@@ -101,10 +101,6 @@ crew_controller_slurm <- function(
     seconds_wall = seconds_wall,
     tasks_max = tasks_max,
     tasks_timers = tasks_timers,
-    reset_globals = reset_globals,
-    reset_packages = reset_packages,
-    reset_options = reset_options,
-    garbage_collection = garbage_collection,
     tls = tls,
     r_arguments = r_arguments,
     options_metrics = options_metrics,
@@ -126,6 +122,10 @@ crew_controller_slurm <- function(
   controller <- crew::crew_controller(
     client = client,
     launcher = launcher,
+    reset_globals = reset_globals,
+    reset_packages = reset_packages,
+    reset_options = reset_options,
+    garbage_collection = garbage_collection,
     crashes_max = crashes_max,
     backup = backup
   )

R/crew_launcher_cluster.R

@@ -28,10 +28,10 @@ crew_launcher_cluster <- function(
   seconds_wall = Inf,
   tasks_max = Inf,
   tasks_timers = 0L,
-  reset_globals = TRUE,
-  reset_packages = FALSE,
-  reset_options = FALSE,
-  garbage_collection = FALSE,
+  reset_globals = NULL,
+  reset_packages = NULL,
+  reset_options = NULL,
+  garbage_collection = NULL,
   crashes_error = NULL,
   tls = crew::crew_tls(mode = "automatic"),
   r_arguments = c("--no-save", "--no-restore"),

R/crew_launcher_lsf.R

@@ -38,10 +38,10 @@ crew_launcher_lsf <- function(
   seconds_wall = Inf,
   tasks_max = Inf,
   tasks_timers = 0L,
-  reset_globals = TRUE,
-  reset_packages = FALSE,
-  reset_options = FALSE,
-  garbage_collection = FALSE,
+  reset_globals = NULL,
+  reset_packages = NULL,
+  reset_options = NULL,
+  garbage_collection = NULL,
   crashes_error = NULL,
   tls = crew::crew_tls(mode = "automatic"),
   r_arguments = c("--no-save", "--no-restore"),

R/crew_launcher_pbs.R

@@ -39,10 +39,10 @@ crew_launcher_pbs <- function(
   seconds_wall = Inf,
   tasks_max = Inf,
   tasks_timers = 0L,
-  reset_globals = TRUE,
-  reset_packages = FALSE,
-  reset_options = FALSE,
-  garbage_collection = FALSE,
+  reset_globals = NULL,
+  reset_packages = NULL,
+  reset_options = NULL,
+  garbage_collection = NULL,
   crashes_error = NULL,
   tls = crew::crew_tls(mode = "automatic"),
   r_arguments = c("--no-save", "--no-restore"),

R/crew_launcher_sge.R

@@ -37,10 +37,10 @@ crew_launcher_sge <- function(
   seconds_wall = Inf,
   tasks_max = Inf,
   tasks_timers = 0L,
-  reset_globals = TRUE,
-  reset_packages = FALSE,
-  reset_options = FALSE,
-  garbage_collection = FALSE,
+  reset_globals = NULL,
+  reset_packages = NULL,
+  reset_options = NULL,
+  garbage_collection = NULL,
   crashes_error = NULL,
   tls = crew::crew_tls(mode = "automatic"),
   r_arguments = c("--no-save", "--no-restore"),