Skip to content

Commit 6531673

Browse files
HenrikBengtssonHenrikBengtsson
committed
Merge branch 'release/0.12.2'
2 parents 60bd477 + bda01fb commit 6531673

33 files changed

+477
-391
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ labels: ''
66
assignees: ''
77

88
---
9-
(Please use <https://github.com/HenrikBengtsson/future/discussions> for Q&A)
9+
(Please use <https://github.com/futureverse/future/discussions> for Q&A)
1010

1111
**Describe the bug**
1212
A clear and concise description of what the bug is.

‎.github/ISSUE_TEMPLATE/feature_request.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ labels: ''
66
assignees: ''
77

88
---
9-
(Please use <https://github.com/HenrikBengtsson/future/discussions> for Q&A)
9+
(Please use <https://github.com/futureverse/future/discussions> for Q&A)
1010

1111
**Wish or feature request**
1212
A clear and concise description of what the problem is. For example, I would like to be able to ...

‎.github/workflows/R-CMD-check.yaml‎

Lines changed: 33 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,32 +19,35 @@ jobs:
1919
- {os: windows-latest, r: 'devel' }
2020
- {os: windows-latest, r: 'release' }
2121
- {os: windows-latest, r: 'oldrel' }
22-
- {os: macOS-latest, r: 'devel' }
22+
# - {os: macOS-latest, r: 'devel' }
2323
- {os: macOS-latest, r: 'release' }
2424
- {os: macOS-latest, r: 'oldrel' }
25-
- {os: ubuntu-22.04, r: 'devel' }
26-
- {os: ubuntu-22.04, r: 'release' }
27-
- {os: ubuntu-22.04, r: 'oldrel' }
28-
- {os: ubuntu-22.04, r: 'oldrel-1' }
29-
- {os: ubuntu-22.04, r: 'oldrel-2' }
30-
- {os: ubuntu-22.04, r: '3.6' }
31-
- {os: ubuntu-22.04, r: 'release' , language: ko, label: ko }
32-
- {os: ubuntu-22.04, r: 'release' , language: zh_CN, label: zh_CN }
33-
- {os: ubuntu-22.04, r: 'release' , language: zh_TW, label: zh_TW }
25+
- {os: ubuntu-latest, r: 'devel' }
26+
- {os: ubuntu-latest, r: 'release' }
27+
- {os: ubuntu-latest, r: 'oldrel' }
28+
- {os: ubuntu-latest, r: 'oldrel-1' }
29+
- {os: ubuntu-latest, r: 'oldrel-2' }
30+
- {os: ubuntu-latest, r: '3.6' }
31+
- {os: ubuntu-latest, r: 'release' , language: ko, label: ko }
32+
- {os: ubuntu-latest, r: 'release', future_version: develop, label: 'w/ future-develop' }
33+
- {os: ubuntu-latest, r: 'release', future_version: feature/evalFuture-3, label: 'w/ future-feature/evalFuture-3' }
34+
3435
env:
3536
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
3637
R_KEEP_PKG_SOURCE: yes
3738
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
39+
## Test in other locale (optional)
40+
LANGUAGE: ${{ matrix.config.language }}
3841
## R CMD check
3942
_R_CHECK_CRAN_INCOMING_: false
40-
_R_CHECK_LENGTH_1_CONDITION_: true
41-
_R_CHECK_LENGTH_1_LOGIC2_: true
4243
_R_CHECK_MATRIX_DATA_: true
4344
_R_CHECK_SUGGESTS_ONLY_: true
4445
_R_CHECK_THINGS_IN_TEMP_DIR_: true
46+
## Specific to 'rcmdcheck'
4547
RCMDCHECK_ERROR_ON: note
46-
## Test in other locale (optional)
47-
LANGUAGE: ${{ matrix.config.language }}
48+
## Specific to futures
49+
R_FUTURE_RNG_ONMISUSE: error
50+
R_FUTURE_VERSION: ${{ matrix.config.future_version }}
4851

4952
steps:
5053
- uses: actions/checkout@v4
@@ -64,14 +67,25 @@ jobs:
6467

6568
- name: Install package itself (special case)
6669
run: |
67-
install.packages(".", repos = NULL, type = "source") ## self vignette engine
70+
install.packages(".", repos = NULL, type = "source") ## needed by parallel workers
71+
shell: Rscript {0}
72+
73+
- name: Test with specific future version?
74+
run: |
75+
future_version <- Sys.getenv("R_FUTURE_VERSION")
76+
if (nzchar(future_version)) {
77+
install.packages("remotes")
78+
remotes::install_github("futureverse/future", ref=future_version)
79+
}
6880
shell: Rscript {0}
6981

7082
- name: Session info
7183
run: |
7284
options(width = 100)
73-
capabilities()
7485
parallelly::availableCores(which = "all")
86+
sapply(c(physical_cores = FALSE, logical_cores = TRUE), parallel::detectCores)
87+
if (require(RhpcBLASctl, quietly=TRUE)) c(get_num_procs = get_num_procs(), get_num_cores = get_num_cores(), blas_get_num_procs = blas_get_num_procs(), omp_get_num_procs = omp_get_num_procs(), omp_get_max_threads = omp_get_max_threads())
88+
capabilities()
7589
pkgs <- installed.packages()[, "Package"]
7690
sessioninfo::session_info(pkgs, include_base = TRUE)
7791
## Verify LANGUAGE settings by generating a translatable error
@@ -82,17 +96,16 @@ jobs:
8296

8397
- name: Check
8498
run: |
85-
if (getRversion() < "3.5.0") Sys.setenv(RCMDCHECK_ERROR_ON = "error")
99+
if (nzchar(Sys.getenv("R_FUTURE_PLAN"))) Sys.setenv(RCMDCHECK_ERROR_ON = "error")
86100
rcmdcheck::rcmdcheck(
87-
build_args = if (getRversion() < "3.5.0") "--no-build-vignettes",
88-
args = c("--no-manual", "--as-cran", if (getRversion() < "3.5.0") c("--no-vignettes", "--no-build-vignettes", "--ignore-vignettes")),
101+
args = c("--no-manual", "--as-cran"),
89102
check_dir = "check"
90103
)
91104
shell: Rscript {0}
92105

93106
- name: Upload check results
94107
if: failure()
95-
uses: actions/upload-artifact@v3
108+
uses: actions/upload-artifact@v4
96109
with:
97110
name: ${{ runner.os }}-r${{ matrix.config.r }}-results
98111
path: check

‎.github/workflows/covr.yaml‎

Lines changed: 0 additions & 82 deletions
This file was deleted.

‎.github/workflows/future_tests.yaml‎

Lines changed: 12 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -6,24 +6,20 @@ jobs:
66
future_tests:
77
if: "! contains(github.event.head_commit.message, '[ci skip]')"
88

9-
timeout-minutes: 30
10-
11-
runs-on: ubuntu-22.04
9+
timeout-minutes: 15
10+
11+
runs-on: ubuntu-latest
1212

13-
name: future.plan=${{ matrix.future.plan }}
13+
name: future.plan=${{ matrix.future.plan }} (${{ matrix.future.label }})
1414

1515
strategy:
1616
fail-fast: false
1717
matrix:
1818
future:
19-
- { plan: 'future.batchtools::batchtools_local' }
20-
- { plan: 'future.batchtools::batchtools_multicore' }
21-
- { plan: 'future.batchtools::batchtools_bash' }
22-
- { plan: 'future.batchtools::batchtools_interactive' }
19+
- { plan: 'future.batchtools::batchtools_local' }
2320

2421
env:
2522
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
26-
RSPM: https://packagemanager.rstudio.com/cran/__linux__/jammy/latest
2723
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
2824
## R CMD check
2925
_R_CHECK_LENGTH_1_CONDITION_: true
@@ -36,34 +32,16 @@ jobs:
3632
steps:
3733
- uses: actions/checkout@v4
3834

39-
- uses: r-lib/actions/setup-pandoc@v2
40-
4135
- uses: r-lib/actions/setup-r@v2
4236
with:
43-
r-version: release
44-
45-
- name: Query R package dependencies
46-
run: |
47-
install.packages('remotes')
48-
saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2)
49-
writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version")
50-
shell: Rscript {0}
37+
use-public-rspm: true
5138

52-
- name: Cache R packages
53-
uses: actions/cache@v3
39+
- uses: r-lib/actions/setup-r-dependencies@v2
5440
with:
55-
path: ${{ env.R_LIBS_USER }}
56-
key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}
57-
restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-
58-
59-
- name: Install R package system dependencies (Linux)
60-
if: runner.os == 'Linux'
61-
env:
62-
RHUB_PLATFORM: linux-x86_64-ubuntu-gcc
63-
run: |
64-
Rscript -e "remotes::install_github('r-hub/sysreqs')"
65-
sysreqs=$(Rscript -e "cat(sysreqs::sysreq_commands('DESCRIPTION'))")
66-
sudo -s eval "$sysreqs"
41+
extra-packages: |
42+
any::rcmdcheck
43+
any::remotes
44+
needs: check
6745

6846
- name: Install R package dependencies
6947
run: |
@@ -92,7 +70,7 @@ jobs:
9270
9371
- name: Upload check results
9472
if: failure()
95-
uses: actions/upload-artifact@v3
73+
uses: actions/upload-artifact@v4
9674
with:
9775
name: ${{ runner.os }}-r${{ matrix.future.plan }}-results
9876
path: check

‎.github/workflows/test-coverage.yaml‎

Lines changed: 71 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,71 @@
1+
on: [push]
2+
3+
name: covr
4+
5+
jobs:
6+
covr:
7+
if: "! contains(github.event.head_commit.message, '[ci skip]')"
8+
9+
timeout-minutes: 45
10+
11+
runs-on: ubuntu-latest
12+
13+
name: covr
14+
15+
strategy:
16+
fail-fast: false
17+
18+
env:
19+
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
20+
R_KEEP_PKG_SOURCE: yes
21+
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
22+
## Test in other locale (optional)
23+
LANGUAGE: ${{ matrix.config.language }}
24+
## R CMD check
25+
_R_CHECK_CRAN_INCOMING_: false
26+
_R_CHECK_MATRIX_DATA_: true
27+
_R_CHECK_SUGGESTS_ONLY_: true
28+
_R_CHECK_THINGS_IN_TEMP_DIR_: true
29+
RCMDCHECK_ERROR_ON: note
30+
## Specific to futures
31+
R_FUTURE_RNG_ONMISUSE: error
32+
33+
steps:
34+
- uses: actions/checkout@v4
35+
36+
- uses: r-lib/actions/setup-r@v2
37+
with:
38+
use-public-rspm: true
39+
40+
- uses: r-lib/actions/setup-r-dependencies@v2
41+
with:
42+
extra-packages: |
43+
any::rcmdcheck
44+
any::remotes
45+
any::sessioninfo
46+
any::covr
47+
needs: check
48+
49+
- name: Install dependencies
50+
run: |
51+
remotes::install_deps(dependencies = TRUE)
52+
install.packages(".", repos=NULL, type="source")
53+
shell: Rscript {0}
54+
55+
- name: Session info
56+
run: |
57+
options(width = 100)
58+
pkgs <- installed.packages()[, "Package"]
59+
sessioninfo::session_info(pkgs, include_base = TRUE)
60+
shell: Rscript {0}
61+
62+
- name: Test coverage
63+
run: |
64+
## 1. Get 'Repository Upload Token' from Codecov:
65+
## https://app.codecov.io/gh/<org>/<repo>/settings
66+
## 2. Set 'CODECOV_TOKEN' in GitHub Secrets:
67+
## https://github.com/<org>/<repo>/settings/environments/
68+
coverage <- covr::package_coverage(quiet = FALSE)
69+
print(coverage)
70+
covr::codecov(coverage = coverage, token="${{secrets.CODECOV_TOKEN}}")
71+
shell: Rscript {0}

‎CONTRIBUTING.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
# Contributing to the 'future.batchtools' package
33

4-
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).
4+
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).
55

6-
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.
6+
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.
77

88
We abide to the [Code of Conduct](https://www.contributor-covenant.org/version/2/0/code_of_conduct/) of Contributor Covenant.

‎DESCRIPTION‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
Package: future.batchtools
2-
Version: 0.12.1
2+
Version: 0.12.2
33
Depends:
44
R (>= 3.2.0),
55
parallelly,
6-
future (>= 1.31.0)
6+
future (>= 1.49.0)
77
Imports:
88
batchtools (>= 0.9.16),
99
utils
@@ -20,15 +20,15 @@ Authors@R: c(person("Henrik", "Bengtsson",
2020
role = c("aut", "cre", "cph"),
2121
email = "[email protected]",
2222
comment = c(ORCID = "0000-0002-7579-5165")))
23-
Description: Implementation of the Future API on top of the 'batchtools' package.
23+
Description: Implementation of the Future API <doi:10.32614/RJ-2021-048> on top of the 'batchtools' package.
2424
This allows you to process futures, as defined by the 'future' package,
2525
in parallel out of the box, not only on your local machine or ad-hoc
2626
cluster of machines, but also via high-performance compute ('HPC') job
2727
schedulers such as 'LSF', 'OpenLava', 'Slurm', 'SGE', and 'TORQUE' / 'PBS',
2828
e.g. 'y <- future.apply::future_lapply(files, FUN = process)'.
2929
License: LGPL (>= 2.1)
3030
LazyLoad: TRUE
31-
URL: https://future.batchtools.futureverse.org, https://github.com/HenrikBengtsson/future.batchtools
32-
BugReports: https://github.com/HenrikBengtsson/future.batchtools/issues
33-
RoxygenNote: 7.2.3
31+
URL: https://future.batchtools.futureverse.org, https://github.com/futureverse/future.batchtools
32+
BugReports: https://github.com/futureverse/future.batchtools/issues
33+
RoxygenNote: 7.3.2
3434
Roxygen: list(markdown = TRUE)

0 commit comments

Comments
 (0)