diff --git a/.github/workflows/covr.yaml b/.github/workflows/covr.yaml index dd50eeb..81af6c7 100644 --- a/.github/workflows/covr.yaml +++ b/.github/workflows/covr.yaml @@ -67,7 +67,7 @@ jobs: ## https://app.codecov.io/gh///settings ## 2. Set 'CODECOV_TOKEN' in GitHub Secrets: ## https://github.com///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} diff --git a/DESCRIPTION b/DESCRIPTION index 6370051..63c8070 100644 --- a/DESCRIPTION +++ b/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) diff --git a/NEWS.md b/NEWS.md index 03aa2b3..f54f744 100644 --- a/NEWS.md +++ b/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 diff --git a/R/MiraiFuture-class.R b/R/MiraiFuture-class.R index 38fa3cd..c572ae3 100644 --- a/R/MiraiFuture-class.R +++ b/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)) diff --git a/README.md b/README.md index ad3a94c..5973f83 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@
CRAN check status R CMD check status future.tests checks status Coverage Status +order="0" src="https://www.r-pkg.org/badges/version/future.mirai" alt="CRAN check status"/> R CMD check status future.tests checks status Coverage Status
# future.mirai: A Future API for Parallel Processing using 'mirai' @@ -112,7 +112,7 @@ 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. @@ -120,7 +120,7 @@ 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 diff --git a/cran-comments.md b/cran-comments.md index 738091d..164610f 100644 --- a/cran-comments.md +++ b/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 + ## 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* diff --git a/man/future.mirai.Rd b/man/future.mirai.Rd index 5a176b2..b68657f 100644 --- a/man/future.mirai.Rd +++ b/man/future.mirai.Rd @@ -19,8 +19,8 @@ TRUE Useful links: \itemize{ \item \url{https://future.mirai.futureverse.org} - \item \url{https://github.com/HenrikBengtsson/future.mirai} - \item Report bugs at \url{https://github.com/HenrikBengtsson/future.mirai/issues} + \item \url{https://github.com/futureverse/future.mirai} + \item Report bugs at \url{https://github.com/futureverse/future.mirai/issues} } } diff --git a/pkgdown/_pkgdown.yml b/pkgdown/_pkgdown.yml index b62283d..1f56a1b 100644 --- a/pkgdown/_pkgdown.yml +++ b/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 diff --git a/pkgdown/_pkgdown.yml.rsp b/pkgdown/_pkgdown.yml.rsp index fc1792a..fe85ef5 100644 --- a/pkgdown/_pkgdown.yml.rsp +++ b/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 diff --git a/tests/mirai_cluster,worker-termination.R b/tests/mirai_cluster,worker-termination.R index 896a4ca..9e7a3a4 100644 --- a/tests/mirai_cluster,worker-termination.R +++ b/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) }