CLEANUP: Bump pkg dependency on future

HenrikBengtsson · HenrikBengtsson · commit 3c456dce1720 · 2019-01-22T18:08:59.000-08:00
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -2,7 +2,7 @@ Package: future.batchtools
 Version: 0.7.2-9000
 Depends:
     R (>= 3.2.0),
-    future (>= 1.10.0)
+    future (>= 1.11.0)
 Imports:
     batchtools (>= 0.9.8)
 Suggests:
diff --git a/R/utils.R b/R/utils.R
@@ -176,9 +176,6 @@ tempvar <- function(prefix = "var", value = NA, envir = parent.frame()) {
 result_has_errors <- function(result) {
   stop_if_not(inherits(result, "FutureResult"))
 
-  ## BACKWARD COMPATIBILITY: future (< 1.11.0)
-  if (inherits(result$condition, "error")) return(TRUE)
-  
   for (c in result$conditions) {
     if (inherits(c$condition, "error")) return(TRUE)
   }
diff --git a/tests/BatchtoolsFuture.R b/tests/BatchtoolsFuture.R
@@ -7,9 +7,7 @@ message("*** BatchtoolsFuture() - cleanup ...")
 f <- batchtools_local({ 1L })
 res <- await(f, cleanup = TRUE)
 print(res)
-# future (>= 1.7.0-9000)
-if (inherits(res, "FutureResult")) res <- res$value
-stopifnot(res == 1L)
+stopifnot(res$value == 1L)
 
 message("*** BatchtoolsFuture() - cleanup ... DONE")
 

Original file line number	Diff line number	Diff line change
`@@ -176,9 +176,6 @@ tempvar <- function(prefix = "var", value = NA, envir = parent.frame()) {`
`176`	`176`	`result_has_errors <- function(result) {`
`177`	`177`	`stop_if_not(inherits(result, "FutureResult"))`
`178`	`178`
`179`		`- ## BACKWARD COMPATIBILITY: future (< 1.11.0)`
`180`		`- if (inherits(result$condition, "error")) return(TRUE)`
`181`		`-`
`182`	`179`	`for (c in result$conditions) {`
`183`	`180`	`if (inherits(c$condition, "error")) return(TRUE)`
`184`	`181`	`}`