Merge branch 'release/1.33.1'

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

@@ -27,7 +27,7 @@ jobs:
           - {os: ubuntu-latest,  r: 'oldrel'   }
           - {os: ubuntu-latest,  r: 'oldrel-1' }
           - {os: ubuntu-latest,  r: 'oldrel-2' }
-          - {os: ubuntu-latest,  r: '3.4'      }
+          - {os: ubuntu-latest,  r: '3.5'      }
           - {os: ubuntu-latest,  r: 'release'  , language: ko,    label: ko    }
           - {os: ubuntu-latest,  r: 'release'  , language: zh_CN, label: zh_CN }
           - {os: ubuntu-latest,  r: 'release'  , language: zh_TW, label: zh_TW }
@@ -57,7 +57,7 @@ jobs:
       R_FUTURE_GLOBALS_KEEPWHERE: ${{ matrix.config.globals_keepWhere }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/setup-pandoc@v2
 
@@ -92,7 +92,7 @@ jobs:
           tryCatch(log("a"), error = conditionMessage)
         shell: Rscript {0}
 
-      - name: Check (!Windows)
+      - name: Check
         if: runner.os != 'Windows'
         env:
           ## FIXME: Eventually update to 'R_FUTURE_GLOBALS_ONREFERENCE=error'

.github/workflows/covr.yaml

@@ -26,7 +26,7 @@ jobs:
       _R_CHECK_CRAN_INCOMING_: false
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/setup-pandoc@v2
 

.github/workflows/future_tests.yaml

@@ -36,7 +36,7 @@ jobs:
       R_FUTURE_RNG_ONMISUSE: error
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/setup-pandoc@v2
 

.github/workflows/revdepcheck-top.yaml

@@ -8,7 +8,7 @@ jobs:
 
     timeout-minutes: 30
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     name: ${{ matrix.config.pkg }} (${{ matrix.config.r }}) ${{ matrix.config.label }}
 
@@ -29,7 +29,7 @@ jobs:
 
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
-      RSPM: https://packagemanager.rstudio.com/cran/__linux__/focal/latest
+      RSPM: https://packagemanager.rstudio.com/cran/__linux__/jammy/latest
       R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
       ## R CMD check
       _R_CHECK_LENGTH_1_CONDITION_: true
@@ -44,7 +44,7 @@ jobs:
       NOT_CRAN: false
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/setup-pandoc@v2
 

DESCRIPTION

@@ -1,5 +1,5 @@
 Package: future
-Version: 1.33.0
+Version: 1.33.1
 Title: Unified Parallel and Distributed Processing in R for Everyone
 Imports:
     digest,
@@ -14,8 +14,10 @@ Suggests:
     R.rsp,
     markdown
 VignetteBuilder: R.rsp
-Authors@R: c(person("Henrik", "Bengtsson", role=c("aut", "cre", "cph"),
-                                          email = "[email protected]"))
+Authors@R: c(person("Henrik", "Bengtsson",
+                    role = c("aut", "cre", "cph"),
+                    email = "[email protected]",
+                    comment = c(ORCID = "0000-0002-7579-5165")))
 Description: The purpose of this package is to provide a lightweight and
     unified Future API for sequential and parallel processing of R
     expression via futures.  The simplest way to evaluate an expression

NEWS.md

@@ -1,3 +1,14 @@
+# Version 1.33.1 [2023-12-21]
+
+## Bug Fixes
+
+ * `getExpression()` on 'cluster' future could under some
+   circumstances call `local()` on the global search path rather than
+   `base::local()` as intended.  For example, if a package that
+   exports its own `local()` function was attached, then that would be
+   called instead, often leading to a hard to troubleshoot error.
+
+
 # Version 1.33.0 [2023-07-01]
 
 ## New Features

R/ClusterFuture-class.R

@@ -607,7 +607,7 @@ requestNode <- function(await, workers, timeout = getOption("future.wait.timeout
 #' @export
 getExpression.ClusterFuture <- local({
   tmpl_expr_conditions <- bquote_compile({
-    ...future.makeSendCondition <- local({
+    ...future.makeSendCondition <- base::local({
       sendCondition <- NULL
 
       function(frame = 1L) {

R/futureSessionInfo.R

@@ -14,7 +14,7 @@ futureSessionInfo <- function(test = TRUE, anonymize = TRUE) {
   mprint0 <- function(...) mprint(..., prefix = NULL, debug = TRUE)
   mprintf0 <- function(...) mdebugf(..., prefix = NULL, debug = TRUE)   
   mstr0 <- function(...) mstr(..., prefix = NULL, debug = TRUE)
-
+  
   message("*** Package versions")
   p <- c("future", "parallelly", "parallel", "globals", "listenv")
   v <- vapply(p, FUN = function(pkg) {
@@ -93,11 +93,14 @@ futureSessionInfo <- function(test = TRUE, anonymize = TRUE) {
     if (anonymize) vs <- anonymize_info(vs)
     message("Main R session details:")
     mprint0(vs)
-
+
+    delay <- getOption("future.futureSessionInfo.delay", 1.0)  ## seconds
+
     ## Information on the workers
     fs <- list()
     for (ii in seq_len(nbrOfWorkers())) {
       fs[[ii]] <- future({
+        Sys.sleep(delay)
         data.frame(
           worker = ii,
           pid    = Sys.getpid(),

R/mandelbrot.R

@@ -1,18 +1,5 @@
 #' Mandelbrot convergence counts
 #'
-#' @param Z               A complex matrix for which convergence
-#'                        counts should be calculated.
-#' @param xmid,ymid,side,resolution Alternative specification of
-#'                        the complex plane `Z`, where
-#'                        `mean(Re(Z)) == xmid`,
-#'                        `mean(Im(Z)) == ymid`,
-#'                        `diff(range(Re(Z))) == side`,
-#'                        `diff(range(Im(Z))) == side`, and
-#'                        `dim(Z) == c(resolution, resolution)`.
-#' @param maxIter         Maximum number of iterations per bin.
-#' @param tau             A threshold; the radius when calling
-#'                        divergence (Mod(z) > tau).
-#'
 #' @return Returns an integer matrix (of class Mandelbrot) with
 #' non-negative counts.
 #'
@@ -32,11 +19,29 @@
 #' from ftp://stat.ethz.ch/U/maechler/R/ on 2005-02-18 (sic!).
 #'
 #' @aliases as.raster.Mandelbrot plot.Mandelbrot mandelbrot_tiles
-#' @export
-#'
 #' @keywords internal
+#'
+#' @export
 mandelbrot <- function(...) UseMethod("mandelbrot")
 
+
+#' @param Z               A complex matrix for which convergence
+#'                        counts should be calculated.
+#'
+#' @param maxIter         Maximum number of iterations per bin.
+#'
+#' @param tau             A threshold; the radius when calling
+#'                        divergence (Mod(z) > tau).
+#'
+#' @param xmid,ymid,side,resolution Alternative specification of
+#'                        the complex plane `Z`, where
+#'                        `mean(Re(Z)) == xmid`,
+#'                        `mean(Im(Z)) == ymid`,
+#'                        `diff(range(Re(Z))) == side`,
+#'                        `diff(range(Im(Z))) == side`, and
+#'                        `dim(Z) == c(resolution, resolution)`.
+#'
+#' @rdname mandelbrot
 #' @export
 mandelbrot.matrix <- function(Z, maxIter = 200L, tau = 2.0, ...) {
   stop_if_not(is.matrix(Z), mode(Z) == "complex")
@@ -82,6 +87,20 @@ mandelbrot.matrix <- function(Z, maxIter = 200L, tau = 2.0, ...) {
 }
 
 
+#' @param xmid,ymid,side,resolution Alternative specification of
+#'                        the complex plane `Z`, where
+#'                        `mean(Re(Z)) == xmid`,
+#'                        `mean(Im(Z)) == ymid`,
+#'                        `diff(range(Re(Z))) == side`,
+#'                        `diff(range(Im(Z))) == side`, and
+#'                        `dim(Z) == c(resolution, resolution)`.
+#'
+#' @param maxIter         Maximum number of iterations per bin.
+#'
+#' @param tau             A threshold; the radius when calling
+#'                        divergence (Mod(z) > tau).
+#'
+#' @rdname mandelbrot
 #' @export
 mandelbrot.numeric <- function(xmid = -0.75, ymid = 0.0, side = 3.0,
                                resolution = 400L, maxIter = 200L,

R/resolved.R

@@ -1,7 +1,7 @@
 #' Check whether a future is resolved or not
 #'
 #' @param x A \link{Future}, a list, or an environment (which also
-#' includes \link[listenv:listenv]{list environment}.
+#' includes \link[listenv:listenv]{list environment}).
 #'
 #' @param \dots Not used.
 #'

R/zzz.plan.R

@@ -39,7 +39,7 @@
 #' @section Built-in evaluation strategies:
 #' The \pkg{future} package provides the following built-in backends:
 #'
-#' \itemize{
+#' \describe{
 #'  \item{[`sequential`]:}{
 #'    Resolves futures sequentially in the current \R process, e.g.
 #'    `plan(sequential)`.

cran-comments.md

@@ -1,12 +1,10 @@
-# CRAN submission future 1.33.0
+# CRAN submission future 1.33.1
 
-on 2023-07-01
+on 2023-12-21
 
-I've checked this version towards 292 reverse package dependencies available on CRAN (n = 273) and Bioconductor (n = 19).
+## Notes sent to CRAN
 
-This submission breaks five (n = 5) CRAN packages: disk.frame (ERROR), jstor (WARNING), metabolomicsR(WARNING), tcplfit2 (WARNING), and TSstudio (WARNING). This is because they depend on a function that has been deprecated since 2020. The maintainers have been notified well in advance and multiple times. They have been reminded about since at least 2023-04-04 and some even since 2021.
-
-Thank you
+Thanks in advance
 
 
 ## Notes not sent to CRAN
@@ -18,9 +16,8 @@ The package has been verified using `R CMD check --as-cran` on:
 | R version | GitHub | R-hub  | mac/win-builder |
 | --------- | ------ | ------ | --------------- |
 | 3.5.x     | L      |        |                 |
-| 3.6.x     | L      |        |                 |
 | 4.1.x     | L      |        |                 |
-| 4.2.x     | L M W  | L   W  | M1 W            |
+| 4.2.x     | L M W  | L   W  |                 |
 | 4.3.x     | L M W  | L   W  | M1 W            |
 | devel     | L M W  | L      |    W            |
 
@@ -34,7 +31,6 @@ res <- rhub::check(platforms = c(
   "debian-clang-devel", 
   "fedora-gcc-devel",
   "debian-gcc-patched", 
-#  "macos-highsierra-release-cran",
   "windows-x86_64-release"
 ))
 print(res)
@@ -43,39 +39,39 @@ print(res)
 gives
 
 ```
-── future 1.32.0-9115: OK
+── future 1.33.1: OK
 
-  Build ID:   future_1.32.0-9115.tar.gz-ada9133dcbd34b03899066463a021e9b
+  Build ID:   future_1.33.1.tar.gz-2f034a059c5d407aa6167d7fbe0ee504
   Platform:   Debian Linux, R-devel, clang, ISO-8859-15 locale
-  Submitted:  14m 32.1s ago
-  Build time: 14m 28.2s
+  Submitted:  45m 55.3s ago
+  Build time: 41m 47.9s
 
 0 errors ✔ | 0 warnings ✔ | 0 notes ✔
 
-── future 1.32.0-9115: OK
+── future 1.33.1: OK
 
-  Build ID:   future_1.32.0-9115.tar.gz-0411c118672a4fb98da3fc376f3507e6
+  Build ID:   future_1.33.1.tar.gz-f385f4998fac446bb0e2c5efc02f36d3
   Platform:   Fedora Linux, R-devel, GCC
-  Submitted:  14m 32.1s ago
-  Build time: 11m 26.2s
+  Submitted:  45m 55.3s ago
+  Build time: 28m 25.3s
 
 0 errors ✔ | 0 warnings ✔ | 0 notes ✔
 
-── future 1.32.0-9115: OK
+── future 1.33.1: OK
 
-  Build ID:   future_1.32.0-9115.tar.gz-a000c2b84c26406b8269f27f8bcddc73
+  Build ID:   future_1.33.1.tar.gz-5e83389a128540c48a35112d8f06810c
   Platform:   Debian Linux, R-patched, GCC
-  Submitted:  14m 32.1s ago
-  Build time: 13m 45.6s
+  Submitted:  45m 55.3s ago
+  Build time: 39m 28.8s
 
 0 errors ✔ | 0 warnings ✔ | 0 notes ✔
 
-── future 1.32.0-9115: OK
+── future 1.33.1: OK
 
-  Build ID:   future_1.32.0-9115.tar.gz-fa49907794cd48558b6d7a111fa544ee
+  Build ID:   future_1.33.1.tar.gz-121079216c7b4f02a6ae2aceb1c2ba0b
   Platform:   Windows Server 2022, R-release, 32/64 bit
-  Submitted:  14m 32.1s ago
-  Build time: 7m 17.7s
+  Submitted:  45m 55.3s ago
+  Build time: 6m 57.4s
 
 0 errors ✔ | 0 warnings ✔ | 0 notes ✔
 ```

inst/WORDLIST

@@ -488,3 +488,5 @@ XMLInternalNode
 xmlParse
 xmlSerializeHook
 xyz
+adam
+pred