FIX waitForWorkers() S3 generic and S3 method mismatch (fix #90)

HenrikBengtsson · Aug 8, 2023 · 3f7376f · 3f7376f
1 parent 10b8d48
commit 3f7376f
Show file tree

Hide file tree

Showing 8 changed files with 30 additions and 25 deletions.
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -22,15 +22,15 @@ 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 }}
       R_KEEP_PKG_SOURCE: yes

diff --git a/.github/workflows/covr.yaml b/.github/workflows/covr.yaml
@@ -8,7 +8,7 @@ jobs:
 
     timeout-minutes: 20
 
-    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

diff --git a/.github/workflows/future_tests.yaml b/.github/workflows/future_tests.yaml
@@ -8,7 +8,7 @@ jobs:
 
     timeout-minutes: 30
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     name: future.plan=${{ matrix.future.plan }}
 
@@ -23,7 +23,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

diff --git a/.make/Makefile b/.make/Makefile
@@ -356,12 +356,12 @@ test_files: $(R_OUTDIR)/tests/*.R
 
 test: $(R_OUTDIR)/tests/%.R
 	$(CD) $(R_OUTDIR)/tests;\
-	$(R_SCRIPT) -e "for (f in list.files(pattern='[.]R$$')) { print(f); source(f, chdir=TRUE, echo=TRUE) }"
+	$(R_SCRIPT) -e "for (f in list.files(pattern='[.]R$$')) { print(f); source(f, echo=TRUE) }"
 
 test_full: $(R_OUTDIR)/tests/%.R
 	$(CD) $(R_OUTDIR)/tests;\
 	export _R_CHECK_FULL_=TRUE;\
-	$(R_SCRIPT) -e "for (f in list.files(pattern='[.]R$$')) { print(f); source(f, chdir=TRUE, echo=TRUE) }"
+	$(R_SCRIPT) -e "for (f in list.files(pattern='[.]R$$')) { print(f); source(f, echo=TRUE) }"
 
 
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,5 +1,5 @@
 Package: future.batchtools
-Version: 0.12.0-9001
+Version: 0.12.0-9002
 Depends:
     R (>= 3.2.0),
     parallelly,

diff --git a/R/waitForWorker.R b/R/waitForWorker.R
@@ -44,7 +44,8 @@ waitForWorker.BatchtoolsFuture <- function(future,
          await = NULL,
          timeout = getOption("future.wait.timeout", 30 * 24 * 60 * 60),
          delta = getOption("future.wait.interval", 0.2),
-         alpha = getOption("future.wait.alpha", 1.01)) {
+         alpha = getOption("future.wait.alpha", 1.01),
+         ...) {
   debug <- getOption("future.debug", FALSE)
 
   stop_if_not(is.null(await) || is.function(await))

diff --git a/pkgdown/_pkgdown.yml b/pkgdown/_pkgdown.yml
@@ -6,21 +6,19 @@ home:
     href: https://github.com/HenrikBengtsson/future.batchtools/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)

diff --git a/pkgdown/_pkgdown.yml.rsp b/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