Repo moved to 'futureverse' org

HenrikBengtsson · HenrikBengtsson · commit b6aa55857427 · 2025-02-07T23:50:23.000-08:00
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -6,7 +6,7 @@ labels: ''
 assignees: ''
 
 ---
-(Please use <https://github.com/HenrikBengtsson/future/discussions> for Q&A)
+(Please use <https://github.com/futureverse/future/discussions> for Q&A)
 
 **Describe the bug**
 A clear and concise description of what the bug is.  
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -6,7 +6,7 @@ labels: ''
 assignees: ''
 
 ---
-(Please use <https://github.com/HenrikBengtsson/future/discussions> for Q&A)
+(Please use <https://github.com/futureverse/future/discussions> for Q&A)
 
 **Wish or feature request**
 A clear and concise description of what the problem is. For example, I would like to be able to ...
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,8 +1,8 @@
 
 # Contributing to the 'future.batchtools' package
 
-This Git repository uses the [Git Flow](https://nvie.com/posts/a-successful-git-branching-model/) branching model (the [`git flow`](https://github.com/petervanderdoes/gitflow-avh) extension is useful for this).  The [`develop`](https://github.com/HenrikBengtsson/future.batchtools/tree/develop) branch contains the latest contributions and other code that will appear in the next release, and the [`master`](https://github.com/HenrikBengtsson/future.batchtools) branch contains the code of the latest release, which is exactly what is currently on [CRAN](https://cran.r-project.org/package=future.batchtools).
+This Git repository uses the [Git Flow](https://nvie.com/posts/a-successful-git-branching-model/) branching model (the [`git flow`](https://github.com/petervanderdoes/gitflow-avh) extension is useful for this).  The [`develop`](https://github.com/futureverse/future.batchtools/tree/develop) branch contains the latest contributions and other code that will appear in the next release, and the [`master`](https://github.com/futureverse/future.batchtools) branch contains the code of the latest release, which is exactly what is currently on [CRAN](https://cran.r-project.org/package=future.batchtools).
 
-Contributing to this package is easy.  Just send a [pull request](https://help.github.com/articles/using-pull-requests/).  When you send your PR, make sure `develop` is the destination branch on the [future.batchtools repository](https://github.com/HenrikBengtsson/future.batchtools).  Your PR should pass `R CMD check --as-cran`, which will also be checked by  <a href="https://github.com/HenrikBengtsson/future.batchtools/actions?query=workflow%3AR-CMD-check">GitHub Actions</a> and  when the PR is submitted.
+Contributing to this package is easy.  Just send a [pull request](https://help.github.com/articles/using-pull-requests/).  When you send your PR, make sure `develop` is the destination branch on the [future.batchtools repository](https://github.com/futureverse/future.batchtools).  Your PR should pass `R CMD check --as-cran`, which will also be checked by  <a href="https://github.com/futureverse/future.batchtools/actions?query=workflow%3AR-CMD-check">GitHub Actions</a> and  when the PR is submitted.
 
 We abide to the [Code of Conduct](https://www.contributor-covenant.org/version/2/0/code_of_conduct/) of Contributor Covenant.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,5 +1,5 @@
 Package: future.batchtools
-Version: 0.12.1-9000
+Version: 0.12.1-9002
 Depends:
     R (>= 3.2.0),
     parallelly,
@@ -20,7 +20,7 @@ Authors@R: c(person("Henrik", "Bengtsson",
                     role = c("aut", "cre", "cph"),
                     email = "henrikb@braju.com",
                     comment = c(ORCID = "0000-0002-7579-5165")))
-Description: Implementation of the Future API on top of the 'batchtools' package.
+Description: Implementation of the Future API <doi:10.32614/RJ-2021-048> on top of the 'batchtools' package.
     This allows you to process futures, as defined by the 'future' package,
     in parallel out of the box, not only on your local machine or ad-hoc
     cluster of machines, but also via high-performance compute ('HPC') job
@@ -30,5 +30,5 @@ License: LGPL (>= 2.1)
 LazyLoad: TRUE
 URL: https://future.batchtools.futureverse.org, https://github.com/HenrikBengtsson/future.batchtools
 BugReports: https://github.com/HenrikBengtsson/future.batchtools/issues
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.2
 Roxygen: list(markdown = TRUE)
diff --git a/R/BatchtoolsFuture-class.R b/R/BatchtoolsFuture-class.R
@@ -543,7 +543,7 @@ run.BatchtoolsFuture <- function(future, ...) {
     ## batchtools which incorrectly tries to parse it.  By unsetting all DYLD_*
     ## environment variables, we avoid this message.  For more info, see:
     ## * https://github.com/tudo-r/BatchJobs/issues/117
-    ## * https://github.com/HenrikBengtsson/future.BatchJobs/issues/59
+    ## * https://github.com/futureverse/future.BatchJobs/issues/59
     ## /HB 2016-05-07
     dyld_envs <- tryCatch({
       envs <- list()
@@ -696,7 +696,7 @@ await <- function(future, cleanup = TRUE,
   }
 
   if (length(prototype_fields) > 0) {
-    result$PROTOTYPE_WARNING <- sprintf("WARNING: The fields %s should be considered internal and experimental for now, that is, until the Future API for these additional features has been settled. For more information, please see https://github.com/HenrikBengtsson/future/issues/172", hpaste(sQuote(prototype_fields), max_head = Inf, collapse = ", ", last_collapse  = " and "))
+    result$PROTOTYPE_WARNING <- sprintf("WARNING: The fields %s should be considered internal and experimental for now, that is, until the Future API for these additional features has been settled. For more information, please see https://github.com/futureverse/future/issues/172", hpaste(sQuote(prototype_fields), max_head = Inf, collapse = ", ", last_collapse  = " and "))
   }
   
   ## Cleanup?
diff --git a/R/future.batchtools-package.R b/R/future.batchtools-package.R
@@ -18,7 +18,6 @@
 #' demo("mandelbrot", package = "future", ask = FALSE)
 #' }
 #'
-#' @docType package
 #' @name future.batchtools
 #' @aliases future.batchtools-package
-NULL
+"_PACKAGE"
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 
 
 <div id="badges"><!-- pkgdown markup -->
-<a href="https://CRAN.R-project.org/web/checks/check_results_future.batchtools.html"><img border="0" src="https://www.r-pkg.org/badges/version/future.batchtools" alt="CRAN check status"/></a> <a href="https://github.com/HenrikBengtsson/future.batchtools/actions?query=workflow%3AR-CMD-check"><img border="0" src="https://github.com/HenrikBengtsson/future.batchtools/actions/workflows/R-CMD-check.yaml/badge.svg?branch=develop" alt="R CMD check status"/></a>  <a href="https://github.com/HenrikBengtsson/future.batchtools/actions?query=workflow%3Afuture_tests"><img border="0" src="https://github.com/HenrikBengtsson/future.batchtools/actions/workflows/future_tests.yaml/badge.svg?branch=develop" alt="future.tests checks status"/></a>   <a href="https://app.codecov.io/gh/HenrikBengtsson/future.batchtools"><img border="0" src="https://codecov.io/gh/HenrikBengtsson/future.batchtools/branch/develop/graph/badge.svg" alt="Coverage Status"/></a> 
+<a href="https://CRAN.R-project.org/web/checks/check_results_future.batchtools.html"><img border="0" src="https://www.r-pkg.org/badges/version/future.batchtools" alt="CRAN check status"/></a> <a href="https://github.com/futureverse/future.batchtools/actions?query=workflow%3AR-CMD-check"><img border="0" src="https://github.com/futureverse/future.batchtools/actions/workflows/R-CMD-check.yaml/badge.svg?branch=develop" alt="R CMD check status"/></a>  <a href="https://github.com/futureverse/future.batchtools/actions?query=workflow%3Afuture_tests"><img border="0" src="https://github.com/futureverse/future.batchtools/actions/workflows/future_tests.yaml/badge.svg?branch=develop" alt="future.tests checks status"/></a>   <a href="https://app.codecov.io/gh/futureverse/future.batchtools"><img border="0" src="https://codecov.io/gh/futureverse/future.batchtools/branch/develop/graph/badge.svg" alt="Coverage Status"/></a> 
 </div>
 
 # future.batchtools: A Future API for Parallel and Distributed Processing using 'batchtools' 
@@ -255,7 +255,7 @@ install.packages("future.batchtools")
 
 To install the pre-release version that is available in Git branch `develop` on GitHub, use:
 ```r
-remotes::install_github("HenrikBengtsson/future.batchtools", ref="develop")
+remotes::install_github("futureverse/future.batchtools", ref="develop")
 ```
 This will install the package from source.  
 
diff --git a/man/future.batchtools.Rd b/man/future.batchtools.Rd
diff --git a/pkgdown/_pkgdown.yml b/pkgdown/_pkgdown.yml
@@ -19,18 +19,20 @@ navbar:
     pkgs:
       text: Packages
       menu:
-      - text: doFuture 
+      - text: doFuture (map-reduce)
         href: https://doFuture.futureverse.org
-      - text: furrr 
+      - text: furrr (map-reduce)
         href: https://furrr.futureverse.org
       - text: future 
         href: https://future.futureverse.org
-      - text: future.apply 
+      - text: future.apply (map-reduce)
         href: https://future.apply.futureverse.org
-      - text: future.batchtools 
+      - text: future.batchtools (backend)
         href: https://future.batchtools.futureverse.org
-      - text: future.callr 
+      - text: future.callr (backend)
         href: https://future.callr.futureverse.org
+      - text: future.mirai (backend)
+        href: https://future.mirai.futureverse.org
       - text: future.tests 
         href: https://future.tests.futureverse.org
       - text: globals 
@@ -45,8 +47,6 @@ navbar:
         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,8 @@
 <%
-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_mapreduce <- c("future.apply", "doFuture", "furrr")
+pkgs_backend <- c("future.batchtools", "future.callr", "future.mirai")
+pkgs <- c("globals", "listenv", "parallelly", "future", "future.tests", "progressr", pkgs_mapreduce, pkgs_backend)
+pkgs_extra <- c("BiocParallel.FutureParam", "future.tools", "future.mapreduce", "marshal")
 pkgs <- c(sort(pkgs), pkgs_extra)
 urls <- sprintf("https://%s.futureverse.org", pkgs)
 names(urls) <- pkgs
@@ -16,11 +18,11 @@ 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
-    href: https://github.com/HenrikBengtsson/future/discussions
+    href: https://github.com/futureverse/future/discussions
 
 navbar:
   structure:
@@ -33,7 +35,7 @@ navbar:
       text: Packages
       menu:
 <% for (name in names(urls)) { %>
-      - text: <%= name %> <% if (name %in% pkgs_extra) { %>(experimental)<% } %>
+      - text: <%= name %> <% if (name %in% pkgs_extra) { %>(experimental)<% } else if (name %in% pkgs_backend) { %>(backend)<% } else if (name %in% pkgs_mapreduce) { %>(map-reduce)<% } %>
         href: <%= urls[name] %>
 <% } %>
     cran:
