Merge branch 'release/1.1.3'

Author: HenrikBengtsson

.github/workflows/R-CMD-check.yaml

@@ -20,8 +20,6 @@ jobs:
           - {os: windows-latest, r: 'release'  }
           - {os: windows-latest, r: 'oldrel'   }
 #          - {os: macOS-latest,   r: 'devel'    }
-          - {os: macOS-latest,   r: 'release', parallelly_version: ed860db, label: 'w/ compatible parallelly' }
-          - {os: macOS-latest,   r: 'release', parallelly_version: ea182e9, label: 'w/ compatible parallelly' }
           - {os: macOS-latest,   r: 'release'  }
           - {os: macOS-latest,   r: 'oldrel'   }
 #          - {os: ubuntu-latest,  r: 'devel'    }
@@ -33,9 +31,7 @@ jobs:
           - {os: ubuntu-latest,  r: 'release'  , plan: multicore,    label: 'w/ multicore'    }
           - {os: ubuntu-latest,  r: 'release'  , plan: multisession, label: 'w/ multisession' }
           - {os: windows-latest,  r: 'release', future_version: develop, label: 'w/ future-develop' }
-          - {os: windows-latest,  r: 'release', globals_version: develop, future_version: develop, label: 'w/ future-develop' }
           - {os: ubuntu-latest,  r: 'release', future_version: develop, label: 'w/ future-develop' }
-          - {os: ubuntu-latest,  r: 'release', globals_version: develop, future_version: develop, label: 'w/ future-develop' }
 
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: doFuture
-Version: 1.1.2
+Version: 1.1.3
 Title: Use Foreach to Parallelize via the Future Framework
 Depends:
     foreach (>= 1.5.0),
@@ -27,5 +27,5 @@ URL: https://doFuture.futureverse.org, https://github.com/futureverse/doFuture
 BugReports: https://github.com/futureverse/doFuture/issues
 Language: en-US
 Encoding: UTF-8
-RoxygenNote: 7.3.2
+RoxygenNote: 7.3.3
 Roxygen: list(markdown = TRUE)

NEWS.md

@@ -1,3 +1,11 @@
+# Version 1.1.3 (2025-12-08)
+
+## Bug Fixes
+
+ * Attempts to add or ignore globals via `foreach()` argument
+   `.options.globals` were silently ignored.
+ 
+
 # Version 1.1.2 (2025-07-14)
 
 ## Bug Fixes

R/doFuture2.R

@@ -273,13 +273,6 @@ doFuture2 <- function(obj, expr, envir, data) {   #nolint
 
   globals <- options[["globals"]]
   if (is.null(globals)) globals <- TRUE
-  if (is.logical(globals)) {
-    attr(globals, "add") <- obj$export
-    attr(globals, "ignore") <- obj$noexport
-  } else {
-    attr(globals, "add") <- c(attr(globals, "add", exact = TRUE), obj$export)
-    attr(globals, "ignore") <- c(attr(globals, "ignore", exact = TRUE), obj$noexport)
-  }
 
   packages <- c(options[["packages"]], obj$packages)
 

R/options.R

@@ -10,22 +10,24 @@
 #'
 #' \describe{
 #'  \item{\option{doFuture.foreach.export}:}{
-#'    Specifies to what extent the \code{.export} argument of
-#'    \code{\link[foreach]{foreach}()} should be respected or if globals
-#'    should be automatically identified.
+#'    Specifies to what extent the `.export` argument of [foreach()], paired
+#'    with \code{\link[foreach:\%dopar\%]{\%dopar\%}}, should be respected or
+#'    if globals should be automatically identified. This is only for
+#'    `%dopar%` -- [`%dofuture%`] does not support `.export` and `.noexport`.
 #' 
-#'    If \code{".export"}, then the globals specified by the \code{.export}
+#'    If `".export"`, then the globals specified by the `.export`
 #'    argument will be used "as is".
 #' 
-#'    If \code{".export-and-automatic"}, then globals specified by
-#'    \code{.export} as well as those automatically identified are used.
+#'    If `".export-and-automatic"`, then globals specified by
+#'    `.export` as well as those automatically identified are used.
 #' 
-#'    The \code{".export-and-automatic-with-warning"} is the same as
-#'    \code{".export-and-automatic"}, but produces a warning if \code{.export}
-#'    lacks some of the globals that the automatic identification locates
-#'    - this is helpful feedback to developers using \code{foreach()}.
+#'    The `".export-and-automatic-with-warning"` is the same as
+#'    `".export-and-automatic"`, but produces a warning if `.export`
+#'    lacks some of the globals that the automatic identification locates,
+#'    which could be helpful feedback to developers using [foreach()] with
+#'    `%dopar%` -- also when using adapters such as **doParallel**.
 #' 
-#'    (Default: \code{".export-and-automatic"})
+#'    (Default: `".export-and-automatic"`)
 #'  }
 #'
 #'  \item{\option{doFuture.debug}:}{If `TRUE`, extensive debug messages are
@@ -34,7 +36,7 @@
 #'
 #' @section Environment variables that set R options:
 #' All of the above \R \option{doFfuture.*} options can be set by
-#' corresponding environment variable \env{R_FOFUTURE_*} _when the
+#' corresponding environment variable \env{R_DOFUTURE_*} _when the
 #' \pkg{doFuture} package is loaded_.
 #' For example, if `R_DOFUTURE_DEBUG=TRUE`, then option
 #' \option{doFuture.debug} is set to `TRUE` (logical).

inst/testme/deploy.R

@@ -62,11 +62,13 @@ for (kk in seq_along(files)) {
 
   ## Generate R unit test script
   code <- c(
+    "#! /usr/bin/env Rscript",
     sprintf("## This runs testme test script inst/testme/test-%s.R", name),
     "## Don't edit - it was autogenerated by inst/testme/deploy.R",
     sprintf('%s:::testme("%s")', pkgname, name)
   )
   writeLines(code, con = target_file)
+  Sys.chmod(target_file, mode = "0755")
 }
 
 message(sprintf("Deploying %d test scripts ... done", length(files)))

inst/testme/test-foreach_dofuture,globals.R

@@ -4,9 +4,9 @@
 
 library(doFuture)
 options(
-  parallelly.debug = TRUE,
-  future.debug = TRUE,
-  doFuture.debug = TRUE
+#  parallelly.debug = TRUE,
+#  future.debug = TRUE,
+#  doFuture.debug = TRUE
 )
 
 strategies <- future:::supportedStrategies()
@@ -129,6 +129,50 @@ for (strategy in strategies) {
   str(z1)
   stopifnot(identical(z1, z0))
 
+  message("- foreach() - globals are picked up ...")
+  y <- foreach(x = 0) %dofuture% {
+    message(sprintf("Globals: a = %s, b = %s", a, b))
+    y ~ a + b
+  }
+  stopifnot(is.list(y), length(y) == 1L, inherits(y[[1]], "formula"))
+
+  message("- foreach() - .export and .noexport must not be used ...")
+  y <- tryCatch({
+    foreach(x = 0, .export = c("a", "b")) %dofuture% {
+      message(sprintf("Globals: a = %s, b = %s", a, b))
+      y ~ a + b
+    }
+  }, error = identity)
+  stopifnot(inherits(y, "error"))
+  
+  y <- tryCatch({
+    foreach(x = 0, .noexport = c("a", "b")) %dofuture% {
+      message(sprintf("Globals: a = %s, b = %s", a, b))
+      y ~ a + b
+    }
+  }, error = identity)
+  stopifnot(inherits(y, "error"))
+
+  message("- foreach() - globals can be added ...")
+  y <- tryCatch({
+    foreach(x = 0, .options.future = list(globals = structure(TRUE, add = c("a", "b")))) %dofuture% {
+      message(sprintf("Globals: a = %s, b = %s", get("a"), get("b")))
+      y ~ 42
+    }
+  }, error = identity)
+  stopifnot(is.list(y), length(y) == 1L, inherits(y[[1]], "formula"))
+
+  message("- foreach() - globals can be ignored ...")
+  y <- tryCatch({
+    foreach(x = 0, .options.future = list(globals = structure(TRUE, ignore = c("a", "b")))) %dofuture% {
+      message(sprintf("Globals: a = %s, b = %s", a, b))
+      y ~ a + b
+    }
+  }, error = identity)
+  stopifnot(
+    inherits(y, "error") || inherits(plan("next"), c("sequential", "multicore"))
+  )
+
   # Shutdown current plan
   plan(sequential)
 } ## for (strategy ...)

man/doFuture.options.Rd

@@ -1,3 +1,4 @@
+#! /usr/bin/env Rscript
 ## This runs testme test script inst/testme/test-foreach_dofuture,errors.R
 ## Don't edit - it was autogenerated by inst/testme/deploy.R
 doFuture:::testme("foreach_dofuture,errors")

tests/test-foreach_dofuture,errors.R

@@ -1,3 +1,4 @@
+#! /usr/bin/env Rscript
 ## This runs testme test script inst/testme/test-foreach_dofuture,globals.R
 ## Don't edit - it was autogenerated by inst/testme/deploy.R
 doFuture:::testme("foreach_dofuture,globals")