Merge branch 'release/0.8.2'

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

@@ -22,19 +22,19 @@ jobs:
           - {os: macOS-latest,   r: 'devel'    }
           - {os: macOS-latest,   r: 'release'  }
           - {os: macOS-latest,   r: 'oldrel'   }
-          - {os: ubuntu-20.04,   r: 'devel'    }
-          - {os: ubuntu-20.04,   r: 'release'  }
-          - {os: ubuntu-20.04,   r: 'oldrel'   }
-          - {os: ubuntu-20.04,   r: 'oldrel-1' }
-          - {os: ubuntu-20.04,   r: 'oldrel-2' }
-          - {os: ubuntu-20.04,   r: '3.4'      }
-          - {os: ubuntu-20.04,   r: 'release'  , language: ko,    label: ko    }
-          - {os: ubuntu-20.04,   r: 'release'  , language: zh_CN, label: zh_CN }
-          - {os: ubuntu-20.04,   r: 'release'  , language: zh_TW, label: zh_TW }
+          - {os: ubuntu-22.04,   r: 'devel'    }
+          - {os: ubuntu-22.04,   r: 'release'  }
+          - {os: ubuntu-22.04,   r: 'oldrel'   }
+          - {os: ubuntu-22.04,   r: 'oldrel-1' }
+          - {os: ubuntu-22.04,   r: 'oldrel-2' }
+          - {os: ubuntu-22.04,   r: '3.4'      }
+          - {os: ubuntu-22.04,   r: 'release'  , language: ko,    label: ko    }
+          - {os: ubuntu-22.04,   r: 'release'  , language: zh_CN, label: zh_CN }
+          - {os: ubuntu-22.04,   r: 'release'  , language: zh_TW, label: zh_TW }
 
     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_CRAN_INCOMING_: false
@@ -102,7 +102,13 @@ jobs:
         shell: Rscript {0}
 
       - name: Check
-        run: rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran", if (.Platform$OS.type == "windows" && getRversion() >= "4.2.0") "--no-multiarch"), check_dir = "check")
+        run: |
+          if (nzchar(Sys.getenv("R_FUTURE_PLAN")) || getRversion() < "3.5.0") Sys.setenv(RCMDCHECK_ERROR_ON = "error")
+          rcmdcheck::rcmdcheck(
+            build_args = if (getRversion() < "3.5.0") "--no-build-vignettes",
+            args = c("--no-manual", "--as-cran", if (.Platform$OS.type == "windows" && getRversion() >= "4.2.0") "--no-multiarch", if (getRversion() < "3.5.0") c("--no-vignettes", "--no-build-vignettes", "--ignore-vignettes")),
+            check_dir = "check"
+          )
         shell: Rscript {0}
 
       - name: Upload check results

.github/workflows/covr.yaml

@@ -8,7 +8,7 @@ jobs:
 
     timeout-minutes: 15
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     name: covr
 
@@ -17,7 +17,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

.github/workflows/future_tests.yaml

@@ -8,7 +8,7 @@ jobs:
 
     timeout-minutes: 15
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     name: future.plan=${{ matrix.future.plan }}
 
@@ -20,7 +20,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

.gitignore

@@ -8,6 +8,7 @@
 .test
 .local
 .make/
+.Rdump/
 *.o
 *.dll
 *.Rout

DESCRIPTION

@@ -1,8 +1,8 @@
 Package: future.callr
-Version: 0.8.1
+Version: 0.8.2
 Depends:
     R (>= 3.4.0),
-    future (>= 1.23.0)
+    future (>= 1.33.0)
 Imports:
     callr (>= 2.0.3)
 Suggests:

Makefile

@@ -1,5 +1,9 @@
 include .make/Makefile
 
+spelling:
+	$(R_SCRIPT) -e "spelling::spell_check_package()"
+	$(R_SCRIPT) -e "spelling::spell_check_files(c('NEWS.md', dir('vignettes', pattern='[.]rsp$$', full.names=TRUE)), ignore=readLines('inst/WORDLIST', warn=FALSE))"
+
 future.tests/%:
 	$(R_SCRIPT) -e "future.tests::check" --args --test-plan=$*
 

NEWS.md

@@ -1,3 +1,11 @@
+# Version 0.8.2 [2023-08-08]
+
+## Bug Fixes
+
+ * If a 'callr' future failed, because the parallel process crashed,
+   the corresponding parallel-worker slot was never released.
+
+
 # Version 0.8.1 [2022-12-13]
 
 ## Bug Fixes

R/CallrFuture-class.R

@@ -337,7 +337,17 @@ await <- local({
     ## Failed?
     if (inherits(result, "error")) {
       msg <- post_mortem_failure(result, future = future)
-      stop(CallrFutureError(msg, future = future))
+      ex <- CallrFutureError(msg, future = future)
+
+      ## Remove future from FutureRegistry?
+      if (!process$is_alive()) {
+        reg <- "workers-callr"
+        if (FutureRegistry(reg, action = "contains", future = future)) {
+          FutureRegistry(reg, action = "remove", future = future)
+        }
+      }
+
+      stop(ex)
     }
 
     if (debug) mdebugf("- callr:::get_result() ... done (after %d attempts)", ii)

cran-comments.md

@@ -1,8 +1,8 @@
-# CRAN submission future.callr 0.8.1
+# CRAN submission future.callr 0.8.2
 
-on 2022-12-13
+on 2023-08-08
 
-I've verified this submission has no negative impact on any of the 9 reverse package dependencies available on CRAN.
+I've verified this submission has no negative impact on any of the 11 reverse package dependencies available on CRAN.
 
 Thank you
 
@@ -13,14 +13,13 @@ Thank you
 
 The package has been verified using `R CMD check --as-cran` on:
 
-| R version | GitHub | R-hub  | mac/win-builder |
-| --------- | ------ | ------ | --------------- |
-| 3.4.x     | L      |        |                 |
-| 3.6.x     | L      |        |                 |
-| 4.0.x     | L      |        |                 |
-| 4.1.x     | L M W  |   M    |                 |
-| 4.2.x     | L M W  | L   W  | M1 W            |
-| devel     | L M W  | L      | M1 W            |
+| R version | GitHub | R-hub | mac/win-builder |
+| --------- | ------ | ----- | --------------- |
+| 3.4.x     | L      |       |                 |
+| 4.1.x     | L      |       |                 |
+| 4.2.x     | L M W  |       |                 |
+| 4.3.x     | L M W  | L   W | M1 W            |
+| devel     | L M W  | L     |    W            |
 
 *Legend: OS: L = Linux, M = macOS, M1 = macOS M1, W = Windows*
 
@@ -32,7 +31,6 @@ res <- rhub::check(platforms = c(
   "debian-clang-devel", 
   "debian-gcc-patched", 
   "fedora-gcc-devel",
-  "macos-highsierra-release-cran",
   "windows-x86_64-release"
 ))
 print(res)
@@ -41,52 +39,39 @@ print(res)
 gives
 
 ```
-── future.callr 0.8.1: OK
+── future.callr 0.8.2: OK
 
-  Build ID:   future.callr_0.8.1.tar.gz-dd9c44c07f1e4cbdbb0d2622e33e40e7
+  Build ID:   future.callr_0.8.2.tar.gz-396ca0f09101434389b3c2a7851cf000
   Platform:   Debian Linux, R-devel, clang, ISO-8859-15 locale
-  Submitted:  28m 18.4s ago
-  Build time: 28m 11.1s
+  Submitted:  58m 9.4s ago
+  Build time: 16m 58s
 
 0 errors ✔ | 0 warnings ✔ | 0 notes ✔
 
-── future.callr 0.8.1: OK
+── future.callr 0.8.2: OK
 
-  Build ID:   future.callr_0.8.1.tar.gz-735855501ba64658986f26d86fdc656b
+  Build ID:   future.callr_0.8.2.tar.gz-26abe8dadde4400b8e33f55e69ad3fe6
   Platform:   Debian Linux, R-patched, GCC
-  Submitted:  28m 18.5s ago
-  Build time: 25m 44.2s
+  Submitted:  58m 9.4s ago
+  Build time: 15m 51s
 
 0 errors ✔ | 0 warnings ✔ | 0 notes ✔
 
-── future.callr 0.8.1: OK
+── future.callr 0.8.2: OK
 
-  Build ID:   future.callr_0.8.1.tar.gz-766d6c03b3fd428782308da41a4fd56d
+  Build ID:   future.callr_0.8.2.tar.gz-1943b15e261248aa98a0351725da69e9
   Platform:   Fedora Linux, R-devel, GCC
-  Submitted:  28m 18.5s ago
-  Build time: 17m 45s
+  Submitted:  58m 9.4s ago
+  Build time: 13m 31.5s
 
 0 errors ✔ | 0 warnings ✔ | 0 notes ✔
 
-── future.callr 0.8.1: WARNING
+── future.callr 0.8.2: OK
 
-  Build ID:   future.callr_0.8.1.tar.gz-77ecce449c554f8784ef7f0984874d44
-  Platform:   macOS 10.13.6 High Sierra, R-release, CRAN's setup
-  Submitted:  28m 18.5s ago
-  Build time: 3m 53.2s
-
-❯ checking whether package ‘future.callr’ can be installed ... WARNING
-  Found the following significant warnings:
-  Warning: package ‘future’ was built under R version 4.1.2
-
-0 errors ✔ | 1 warning ✖ | 0 notes ✔
-
-── future.callr 0.8.1: OK
-
-  Build ID:   future.callr_0.8.1.tar.gz-28b347cb1e30480697adeeecf9865299
+  Build ID:   future.callr_0.8.2.tar.gz-b005cd8ef97048d99e02318d5d630371
   Platform:   Windows Server 2022, R-release, 32/64 bit
-  Submitted:  28m 18.5s ago
-  Build time: 3m 7.7s
+  Submitted:  58m 9.4s ago
+  Build time: 4m 36.6s
 
 0 errors ✔ | 0 warnings ✔ | 0 notes ✔
 ```

inst/CITATION

@@ -1,11 +1,11 @@
-citHeader("Please cite 'future' and the future framework using the following references:")
+utils::bibentry(
+  header = "Please cite 'future' and the future framework using the following references:",
 
-citEntry(
   # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
   # BibTeX entry:
   # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  bibtype = "article",
   key = "RJ-2021-048",
-  entry = "article",
   author = "Henrik Bengtsson",
   title = "A Unifying Framework for Parallel and Distributed Processing in R using Futures",
   year = "2021",
@@ -19,7 +19,7 @@ citEntry(
   # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
   # Plain-text citation:
   # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-  textVersion = paste(sep="",
+  textVersion = paste0(
     "Henrik Bengtsson, ",
     "A Unifying Framework for Parallel and Distributed Processing in R using Futures, ",
     "The R Journal (2021) 13:2, pages 208-227, ",

inst/WORDLIST

@@ -1,24 +1,42 @@
 AppVeyor
+Bengtsson
+CMD
+CallrFuture
+CallrFutureError
+FutureError
+FutureResult
+Globals
+HPC
+HenrikBengtsson
+availableCores
 benchmarking
 callr
-CallrFuture
-CMD
+cran
 doFuture
 finalizers
-FutureResult
+github
 globals
-Globals
+halfCores
+https
 macOS
+mandelbrot
+mc
+md
 multiprocess
 multisession
-pre
-Pre
-th
-md
-FutureError
-availableCores
-CallrFutureError
-halfCores
 nbrOfFreeWorkers
+pre
 processx
 stderr
+th
+reproducibility
+rsp
+SOCKcluster
+stackoverflow
+Sys
+VignetteAuthor
+VignetteEngine
+VignetteIndexEntry
+VignetteKeyword
+VignetteTangle
+Wishlist

pkgdown/_pkgdown.yml

@@ -6,21 +6,19 @@ home:
     href: https://github.com/HenrikBengtsson/future.callr/milestones
   - text: The Futureverse Project
     href: https://www.futureverse.org/
-  - text: Futureverse User Forum (new!)
+  - text: Futureverse User Forum
     href: https://github.com/HenrikBengtsson/future/discussions
 
 navbar:
   structure:
     right: [futureverse, pkgs, cran, github]
   components:
     futureverse:
-      icon: fas fa-fast-backward
+      icon: fas fa-home
       href: https://www.futureverse.org/
     pkgs:
       text: Packages
       menu:
-      - text: BiocParallel.FutureParam 
-        href: https://BiocParallel.FutureParam.futureverse.org
       - text: doFuture 
         href: https://doFuture.futureverse.org
       - text: furrr 
@@ -43,6 +41,12 @@ navbar:
         href: https://parallelly.futureverse.org
       - text: progressr 
         href: https://progressr.futureverse.org
+      - text: BiocParallel.FutureParam (experimental)
+        href: https://BiocParallel.FutureParam.futureverse.org
+      - text: future.tools (experimental)
+        href: https://future.tools.futureverse.org
+      - text: future.mirai (experimental)
+        href: https://future.mirai.futureverse.org
       - text: future.mapreduce (experimental)
         href: https://future.mapreduce.futureverse.org
       - text: marshal (experimental)

pkgdown/_pkgdown.yml.rsp

@@ -1,6 +1,6 @@
 <%
-pkgs <- c("globals", "listenv", "parallelly", "future", "future.apply", "furrr", "future.tests", "future.callr", "future.batchtools", "doFuture", "progressr", "BiocParallel.FutureParam")
-pkgs_extra <- c("future.mapreduce", "marshal")
+pkgs <- c("globals", "listenv", "parallelly", "future", "future.apply", "furrr", "future.tests", "future.callr", "future.batchtools", "doFuture", "progressr")
+pkgs_extra <- c("BiocParallel.FutureParam", "future.tools", "future.mirai", "future.mapreduce", "marshal")
 pkgs <- c(sort(pkgs), pkgs_extra)
 urls <- sprintf("https://%s.futureverse.org", pkgs)
 names(urls) <- pkgs
@@ -19,15 +19,15 @@ home:
     href: https://github.com/HenrikBengtsson/<%= pkg %>/milestones
   - text: The Futureverse Project
     href: https://www.futureverse.org/
-  - text: Futureverse User Forum (new!)
+  - text: Futureverse User Forum
     href: https://github.com/HenrikBengtsson/future/discussions
 
 navbar:
   structure:
     right: [futureverse, pkgs, cran, github]
   components:
     futureverse:
-      icon: fas fa-fast-backward
+      icon: fas fa-home
       href: https://www.futureverse.org/
     pkgs:
       text: Packages