Skip to content

Commit

Permalink
Migrated 'future' repo to 'futureverse' org
Browse files Browse the repository at this point in the history
  • Loading branch information
HenrikBengtsson committed Nov 12, 2024
1 parent a11e239 commit e33ec61
Show file tree
Hide file tree
Showing 27 changed files with 91 additions and 111 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ labels: 'bug'
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**
Expand Down
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
lank_issues_enabled: true
contact_links:
- name: Support & Discussions
url: https://github.com/HenrikBengtsson/future/discussions/
url: https://github.com/futureverse/future/discussions/
about: Got a question? Something is not working? Want to share an idea?
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/feature_request.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ labels: 'feature request'
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**

Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,6 @@ jobs:
_R_COMPARE_LANG_OBJECTS: eqonly
## R CMD check
_R_CHECK_CRAN_INCOMING_: false
_R_CHECK_LENGTH_1_CONDITION_: true
_R_CHECK_LENGTH_1_LOGIC2_: true
_R_CHECK_MATRIX_DATA_: true
_R_CHECK_SUGGESTS_ONLY_: true
_R_CHECK_THINGS_IN_TEMP_DIR_: true
Expand Down
74 changes: 0 additions & 74 deletions .github/workflows/covr.yaml

This file was deleted.

56 changes: 56 additions & 0 deletions .github/workflows/test-coverage.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
on: [push]

name: test-coverage.yaml

permissions: read-all

jobs:
test-coverage:
runs-on: ubuntu-latest
env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}

steps:
- uses: actions/checkout@v4

- name: Assert CODECOV_TOKEN is set
run: |
if [[ -z "${{secrets.CODECOV_TOKEN}}" ]]; then
>&2 echo "::error::ERROR: 'secrets.CODECOV_TOKEN' not set"
exit 1
fi
- uses: r-lib/actions/setup-r@v2
with:
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v2
with:
extra-packages: any::covr, any::xml2
needs: coverage

- name: Test coverage
run: |
cov <- covr::package_coverage(
quiet = FALSE,
clean = FALSE,
install_path = file.path(normalizePath(Sys.getenv("RUNNER_TEMP"), winslash = "/"), "package")
)
print(cov)
covr::to_cobertura(cov)
shell: Rscript {0}

- uses: codecov/codecov-action@v4
with:
fail_ci_if_error: ${{ github.event_name != 'pull_request' && true || false }}
file: ./cobertura.xml
plugin: noop
disable_search: true
token: ${{ secrets.CODECOV_TOKEN }}

- name: Upload test results
if: failure()
uses: actions/upload-artifact@v4
with:
name: coverage-test-failures
path: ${{ runner.temp }}/package
4 changes: 2 additions & 2 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@

# Contributing to the 'future' 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/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) branch contains the code of the latest release, which is exactly what is currently on [CRAN](https://cran.r-project.org/package=future).
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/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) branch contains the code of the latest release, which is exactly what is currently on [CRAN](https://cran.r-project.org/package=future).

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 repository](https://github.com/HenrikBengtsson/future). Your PR should pass `R CMD check --as-cran`, which will also be checked by <a href="https://github.com/HenrikBengtsson/future/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 repository](https://github.com/futureverse/future). Your PR should pass `R CMD check --as-cran`, which will also be checked by <a href="https://github.com/futureverse/future/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.
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ Description: The purpose of this package is to provide a lightweight and
License: LGPL (>= 2.1)
LazyLoad: TRUE
ByteCompile: TRUE
URL: https://future.futureverse.org, https://github.com/HenrikBengtsson/future
BugReports: https://github.com/HenrikBengtsson/future/issues
URL: https://future.futureverse.org, https://github.com/futureverse/future
BugReports: https://github.com/futureverse/future/issues
Encoding: UTF-8
RoxygenNote: 7.3.2
Roxygen: list(markdown = TRUE)
2 changes: 1 addition & 1 deletion R/Future-class.R
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,7 @@ resolved.Future <- function(x, run = TRUE, ...) {
#' Currently it is not possible to specify what type of nested
#' futures to be used, meaning the above default will always be
#' used.
#' See \href{https://github.com/HenrikBengtsson/future/issues/37}{Issue #37}
#' See \href{https://github.com/futureverse/future/issues/37}{Issue #37}
#' for plans on adding support for custom nested future types.
#'
#' (*) Ideally we would set `mc.cores = 0` but that will unfortunately
Expand Down
2 changes: 1 addition & 1 deletion R/MulticoreFuture-class.R
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ result.MulticoreFuture <- function(future, ...) {
## SPECIAL: Check for fallback 'fatal error in wrapper code'
## try-error from parallel:::mcparallel(). If detected, then
## turn into an error with a more informative error message, cf.
## https://github.com/HenrikBengtsson/future/issues/35
## https://github.com/futureverse/future/issues/35
if (is.null(result) || identical(result, structure("fatal error in wrapper code", class = "try-error"))) {
label <- future$label
if (is.null(label)) label <- "<none>"
Expand Down
4 changes: 2 additions & 2 deletions R/expressions.R
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ makeExpression <- local({
## WORKAROUND: Do not reset 'nwarnings' unless changed, because
## that will, as documented, trigger any warnings collected
## internally to be removed.
## https://github.com/HenrikBengtsson/future/issues/645
## https://github.com/futureverse/future/issues/645
if (identical(getOption("nwarnings"), ...future.oldOptions$nwarnings)) {
...future.oldOptions$nwarnings <- NULL
}
Expand All @@ -37,7 +37,7 @@ makeExpression <- local({
## on package load/attach. For this reason, I'll relax the
## resetting of R options to only be done to preexisting R options
## for now. These thoughts were triggered by a related data.table
## issue, cf. https://github.com/HenrikBengtsson/future/issues/609
## issue, cf. https://github.com/futureverse/future/issues/609
## /HB 2022-04-29

## (b) Remove any options added
Expand Down
2 changes: 1 addition & 1 deletion R/globals.R
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ getGlobalsAndPackages <- function(expr, envir = parent.frame(), tweak = tweakExp
names(globals) <- names

## AD HOC: Drop duplicated 'future.call.arguments' elements, cf.
## https://github.com/HenrikBengtsson/future/issues/417.
## https://github.com/futureverse/future/issues/417.
## The reason for duplicates being possible, is that '...' is renamed
## to 'future.call.arguments' so the former won't override the latter.
## This might have to be fixed in future.apply and furrr. /HB 2020-09-21
Expand Down
2 changes: 1 addition & 1 deletion R/options.R
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ update_package_options <- function(debug = FALSE) {
update_package_option("future.wait.alpha", mode = "numeric", debug = debug)

## Prototyping in future 1.22.0:
## https://github.com/HenrikBengtsson/future/issues/515
## https://github.com/futureverse/future/issues/515
update_package_option("future.assign_globals.exclude", split = ",", debug = debug)

## Prototyping in future 1.23.0:
Expand Down
12 changes: 6 additions & 6 deletions R/utils.R
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ inherits_from_namespace <- function(env) {
## Assign globals to an specific environment and set that environment
## for functions. If they are functions of namespaces/packages
## and exclude == "namespace", then the globals are not assigned
## Reference: https://github.com/HenrikBengtsson/future/issues/515
## Reference: https://github.com/futureverse/future/issues/515
assign_globals <- function(envir, globals, exclude = getOption("future.assign_globals.exclude", c("namespace")), debug = getOption("future.debug", FALSE)) {
stop_if_not(is.environment(envir), is.list(globals))
if (length(globals) == 0L) return(envir)
Expand Down Expand Up @@ -162,9 +162,9 @@ assign_globals <- function(envir, globals, exclude = getOption("future.assign_gl
## it's environment needs to be reassigned to the 'envir'
## environment.
## Related to:
## * https://github.com/HenrikBengtsson/future/issues/475
## * https://github.com/HenrikBengtsson/future/issues/515
## * https://github.com/HenrikBengtsson/future/issues/608
## * https://github.com/futureverse/future/issues/475
## * https://github.com/futureverse/future/issues/515
## * https://github.com/futureverse/future/issues/608
if (identical(w, emptyenv())) {
environment(global) <- envir
if (debug) mdebugf("- reassign environment for %s", sQuote(name))
Expand Down Expand Up @@ -381,7 +381,7 @@ nullcon <- local({
})


## https://github.com/HenrikBengtsson/future/issues/130
## https://github.com/futureverse/future/issues/130
#' @importFrom utils packageVersion
resolveMPI <- local({
cache <- list()
Expand Down Expand Up @@ -487,7 +487,7 @@ can_capture_utf8 <- if (.Platform$OS.type == "windows") {
function() TRUE
}

## https://github.com/HenrikBengtsson/future/issues/473
## https://github.com/futureverse/future/issues/473
adhoc_native_to_utf8 <- function(x) {
code <- gsub("<U[+]([[:alnum:]]+)>", "\\\\u\\1", x)
if (identical(code, x)) return(x)
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@


<div id="badges"><!-- pkgdown markup -->
<a href="https://CRAN.R-project.org/web/checks/check_results_future.html"><img border="0" src="https://www.r-pkg.org/badges/version/future" alt="CRAN check status"/></a> <a href="https://github.com/HenrikBengtsson/future/actions?query=workflow%3AR-CMD-check"><img border="0" src="https://github.com/HenrikBengtsson/future/actions/workflows/R-CMD-check.yaml/badge.svg?branch=develop" alt="R CMD check status"/></a> <a href="https://github.com/HenrikBengtsson/future/actions?query=workflow%3Arevdepcheck-top"><img border="0" src="https://github.com/HenrikBengtsson/future/actions/workflows/revdepcheck-top.yaml/badge.svg?branch=develop" alt="Top reverse-dependency checks status"/></a> <a href="https://github.com/HenrikBengtsson/future/actions?query=workflow%3Afuture_tests"><img border="0" src="https://github.com/HenrikBengtsson/future/actions/workflows/future_tests.yaml/badge.svg?branch=develop" alt="future.tests checks status"/></a> <a href="https://app.codecov.io/gh/HenrikBengtsson/future"><img border="0" src="https://codecov.io/gh/HenrikBengtsson/future/branch/develop/graph/badge.svg" alt="Coverage Status"/></a>
<a href="https://CRAN.R-project.org/web/checks/check_results_future.html"><img border="0" src="https://www.r-pkg.org/badges/version/future" alt="CRAN check status"/></a> <a href="https://github.com/futureverse/future/actions?query=workflow%3AR-CMD-check"><img border="0" src="https://github.com/futureverse/future/actions/workflows/R-CMD-check.yaml/badge.svg?branch=develop" alt="R CMD check status"/></a> <a href="https://github.com/futureverse/future/actions?query=workflow%3Arevdepcheck-top"><img border="0" src="https://github.com/futureverse/future/actions/workflows/revdepcheck-top.yaml/badge.svg?branch=develop" alt="Top reverse-dependency checks status"/></a> <a href="https://github.com/futureverse/future/actions?query=workflow%3Afuture_tests"><img border="0" src="https://github.com/futureverse/future/actions/workflows/future_tests.yaml/badge.svg?branch=develop" alt="future.tests checks status"/></a> <a href="https://app.codecov.io/gh/futureverse/future"><img border="0" src="https://codecov.io/gh/futureverse/future/branch/develop/graph/badge.svg" alt="Coverage Status"/></a>
</div>

# future: Unified Parallel and Distributed Processing in R for Everyone <img border="0" src="man/figures/logo.png" alt="The 'future' hexlogo" align="right"/>
Expand Down Expand Up @@ -647,7 +647,7 @@ install.packages("future")

To install the pre-release version that is available in Git branch `develop` on GitHub, use:
```r
remotes::install_github("HenrikBengtsson/future", ref="develop")
remotes::install_github("futureverse/future", ref="develop")
```
This will install the package from source.

Expand Down
6 changes: 3 additions & 3 deletions README_ja.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
_This is a translation of [README.md](https://github.com/HenrikBengtsson/future/blob/develop/README.md) as of [2023-06-17](https://github.com/HenrikBengtsson/future/blob/2a675abff2e3a729e6108d40710d0dcb22cc705b/README.md) done by [hoxo_m](https://github.com/hoxo-m)._
_This is a translation of [README.md](https://github.com/futureverse/future/blob/develop/README.md) as of [2023-06-17](https://github.com/futureverse/future/blob/2a675abff2e3a729e6108d40710d0dcb22cc705b/README.md) done by [hoxo_m](https://github.com/hoxo-m)._

<div id="badges"><!-- pkgdown markup -->
<a href="https://CRAN.R-project.org/web/checks/check_results_future.html"><img border="0" src="https://www.r-pkg.org/badges/version/future" alt="CRAN check status"/></a> <a href="https://github.com/HenrikBengtsson/future/actions?query=workflow%3AR-CMD-check"><img border="0" src="https://github.com/HenrikBengtsson/future/actions/workflows/R-CMD-check.yaml/badge.svg?branch=develop" alt="R CMD check status"/></a> <a href="https://github.com/HenrikBengtsson/future/actions?query=workflow%3Arevdepcheck-top"><img border="0" src="https://github.com/HenrikBengtsson/future/actions/workflows/revdepcheck-top.yaml/badge.svg?branch=develop" alt="Top reverse-dependency checks status"/></a> <a href="https://github.com/HenrikBengtsson/future/actions?query=workflow%3Afuture_tests"><img border="0" src="https://github.com/HenrikBengtsson/future/actions/workflows/future_tests.yaml/badge.svg?branch=develop" alt="future.tests checks status"/></a> <a href="https://app.codecov.io/gh/HenrikBengtsson/future"><img border="0" src="https://codecov.io/gh/HenrikBengtsson/future/branch/develop/graph/badge.svg" alt="Coverage Status"/></a>
<a href="https://CRAN.R-project.org/web/checks/check_results_future.html"><img border="0" src="https://www.r-pkg.org/badges/version/future" alt="CRAN check status"/></a> <a href="https://github.com/futureverse/future/actions?query=workflow%3AR-CMD-check"><img border="0" src="https://github.com/futureverse/future/actions/workflows/R-CMD-check.yaml/badge.svg?branch=develop" alt="R CMD check status"/></a> <a href="https://github.com/futureverse/future/actions?query=workflow%3Arevdepcheck-top"><img border="0" src="https://github.com/futureverse/future/actions/workflows/revdepcheck-top.yaml/badge.svg?branch=develop" alt="Top reverse-dependency checks status"/></a> <a href="https://github.com/futureverse/future/actions?query=workflow%3Afuture_tests"><img border="0" src="https://github.com/futureverse/future/actions/workflows/future_tests.yaml/badge.svg?branch=develop" alt="future.tests checks status"/></a> <a href="https://app.codecov.io/gh/HenrikBengtsson/future"><img border="0" src="https://codecov.io/gh/futureverse/future/branch/develop/graph/badge.svg" alt="Coverage Status"/></a>
</div>

# future: Rにおける統一的な並列分散処理 <img border="0" src="man/figures/logo.png" alt="The 'future' hexlogo" align="right" />
Expand Down Expand Up @@ -1130,7 +1130,7 @@ I am also open to contributions and collaborations of any kind.
このパッケージの目的は、R でフューチャを使うための標準的で統一された API を提供することである。
現状はこの目的を達成するための初期段階にすぎない。
future パッケージを改善するアイデアや意見を持っている人がいたらぜひ教えてほしい。 開発者に連絡をとるには [GitHub
リポジトリ](https://github.com/HenrikBengtsson/future/)経由が好ましいが、どのような手段であっても歓迎する。
リポジトリ](https://github.com/futureverse/future/)経由が好ましいが、どのような手段であっても歓迎する。

## インストール

Expand Down
2 changes: 1 addition & 1 deletion man/getExpression.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tests/cluster.R
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,7 @@ message("Main PID: ", pid2)
stopifnot(pid2 == pid)

message("*** cluster() - exception when re-creating workers ...")
## https://github.com/HenrikBengtsson/future/issues/261
## https://github.com/futureverse/future/issues/261

plan(cluster, workers = "localhost")
f <- future(1)
Expand Down
2 changes: 1 addition & 1 deletion tests/globals,S4methods.R
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ for (strategy in supportedStrategies()) {

## FIXME:
## Just like S3 methods, S4 methods are not picked up
## https://github.com/HenrikBengtsson/future/issues/615
## https://github.com/futureverse/future/issues/615
f <- future({ my_fcn(3) }, lazy = TRUE)
rm(list = "my_fcn")
v <- tryCatch(value(f), error = identity)
Expand Down
Loading

0 comments on commit e33ec61

Please sign in to comment.