Merge branch 'release/0.2.2'

.github/workflows/covr.yaml

@@ -67,7 +67,7 @@ jobs:
           ##    https://app.codecov.io/gh/<org>/<repo>/settings
           ## 2. Set 'CODECOV_TOKEN' in GitHub Secrets:
           ##    https://github.com/<org>/<repo>/settings/environments/
-          coverage <- covr::package_coverage()
+          coverage <- covr::package_coverage(quiet = FALSE)
           print(coverage)
           covr::codecov(coverage = coverage, token="${{secrets.CODECOV_TOKEN}}")
         shell: Rscript {0}

DESCRIPTION

@@ -1,9 +1,9 @@
 Package: future.mirai
-Version: 0.2.1
+Version: 0.2.2
 Depends:
     future
 Imports:
-    mirai (>= 0.12.1),
+    mirai (>= 1.1.0),
     parallelly,
     utils
 Suggests:
@@ -25,7 +25,7 @@ Authors@R: c(
         ))
 License: GPL (>= 3)
 Encoding: UTF-8
-URL: https://future.mirai.futureverse.org, https://github.com/HenrikBengtsson/future.mirai
-BugReports: https://github.com/HenrikBengtsson/future.mirai/issues
-RoxygenNote: 7.3.1
+URL: https://future.mirai.futureverse.org, https://github.com/futureverse/future.mirai
+BugReports: https://github.com/futureverse/future.mirai/issues
+RoxygenNote: 7.3.2
 Roxygen: list(markdown = TRUE)

NEWS.md

@@ -1,4 +1,12 @@
-# Version (development version)
+# Version 0.2.2
+
+## Miscellaneous
+
+ * Internal updates for **mirai** (>= 1.1.0), e.g. `mirai::daemons()`
+   argument `resilience` is being removed.
+
+
+# Version 0.2.1
 
 ## Bug Fix
 

R/MiraiFuture-class.R

@@ -58,7 +58,7 @@ MiraiFuture <- function(expr = NULL,
       daemons(n = 0L)
     } else if (workers != nworkers) {
       daemons(n = 0L)  ## reset is required
-      daemons(n = workers, dispatcher = dispatcher, resilience = FALSE)
+      daemons(n = workers, dispatcher = dispatcher)
     }
   } else if (!is.null(workers)) {
     stop("Argument 'workers' should be a numeric scalar or NULL: ", mode(workers))

README.md

@@ -1,6 +1,6 @@
 <div id="badges"><!-- pkgdown markup -->
 <a href="https://CRAN.R-project.org/web/checks/check_results_future.mirai.html"><img b
-order="0" src="https://www.r-pkg.org/badges/version/future.mirai" alt="CRAN check status"/></a> <a href="https://github.com/HenrikBengtsson/future.mirai/actions?query=workflow%3AR-CMD-check"><img border="0" src="https://github.com/HenrikBengtsson/future.mirai/actions/workflows/R-CMD-check.yaml/badge.svg?branch=develop" alt="R CMD check status"/></a>  <a href="https://github.com/HenrikBengtsson/future.mirai/actions?query=workflow%3Afuture_tests"><img border="0" src="https://github.com/HenrikBengtsson/future.mirai/actions/workflows/future_tests.yaml/badge.svg?branch=develop" alt="future.tests checks status"/></a>   <a href="https://app.codecov.io/gh/HenrikBengtsson/future.mirai"><img border="0" src="https://codecov.io/gh/HenrikBengtsson/future.mirai/branch/develop/graph/badge.svg" alt="Coverage Status"/></a> 
+order="0" src="https://www.r-pkg.org/badges/version/future.mirai" alt="CRAN check status"/></a> <a href="https://github.com/futureverse/future.mirai/actions?query=workflow%3AR-CMD-check"><img border="0" src="https://github.com/futureverse/future.mirai/actions/workflows/R-CMD-check.yaml/badge.svg?branch=develop" alt="R CMD check status"/></a>  <a href="https://github.com/futureverse/future.mirai/actions?query=workflow%3Afuture_tests"><img border="0" src="https://github.com/futureverse/future.mirai/actions/workflows/future_tests.yaml/badge.svg?branch=develop" alt="future.tests checks status"/></a>   <a href="https://app.codecov.io/gh/futureverse/future.mirai"><img border="0" src="https://codecov.io/gh/futureverse/future.mirai/branch/develop/graph/badge.svg" alt="Coverage Status"/></a> 
 </div>
 
 # future.mirai: A Future API for Parallel Processing using 'mirai' 
@@ -112,15 +112,15 @@ To install the pre-release version that is available in Git branch
 `develop` on GitHub, use:
 
 ```r
-remotes::install_github("HenrikBengtsson/future.mirai", ref="develop")
+remotes::install_github("futureverse/future.mirai", ref="develop")
 ```
 
 This will install the package from source.
 
 
 [mirai]: https://cran.r-project.org/package=mirai
 [future]: https://cran.r-project.org/package=future
-[future.mirai]: https://github.com/HenrikBengtsson/future.mirai
+[future.mirai]: https://cran.r-project.org/package=future.mirai
 [future.apply]: https://cran.r-project.org/package=future.apply
 [furrr]: https://cran.r-project.org/package=furrr
 [doFuture]: https://cran.r-project.org/package=doFuture

cran-comments.md

@@ -1,11 +1,8 @@
-# CRAN submission future.mirai 0.2.1
+# CRAN submission future.mirai 0.2.2
 
-on 2024-05-14
+on 2024-07-03
 
-This submission attempts to fix a check error that occurs sporadically
-and has been reported on the CRAN check servers.
-
-Thanks in advance
+<no comments>
 
 
 ## Notes not sent to CRAN
@@ -19,7 +16,7 @@ The package has been verified using `R CMD check --as-cran` on:
 | 3.6.x     | L      |                 |
 | 4.2.x     | L   W  |                 |
 | 4.3.x     | L M W  |    W            |
-| 4.4.x     |        | M1 W            |
+| 4.4.x     |        | .  W            |
 | devel     | L M W  |    W            |
 
 *Legend: OS: L = Linux, M = macOS, M1 = macOS M1, W = Windows*

pkgdown/_pkgdown.yml

@@ -3,7 +3,7 @@ url: https://future.mirai.futureverse.org
 home:
   links:
   - text: Roadmap/Milestones
-    href: https://github.com/HenrikBengtsson/future.mirai/milestones
+    href: https://github.com/futureverse/future.mirai/milestones
   - text: The Futureverse Project
     href: https://www.futureverse.org/
   - text: Futureverse User Forum

pkgdown/_pkgdown.yml.rsp

@@ -18,7 +18,7 @@ url: https://<%= pkg %>.futureverse.org
 home:
   links:
   - text: Roadmap/Milestones
-    href: https://github.com/HenrikBengtsson/<%= pkg %>/milestones
+    href: https://github.com/<%= gsub("(^.*:|[.]git$)", "", subset(gert::git_remote_list(), name == "origin")$url) %>/milestones
   - text: The Futureverse Project
     href: https://www.futureverse.org/
   - text: Futureverse User Forum

tests/mirai_cluster,worker-termination.R

@@ -25,8 +25,17 @@ if (.Platform$OS.type != "windows") {
   ## cf. https://github.com/HenrikBengtsson/future.mirai/issues/7
   nworkers <- tryCatch(nbrOfWorkers(), error = identity)
   print(nworkers)
+
+  ## If a valid result, then validate the value
   if (!inherits(nworkers, "error")) {
     message("Number of workers: ", nworkers)
+    message("Expected number of workers: ", all - 1L)
+    count <- 0L
+    while (nworkers != all - 1L && count < 5L) {
+      Sys.sleep(1.0)
+      nworkers <- tryCatch(nbrOfWorkers(), error = identity)
+      message("Number of workers: ", nworkers)
+    }
     stopifnot(nworkers == all - 1L)
   }