Skip to content

Commit 73c647b

Browse files
HenrikBengtssonHenrikBengtsson
committed
Merge branch 'release/0.1.0'
2 parents 2bdc1b2 + d43f8be commit 73c647b

36 files changed

Lines changed: 154 additions & 576 deletions

‎.Rbuildignore‎

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
#----------------------------
22
# Git and SVN related
33
#----------------------------
4-
^.svn
54
^.git
65
^.make
7-
^INSTALL[.]md$
8-
^OVERVIEW[.]md$
9-
^README.*[.]md$
106
^CONDUCT[.]md$
117
^CONTRIBUTING[.]md$
128
^docs
@@ -17,47 +13,14 @@
1713
#----------------------------
1814
revdep
1915

20-
#----------------------------
21-
# Travis-CI et al.
22-
#----------------------------
23-
^[.]travis[.]yml$
24-
^travis-tool[.]sh$
25-
^pkg-build[.]sh$
26-
^appveyor[.]yml$
27-
^covr-utils.R$
28-
^[.]covr[.]R$
29-
^[.]covr[.]rds$
30-
3116
#----------------------------
3217
# R related
3318
#----------------------------
3419
Rplots.pdf$
3520
^cran-comments[.].*$
3621
^vignettes/.*[.](pdf|PDF)$
3722
^vignettes/.*[.](r|R)$
38-
^vignettes/[.]install_extras$
3923
^Makefile$
4024
^incl
41-
^NAMESPACE,.*[.]txt$
42-
^nohup.*$
43-
^[.]R
44-
^[.]benchmark
45-
^[.]devel
46-
^[.]test
47-
^[.]check
4825
^[.]local
4926
^.*[.]tar[.]gz$
50-
51-
#----------------------------
52-
# Package specific
53-
#----------------------------
54-
^[.]BatchJobs[.]R$
55-
^[.]future
56-
57-
#----------------------------
58-
# Miscellaneous
59-
#----------------------------
60-
^.ghi
61-
^.issues
62-
^last.dump*
63-
[.]Rdump

‎.aspell/WORDLIST.rds‎

69 Bytes
Binary file not shown.

‎.aspell/defaults.R‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
Rd_files <- vignettes <- R_files <- description <-
2+
list(encoding = "UTF-8",
3+
language = "en",
4+
dictionaries = c("en_stats", "WORDLIST"))
5+

‎.github/workflows/depcheck-devel.yaml‎

Lines changed: 113 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,113 @@
1+
on:
2+
workflow_dispatch: # Enables manual triggering
3+
4+
name: deps-devel-checks
5+
6+
jobs:
7+
deps-devel-checks:
8+
timeout-minutes: 45
9+
10+
runs-on: ubuntu-latest
11+
12+
name: ${{ matrix.config.pkg }} (${{ matrix.config.r }})
13+
14+
strategy:
15+
fail-fast: false
16+
matrix:
17+
config:
18+
- { r: "release", pkg: "crossmap", url: "rossellhayes/crossmap" }
19+
- { r: "release", pkg: "doFuture", url: "futureverse/doFuture@develop" }
20+
- { r: "release", pkg: "foreach", url: "RevolutionAnalytics/foreach" }
21+
- { r: "release", pkg: "future.apply", url: "futureverse/future.apply@develop" }
22+
- { r: "release", pkg: "futurize", url: "futureverse/futurize@develop" }
23+
- { r: "release", pkg: "purrr", url: "tidyverse/purrr" }
24+
- { r: "release", pkg: "furrr", url: "futureverse/furrr" }
25+
# - { r: "release", pkg: "partykit", url: "partykit" }
26+
- { r: "release", pkg: "plyr", url: "hadley/plyr" }
27+
28+
env:
29+
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
30+
R_KEEP_PKG_SOURCE: yes
31+
R_REMOTES_NO_ERRORS_FROM_WARNINGS: true
32+
## Test in other locale (optional)
33+
## R (>= 4.4.0) Note, no trailing underscore (sic!)
34+
_R_COMPARE_LANG_OBJECTS: eqonly
35+
## R CMD check
36+
_R_CHECK_CRAN_INCOMING_: false
37+
_R_CHECK_MATRIX_DATA_: true
38+
_R_CHECK_SUGGESTS_ONLY_: false
39+
_R_CHECK_FORCE_SUGGESTS_: true
40+
_R_CHECK_THINGS_IN_TEMP_DIR_: true
41+
_R_CHECK_TESTS_NLINES_: 300
42+
_R_CHECK_TESTS_ELAPSED_THRESHOLD_: 0
43+
RCMDCHECK_ERROR_ON: note
44+
NOT_CRAN: true
45+
## Specific to futures
46+
# R_FUTURE_CONNECTIONS_ONMISUSE: "error[details=TRUE]"
47+
R_FUTURE_GLOBALENV_ONMISUSE: "error"
48+
R_FUTURE_GLOBALS_ONREFERENCE: "warning"
49+
R_FUTURE_RNG_ONMISUSE: error
50+
R_FUTURE_FUTURE_EARLYSIGNAL: defunct
51+
R_FUTURE_FUTURE_LOCAL: defunct
52+
R_FUTURE_FUTURE_GC: defunct
53+
R_FUTURE_PLAN_EARLYSIGNAL: defunct
54+
R_FUTURE_RESOLVED_RUN: defunct
55+
## Specific to testme
56+
R_TESTME_FILTER_TAGS: '"pkg-${{ matrix.config.pkg }}" %in% tags'
57+
58+
steps:
59+
- uses: actions/checkout@v4
60+
61+
- uses: r-lib/actions/setup-pandoc@v2
62+
63+
- uses: r-lib/actions/setup-r@v2
64+
with:
65+
r-version: ${{ matrix.config.r }}
66+
use-public-rspm: true
67+
68+
- uses: r-lib/actions/setup-r-dependencies@v2
69+
with:
70+
extra-packages: |
71+
any::rcmdcheck
72+
any::remotes
73+
needs: check
74+
75+
- name: Install package itself (special case)
76+
run: |
77+
install.packages(".", repos = NULL, type = "source")
78+
shell: Rscript {0}
79+
80+
- name: Install development versions of dependencies
81+
run: |
82+
pak::pak("${{ matrix.config.url }}")
83+
shell: Rscript {0}
84+
85+
- name: Session info
86+
run: |
87+
options(width = 100)
88+
parallelly::availableCores(which = "all")
89+
sapply(c(physical_cores = FALSE, logical_cores = TRUE), parallel::detectCores)
90+
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())
91+
capabilities()
92+
pkgs <- installed.packages()[, "Package"]
93+
sessioninfo::session_info(pkgs, include_base = TRUE)
94+
## Verify LANGUAGE settings by generating a translatable error
95+
cat(sprintf("LANGUAGE=%s\n", sQuote(Sys.getenv("LANGUAGE"))))
96+
cat(sprintf("locales: %s\n", sQuote(Sys.getlocale())))
97+
tryCatch(log("a"), error = conditionMessage)
98+
shell: Rscript {0}
99+
100+
- name: Check
101+
run: |
102+
rcmdcheck::rcmdcheck(
103+
args = c("--no-manual", "--as-cran"),
104+
check_dir = "check"
105+
)
106+
shell: Rscript {0}
107+
108+
- name: Upload check results
109+
if: failure()
110+
uses: actions/upload-artifact@v4
111+
with:
112+
name: ${{ runner.os }}-r${{ matrix.config.r }}-results
113+
path: check

‎DESCRIPTION‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Package: progressify
2-
Version: 0.0.0-9022
3-
Title: Progress Updates Everywhere
2+
Version: 0.1.0
3+
Title: Progress Reporting of Common Functions via One Magic Function
44
Description: The progressify() function rewrites (transpiles) calls to sequential and parallel map-reduce functions such as base::lapply(), purrr::map(), foreach::foreach(), and plyr::llply() to signal progress updates. By combining this function with R's native pipe operator, you have a straightforward way to report progress on iterative computations with minimal refactoring, e.g. 'lapply(x, fcn) |> progressify()' and 'purrr::map(x, fcn) |> progressify()'. It is compatible with the 'futurize' package for parallelization, e.g. 'lapply(x, fcn) |> progressify() |> futurize()' and 'purrr::map(x, fcn) |> futurize() |> progressify()'.
55
Authors@R: c(
66
person("Henrik", "Bengtsson", role=c("aut", "cre", "cph"),
@@ -13,7 +13,6 @@ Imports:
1313
methods
1414
Suggests:
1515
base64enc,
16-
BiocParallel,
1716
commonmark,
1817
crossmap,
1918
doFuture,

‎NEWS.md‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Version (development version)
1+
# Version 0.1.0 (2026-04-01)
22

33
This is a retake of the previous, proof-of-concept version. Starting
44
with this version, we are now borrowing from the **futurize** package,
@@ -27,9 +27,6 @@ which implements closely related "parallelization" transpilers.
2727
* Add support for **plyr**, e.g. `y <- plyr::llply(xs, fcn) |>
2828
progressify()`.
2929

30-
* Add support for Bioconductor package **BiocParallel**, e.g. `y <-
31-
BiocParallel::bplapply(xs, fcn) |> progressify()`.
32-
3330
* Add support for `replicate()`, e.g. `y <- replicate(n, rnorm(10))
3431
|> progressify()`.
3532

‎R/builtin-BiocParallel.R‎

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

‎R/builtin-base.R‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ progressify_base <- local({
5353
parts[[idx_FUN]] <- bquote_apply(template_FUN, FUN = FUN)
5454

5555
progressr_args <- list(
56+
...FUN = FUN,
5657
.progressr_progressor = quote(.progressr_progressor)
5758
)
5859
parts <- c(parts, progressr_args)

‎R/builtin-common-templates.R‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ template_steps_nrow <- bquote_compile({
2525
})
2626

2727
## Pass progressor via '...' arguments
28-
template_FUN <- bquote_compile(function(..., .progressr_progressor) {
28+
template_FUN <- bquote_compile(function(..., ...FUN, .progressr_progressor) {
2929
on.exit(.progressr_progressor())
30-
.(FUN)(...)
30+
...FUN(...)
3131
})
3232

3333
## purrr-style .f wrapper: uses as_mapper() for formula/string/integer support

‎R/builtin-future.apply.R‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ progressify_future.apply <- local({
5858
parts[[idx_FUN]] <- bquote_apply(template_FUN, FUN = FUN)
5959

6060
progressr_args <- list(
61+
...FUN = FUN,
6162
.progressr_progressor = quote(.progressr_progressor)
6263
)
6364
parts <- c(parts, progressr_args)

0 commit comments

Comments
 (0)