From ec812c50f4cc668b3516693d0a2360555ad13234 Mon Sep 17 00:00:00 2001 From: Henrik Bengtsson Date: Mon, 28 Oct 2024 22:45:15 -0700 Subject: [PATCH 01/16] Bump develop version [ci skip] --- DESCRIPTION | 2 +- NEWS.md | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 065ab3b..d7fddce 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: progressr -Version: 0.15.0 +Version: 0.15.0-9000 Title: An Inclusive, Unifying API for Progress Updates Description: A minimal, unifying API for scripts and packages to report progress updates from anywhere including when using parallel processing. The package is designed such that the developer can to focus on what progress should be reported on without having to worry about how to present it. The end user has full control of how, where, and when to render these progress updates, e.g. in the terminal using utils::txtProgressBar(), cli::cli_progress_bar(), in a graphical user interface using utils::winProgressBar(), tcltk::tkProgressBar() or shiny::withProgress(), via the speakers using beepr::beep(), or on a file system via the size of a file. Anyone can add additional, customized, progression handlers. The 'progressr' package uses R's condition framework for signaling progress updated. Because of this, progress can be reported from almost anywhere in R, e.g. from classical for and while loops, from map-reduce API:s like the lapply() family of functions, 'purrr', 'plyr', and 'foreach'. It will also work with parallel processing via the 'future' framework, e.g. future.apply::future_lapply(), furrr::future_map(), and 'foreach' with 'doFuture'. The package is compatible with Shiny applications. Authors@R: c(person("Henrik", "Bengtsson", diff --git a/NEWS.md b/NEWS.md index 87695d8..9e1b620 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,8 @@ +# Version (development version) + + * ... + + # Version 0.15.0 [2023-10-28] ## New Features From 95e42cd42176b09085527443d4afd9ee5af0f8d9 Mon Sep 17 00:00:00 2001 From: Henrik Bengtsson Date: Wed, 6 Nov 2024 10:04:49 -0800 Subject: [PATCH 02/16] ntfy is now on CRAN --- DESCRIPTION | 3 ++- R/handler_notifier.R | 1 - R/handler_ntfy.R | 6 ++---- R/handler_rpushbullet.R | 4 ++-- incl/handler_ntfy.R | 2 +- man/handler_notifier.Rd | 1 - man/handler_ntfy.Rd | 8 +++----- man/handler_rpushbullet.Rd | 4 ++-- 8 files changed, 12 insertions(+), 17 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index d7fddce..4ebae9b 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: progressr -Version: 0.15.0-9000 +Version: 0.15.0-9001 Title: An Inclusive, Unifying API for Progress Updates Description: A minimal, unifying API for scripts and packages to report progress updates from anywhere including when using parallel processing. The package is designed such that the developer can to focus on what progress should be reported on without having to worry about how to present it. The end user has full control of how, where, and when to render these progress updates, e.g. in the terminal using utils::txtProgressBar(), cli::cli_progress_bar(), in a graphical user interface using utils::winProgressBar(), tcltk::tkProgressBar() or shiny::withProgress(), via the speakers using beepr::beep(), or on a file system via the size of a file. Anyone can add additional, customized, progression handlers. The 'progressr' package uses R's condition framework for signaling progress updated. Because of this, progress can be reported from almost anywhere in R, e.g. from classical for and while loops, from map-reduce API:s like the lapply() family of functions, 'purrr', 'plyr', and 'foreach'. It will also work with parallel processing via the 'future' framework, e.g. future.apply::future_lapply(), furrr::future_map(), and 'foreach' with 'doFuture'. The package is compatible with Shiny applications. Authors@R: c(person("Henrik", "Bengtsson", @@ -27,6 +27,7 @@ Suggests: future, future.apply, furrr, + ntfy, RPushbullet, rstudioapi, shiny, diff --git a/R/handler_notifier.R b/R/handler_notifier.R index b858ffb..1a462c1 100644 --- a/R/handler_notifier.R +++ b/R/handler_notifier.R @@ -13,7 +13,6 @@ #' available from . This can be #' installed as `remotes::install_github("gaborcsardi/notifier@62d484")`. #' -#' @keywords internal #' @export handler_notifier <- function(intrusiveness = getOption("progressr.intrusiveness.notifier", 10), target = "gui", ...) { ## Used for package testing purposes only when we want to perform diff --git a/R/handler_ntfy.R b/R/handler_ntfy.R index 77cabec..96b83f4 100644 --- a/R/handler_ntfy.R +++ b/R/handler_ntfy.R @@ -1,6 +1,6 @@ #' Progression Handler: Progress Reported via the Ntfy.sh Messaging Service #' -#' A progression handler for `ntfy_send()` of the \pkg{ntfy} package, +#' A progression handler for [ntfy::ntfy_send()] of the \pkg{ntfy} package, #' which sends notifications via the framework. #' #' @inheritParams make_progression_handler @@ -11,10 +11,8 @@ #' @example incl/handler_ntfy.R #' #' @section Requirements: -#' This progression handler requires the \pkg{ntfy} package, which is only -#' available from . +#' This progression handler requires the \pkg{ntfy} package. #' -#' @keywords internal #' @export handler_ntfy <- function(intrusiveness = getOption("progressr.intrusiveness.ntfy", 5), target = "gui", ..., title = "Progress update from R") { ## Used for package testing purposes only when we want to perform diff --git a/R/handler_rpushbullet.R b/R/handler_rpushbullet.R index 938bf2c..3f7ec56 100644 --- a/R/handler_rpushbullet.R +++ b/R/handler_rpushbullet.R @@ -1,6 +1,7 @@ #' Progression Handler: Progress Reported via the Pushbullet Messaging Service #' -#' A progression handler for `pbPost()` of the \pkg{RPushbullet} package. +#' A progression handler for [RPushbullet::pbPost()] of the \pkg{RPushbullet} +#' package. #' #' @inheritParams make_progression_handler #' @inheritParams RPushbullet::pbPost @@ -15,7 +16,6 @@ #' of the \pkg{RPushbullet} package. It also requires internet access #' from the computer where this progress handler is registered. #' -#' @keywords internal #' @export handler_rpushbullet <- function(intrusiveness = getOption("progressr.intrusiveness.rpushbullet", 5), target = "gui", ..., title = "Progress update from R", recipients = NULL, email = NULL, channel = NULL, apikey = NULL, device = NULL) { ## Used for package testing purposes only when we want to perform diff --git a/incl/handler_ntfy.R b/incl/handler_ntfy.R index 5bac29c..88cf667 100644 --- a/incl/handler_ntfy.R +++ b/incl/handler_ntfy.R @@ -3,7 +3,7 @@ if (requireNamespace(pkg, quietly = TRUE)) { ## We need to specify a ntfy.sh topic that progress messages ## should be sent to. See help("ntfy_topic", package = "ntfy") ## for details - Sys.setenv("NTFY_TOPIC", "R-my-secret-topic") + Sys.setenv(NTFY_TOPIC = "R-my-secret-topic") handlers("ntfy") with_progress({ y <- slow_sum(1:10) }) diff --git a/man/handler_notifier.Rd b/man/handler_notifier.Rd index c50e1ff..dd3c2f8 100644 --- a/man/handler_notifier.Rd +++ b/man/handler_notifier.Rd @@ -39,4 +39,3 @@ if (requireNamespace(pkg, quietly = TRUE)) { } } -\keyword{internal} diff --git a/man/handler_ntfy.Rd b/man/handler_ntfy.Rd index c189b27..42c3b46 100644 --- a/man/handler_ntfy.Rd +++ b/man/handler_ntfy.Rd @@ -23,13 +23,12 @@ rendered.} \item{\ldots}{Additional arguments passed to \code{\link[=make_progression_handler]{make_progression_handler()}}.} } \description{ -A progression handler for \code{ntfy_send()} of the \pkg{ntfy} package, +A progression handler for \code{\link[ntfy:ntfy_send]{ntfy::ntfy_send()}} of the \pkg{ntfy} package, which sends notifications via the \url{https://ntfy.sh} framework. } \section{Requirements}{ -This progression handler requires the \pkg{ntfy} package, which is only -available from \url{https://github.com/jonocarroll/ntfy}. +This progression handler requires the \pkg{ntfy} package. } \examples{ @@ -38,11 +37,10 @@ if (requireNamespace(pkg, quietly = TRUE)) { ## We need to specify a ntfy.sh topic that progress messages ## should be sent to. See help("ntfy_topic", package = "ntfy") ## for details - Sys.setenv("NTFY_TOPIC", "R-my-secret-topic") + Sys.setenv(NTFY_TOPIC = "R-my-secret-topic") handlers("ntfy") with_progress({ y <- slow_sum(1:10) }) print(y) } } -\keyword{internal} diff --git a/man/handler_rpushbullet.Rd b/man/handler_rpushbullet.Rd index 3384ec7..d55d0ec 100644 --- a/man/handler_rpushbullet.Rd +++ b/man/handler_rpushbullet.Rd @@ -47,7 +47,8 @@ the global option).} \item{\ldots}{Additional arguments passed to \code{\link[=make_progression_handler]{make_progression_handler()}}.} } \description{ -A progression handler for \code{pbPost()} of the \pkg{RPushbullet} package. +A progression handler for \code{\link[RPushbullet:pbPost]{RPushbullet::pbPost()}} of the \pkg{RPushbullet} +package. } \section{Requirements}{ @@ -67,4 +68,3 @@ if (requireNamespace(pkg, quietly = TRUE)) { } } -\keyword{internal} From ccd2afdf1a6303ba1bd384f6d004ee5d6962b93f Mon Sep 17 00:00:00 2001 From: Henrik Bengtsson Date: Wed, 6 Nov 2024 11:04:42 -0800 Subject: [PATCH 03/16] FIX: Renamed `handler_rpushbullet()` argument `device` to `devices` --- DESCRIPTION | 2 +- NEWS.md | 4 +++- R/handler_rpushbullet.R | 4 ++-- man/handler_rpushbullet.Rd | 7 ++++++- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 4ebae9b..6a724e9 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: progressr -Version: 0.15.0-9001 +Version: 0.15.0-9002 Title: An Inclusive, Unifying API for Progress Updates Description: A minimal, unifying API for scripts and packages to report progress updates from anywhere including when using parallel processing. The package is designed such that the developer can to focus on what progress should be reported on without having to worry about how to present it. The end user has full control of how, where, and when to render these progress updates, e.g. in the terminal using utils::txtProgressBar(), cli::cli_progress_bar(), in a graphical user interface using utils::winProgressBar(), tcltk::tkProgressBar() or shiny::withProgress(), via the speakers using beepr::beep(), or on a file system via the size of a file. Anyone can add additional, customized, progression handlers. The 'progressr' package uses R's condition framework for signaling progress updated. Because of this, progress can be reported from almost anywhere in R, e.g. from classical for and while loops, from map-reduce API:s like the lapply() family of functions, 'purrr', 'plyr', and 'foreach'. It will also work with parallel processing via the 'future' framework, e.g. future.apply::future_lapply(), furrr::future_map(), and 'foreach' with 'doFuture'. The package is compatible with Shiny applications. Authors@R: c(person("Henrik", "Bengtsson", diff --git a/NEWS.md b/NEWS.md index 9e1b620..c33cd81 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,8 @@ # Version (development version) - * ... +## Bug Fixes + + * Renamed `handler_rpushbullet()` argument `device` to `devices`. # Version 0.15.0 [2023-10-28] diff --git a/R/handler_rpushbullet.R b/R/handler_rpushbullet.R index 3f7ec56..c6a825d 100644 --- a/R/handler_rpushbullet.R +++ b/R/handler_rpushbullet.R @@ -17,7 +17,7 @@ #' from the computer where this progress handler is registered. #' #' @export -handler_rpushbullet <- function(intrusiveness = getOption("progressr.intrusiveness.rpushbullet", 5), target = "gui", ..., title = "Progress update from R", recipients = NULL, email = NULL, channel = NULL, apikey = NULL, device = NULL) { +handler_rpushbullet <- function(intrusiveness = getOption("progressr.intrusiveness.rpushbullet", 5), target = "gui", ..., title = "Progress update from R", recipients = NULL, email = NULL, channel = NULL, apikey = NULL, devices = NULL) { ## Used for package testing purposes only when we want to perform ## everything except the last part where the backend is called pbPost <- function(...) NULL @@ -42,7 +42,7 @@ handler_rpushbullet <- function(intrusiveness = getOption("progressr.intrusivene if (!is.null(email)) args$email <- email if (!is.null(channel)) args$channel <- channel if (!is.null(apikey)) args$apikey <- apikey - if (!is.null(device)) args$device <- device + if (!is.null(devices)) args$devices <- devices do.call(pbPost, args = args) } diff --git a/man/handler_rpushbullet.Rd b/man/handler_rpushbullet.Rd index d55d0ec..35cf993 100644 --- a/man/handler_rpushbullet.Rd +++ b/man/handler_rpushbullet.Rd @@ -13,7 +13,7 @@ handler_rpushbullet( email = NULL, channel = NULL, apikey = NULL, - device = NULL + devices = NULL ) } \arguments{ @@ -44,6 +44,11 @@ supplied as an argument here, via the global option which is read at package initialization (and, if found, also sets the global option).} +\item{devices}{The device to which this post is pushed. It can be +supplied as an argument here, or via the file +\code{~/.rpushbullet.json} which is read at package +initialization.} + \item{\ldots}{Additional arguments passed to \code{\link[=make_progression_handler]{make_progression_handler()}}.} } \description{ From 27f209aa18369f0efaeeea5eb4c8e8ebbb967d69 Mon Sep 17 00:00:00 2001 From: Henrik Bengtsson Date: Wed, 6 Nov 2024 11:54:04 -0800 Subject: [PATCH 04/16] GHA: Can only test in R (>= 4.1), because Suggested package 'ntfy' requires R (>= 4.1) and the GHA setup will fail even if this is optional --- .github/workflows/R-CMD-check.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 07c8c93..808ac3a 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -26,7 +26,8 @@ jobs: - {os: ubuntu-latest, r: 'oldrel' } - {os: ubuntu-latest, r: 'oldrel-1' } - {os: ubuntu-latest, r: 'oldrel-2' } - - {os: ubuntu-latest, r: '3.6' } + - {os: ubuntu-latest, r: '4.1' } +# - {os: ubuntu-latest, r: '3.6' } ## optional 'ntfy' requires R (>= 4.1), but triggers an error - {os: ubuntu-latest, r: 'release' , language: ko, label: ko } - {os: ubuntu-latest, r: 'release' , language: zh_CN, label: zh_CN } - {os: ubuntu-latest, r: 'release' , language: zh_TW, label: zh_TW } From cd838aea8dceaa51b8dc0851dcfd29d9b46adcb6 Mon Sep 17 00:00:00 2001 From: Henrik Bengtsson Date: Thu, 7 Nov 2024 09:22:30 -0800 Subject: [PATCH 05/16] GHA: Add job with _R_CHECK_SUGGESTS_ONLY_=false --- .github/workflows/R-CMD-check.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 808ac3a..13ba303 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -22,6 +22,7 @@ jobs: # - {os: macOS-latest, r: 'release' } # - {os: macOS-latest, r: 'oldrel' } - {os: ubuntu-latest, r: 'devel' } + - {os: ubuntu-latest, r: 'devel' , req-suggests: false } - {os: ubuntu-latest, r: 'release' } - {os: ubuntu-latest, r: 'oldrel' } - {os: ubuntu-latest, r: 'oldrel-1' } @@ -38,9 +39,9 @@ jobs: ## Test in other locale (optional) LANGUAGE: ${{ matrix.config.language }} ## R CMD check + _R_CHECK_SUGGESTS_ONLY_: ${{ matrix.config.req-suggests || 'true' }} _R_CHECK_CRAN_INCOMING_: false _R_CHECK_MATRIX_DATA_: true - _R_CHECK_SUGGESTS_ONLY_: true _R_CHECK_THINGS_IN_TEMP_DIR_: true ## R (>= 4.4.0) Note, no trailing underscore (sic!) _R_COMPARE_LANG_OBJECTS: eqonly From 03338a3134682986f94f307cfae43685155a2981 Mon Sep 17 00:00:00 2001 From: Henrik Bengtsson Date: Thu, 7 Nov 2024 09:33:24 -0800 Subject: [PATCH 06/16] GHA: Report on R-specific env vars for checks --- .github/workflows/R-CMD-check.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 13ba303..6df1816 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -22,7 +22,7 @@ jobs: # - {os: macOS-latest, r: 'release' } # - {os: macOS-latest, r: 'oldrel' } - {os: ubuntu-latest, r: 'devel' } - - {os: ubuntu-latest, r: 'devel' , req-suggests: false } + - {os: ubuntu-latest, r: 'devel' , req-suggests: false, label: '!req-suggests' } - {os: ubuntu-latest, r: 'release' } - {os: ubuntu-latest, r: 'oldrel' } - {os: ubuntu-latest, r: 'oldrel-1' } @@ -83,6 +83,10 @@ jobs: cat(sprintf("LANGUAGE=%s\n", sQuote(Sys.getenv("LANGUAGE")))) cat(sprintf("locales: %s\n", sQuote(Sys.getlocale()))) tryCatch(log("a"), error = conditionMessage) + cat("R-specific environment variables:\n") + envs <- Sys.getenv() + envs <- envs[grep("^(_R_|R_)", names(envs))] + print(envs) shell: Rscript {0} - name: Check (!Windows) From 65dd42388b567ac43acc3531baa769b1d6e33487 Mon Sep 17 00:00:00 2001 From: Henrik Bengtsson Date: Thu, 7 Nov 2024 09:42:29 -0800 Subject: [PATCH 07/16] GHA: thinko --- .github/workflows/R-CMD-check.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 6df1816..a77fe99 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -22,7 +22,7 @@ jobs: # - {os: macOS-latest, r: 'release' } # - {os: macOS-latest, r: 'oldrel' } - {os: ubuntu-latest, r: 'devel' } - - {os: ubuntu-latest, r: 'devel' , req-suggests: false, label: '!req-suggests' } + - {os: ubuntu-latest, r: 'devel' , req_suggests: false, label: '!req-suggests' } - {os: ubuntu-latest, r: 'release' } - {os: ubuntu-latest, r: 'oldrel' } - {os: ubuntu-latest, r: 'oldrel-1' } @@ -39,7 +39,7 @@ jobs: ## Test in other locale (optional) LANGUAGE: ${{ matrix.config.language }} ## R CMD check - _R_CHECK_SUGGESTS_ONLY_: ${{ matrix.config.req-suggests || 'true' }} + _R_CHECK_SUGGESTS_ONLY_: ${{ matrix.config.req_suggests || 'true' }} _R_CHECK_CRAN_INCOMING_: false _R_CHECK_MATRIX_DATA_: true _R_CHECK_THINGS_IN_TEMP_DIR_: true From f07c116d00aa076d3b43e0cf433b12b02d813274 Mon Sep 17 00:00:00 2001 From: Henrik Bengtsson Date: Thu, 7 Nov 2024 09:46:58 -0800 Subject: [PATCH 08/16] GHA: take 5 --- .github/workflows/R-CMD-check.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index a77fe99..ceb6d0b 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -22,7 +22,7 @@ jobs: # - {os: macOS-latest, r: 'release' } # - {os: macOS-latest, r: 'oldrel' } - {os: ubuntu-latest, r: 'devel' } - - {os: ubuntu-latest, r: 'devel' , req_suggests: false, label: '!req-suggests' } + - {os: ubuntu-latest, r: 'devel' , req_suggests: false, label: '!req_suggests' } - {os: ubuntu-latest, r: 'release' } - {os: ubuntu-latest, r: 'oldrel' } - {os: ubuntu-latest, r: 'oldrel-1' } @@ -49,6 +49,10 @@ jobs: steps: - uses: actions/checkout@v4 + - name: R env vars + run: | + env | grep -E "^(_R_|R_)" + - uses: r-lib/actions/setup-pandoc@v2 - uses: r-lib/actions/setup-tinytex@v2 From 9e36840d308ea996d0bd55a353339bbc167dfd66 Mon Sep 17 00:00:00 2001 From: Henrik Bengtsson Date: Thu, 7 Nov 2024 09:58:32 -0800 Subject: [PATCH 09/16] GHA: take 6 --- .github/workflows/R-CMD-check.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index ceb6d0b..6dc6066 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -39,7 +39,8 @@ jobs: ## Test in other locale (optional) LANGUAGE: ${{ matrix.config.language }} ## R CMD check - _R_CHECK_SUGGESTS_ONLY_: ${{ matrix.config.req_suggests || 'true' }} + _R_CHECK_SUGGESTS_ONLY_: ${{ matrix.config.req_suggests || true }} + _R_FOO_: ${{ !contains(matrix.config.req_suggests, false) }} _R_CHECK_CRAN_INCOMING_: false _R_CHECK_MATRIX_DATA_: true _R_CHECK_THINGS_IN_TEMP_DIR_: true From 323bcbf1de5854b480d59b9580e06f89d0b9d418 Mon Sep 17 00:00:00 2001 From: Henrik Bengtsson Date: Thu, 7 Nov 2024 10:05:59 -0800 Subject: [PATCH 10/16] GHA: take 7 --- .github/workflows/R-CMD-check.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 6dc6066..bf57621 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -39,8 +39,7 @@ jobs: ## Test in other locale (optional) LANGUAGE: ${{ matrix.config.language }} ## R CMD check - _R_CHECK_SUGGESTS_ONLY_: ${{ matrix.config.req_suggests || true }} - _R_FOO_: ${{ !contains(matrix.config.req_suggests, false) }} + _R_CHECK_SUGGESTS_ONLY_: ${{ !!contains(matrix.config.req_suggests, false) }} _R_CHECK_CRAN_INCOMING_: false _R_CHECK_MATRIX_DATA_: true _R_CHECK_THINGS_IN_TEMP_DIR_: true @@ -50,10 +49,6 @@ jobs: steps: - uses: actions/checkout@v4 - - name: R env vars - run: | - env | grep -E "^(_R_|R_)" - - uses: r-lib/actions/setup-pandoc@v2 - uses: r-lib/actions/setup-tinytex@v2 From 97cceaca2718c374aa0f083c97956e18bd9d7b72 Mon Sep 17 00:00:00 2001 From: Henrik Bengtsson Date: Thu, 7 Nov 2024 10:25:30 -0800 Subject: [PATCH 11/16] GHA: matrix config values must be quoted! --- .github/workflows/R-CMD-check.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index bf57621..4f94cf6 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -22,7 +22,7 @@ jobs: # - {os: macOS-latest, r: 'release' } # - {os: macOS-latest, r: 'oldrel' } - {os: ubuntu-latest, r: 'devel' } - - {os: ubuntu-latest, r: 'devel' , req_suggests: false, label: '!req_suggests' } + - {os: ubuntu-latest, r: 'devel' , suggests_only: 'false', label: '!req_suggests' } - {os: ubuntu-latest, r: 'release' } - {os: ubuntu-latest, r: 'oldrel' } - {os: ubuntu-latest, r: 'oldrel-1' } @@ -39,7 +39,7 @@ jobs: ## Test in other locale (optional) LANGUAGE: ${{ matrix.config.language }} ## R CMD check - _R_CHECK_SUGGESTS_ONLY_: ${{ !!contains(matrix.config.req_suggests, false) }} + _R_CHECK_SUGGESTS_ONLY_: ${{ matrix.config.suggests_only || 'true' }} _R_CHECK_CRAN_INCOMING_: false _R_CHECK_MATRIX_DATA_: true _R_CHECK_THINGS_IN_TEMP_DIR_: true From 2432e9d607f14b67b9d7c89ccf18b8419797dbb9 Mon Sep 17 00:00:00 2001 From: Henrik Bengtsson Date: Thu, 7 Nov 2024 10:40:10 -0800 Subject: [PATCH 12/16] GHA: tweak [ci skip] --- .github/workflows/R-CMD-check.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 4f94cf6..913902d 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -22,7 +22,7 @@ jobs: # - {os: macOS-latest, r: 'release' } # - {os: macOS-latest, r: 'oldrel' } - {os: ubuntu-latest, r: 'devel' } - - {os: ubuntu-latest, r: 'devel' , suggests_only: 'false', label: '!req_suggests' } + - {os: ubuntu-latest, r: 'devel' , suggests_only: 'false', label: '!suggests_only' } - {os: ubuntu-latest, r: 'release' } - {os: ubuntu-latest, r: 'oldrel' } - {os: ubuntu-latest, r: 'oldrel-1' } From 81b4dea6e8b54b79197ad679939f7d5192453dcf Mon Sep 17 00:00:00 2001 From: Henrik Bengtsson Date: Wed, 20 Nov 2024 19:57:18 -0800 Subject: [PATCH 13/16] NEWS: typo [ci skip] --- NEWS.md | 4 +++- pkgdown/_pkgdown.yml.rsp | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/NEWS.md b/NEWS.md index c33cd81..990ea82 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,8 +4,10 @@ * Renamed `handler_rpushbullet()` argument `device` to `devices`. + * Fixed thinko bug in `example("handler_ntfy")`. -# Version 0.15.0 [2023-10-28] + +# Version 0.15.0 [2024-10-28] ## New Features diff --git a/pkgdown/_pkgdown.yml.rsp b/pkgdown/_pkgdown.yml.rsp index fe85ef5..001043a 100644 --- a/pkgdown/_pkgdown.yml.rsp +++ b/pkgdown/_pkgdown.yml.rsp @@ -22,7 +22,7 @@ home: - 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: From 4dd511a16432c516a875fc63f268d8c9e9c98237 Mon Sep 17 00:00:00 2001 From: Henrik Bengtsson Date: Wed, 20 Nov 2024 20:06:37 -0800 Subject: [PATCH 14/16] GHA: make rhub install the package itself --- .github/workflows/rhub.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/rhub.yaml b/.github/workflows/rhub.yaml index 74ec7b0..8d77a9b 100644 --- a/.github/workflows/rhub.yaml +++ b/.github/workflows/rhub.yaml @@ -89,6 +89,10 @@ jobs: with: job-config: ${{ matrix.config.job-config }} token: ${{ secrets.RHUB_TOKEN }} + - name: Install itself (to build vignettes) + run: | + install.packages(".", repos=NULL, type="source") + shell: Rscript {0} - uses: r-hub/actions/run-check@v1 with: job-config: ${{ matrix.config.job-config }} From e0b494ad49fce78e7ea2f53861cdca35f07dc335 Mon Sep 17 00:00:00 2001 From: Henrik Bengtsson Date: Wed, 20 Nov 2024 20:23:19 -0800 Subject: [PATCH 15/16] GHA: make rhub install the package itself - take 2 --- .github/workflows/rhub.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/rhub.yaml b/.github/workflows/rhub.yaml index 8d77a9b..427f68d 100644 --- a/.github/workflows/rhub.yaml +++ b/.github/workflows/rhub.yaml @@ -60,6 +60,10 @@ jobs: with: token: ${{ secrets.RHUB_TOKEN }} job-config: ${{ matrix.config.job-config }} + - name: Install itself (to build vignettes) + run: | + install.packages(".", repos=NULL, type="source") + shell: Rscript {0} - uses: r-hub/actions/run-check@v1 with: token: ${{ secrets.RHUB_TOKEN }} From 3884d35d73196a94e848dc5232e43942644f05c0 Mon Sep 17 00:00:00 2001 From: Henrik Bengtsson Date: Wed, 20 Nov 2024 20:33:58 -0800 Subject: [PATCH 16/16] 0.15.1 --- DESCRIPTION | 2 +- NEWS.md | 2 +- cran-comments.md | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 6a724e9..4b77335 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: progressr -Version: 0.15.0-9002 +Version: 0.15.1 Title: An Inclusive, Unifying API for Progress Updates Description: A minimal, unifying API for scripts and packages to report progress updates from anywhere including when using parallel processing. The package is designed such that the developer can to focus on what progress should be reported on without having to worry about how to present it. The end user has full control of how, where, and when to render these progress updates, e.g. in the terminal using utils::txtProgressBar(), cli::cli_progress_bar(), in a graphical user interface using utils::winProgressBar(), tcltk::tkProgressBar() or shiny::withProgress(), via the speakers using beepr::beep(), or on a file system via the size of a file. Anyone can add additional, customized, progression handlers. The 'progressr' package uses R's condition framework for signaling progress updated. Because of this, progress can be reported from almost anywhere in R, e.g. from classical for and while loops, from map-reduce API:s like the lapply() family of functions, 'purrr', 'plyr', and 'foreach'. It will also work with parallel processing via the 'future' framework, e.g. future.apply::future_lapply(), furrr::future_map(), and 'foreach' with 'doFuture'. The package is compatible with Shiny applications. Authors@R: c(person("Henrik", "Bengtsson", diff --git a/NEWS.md b/NEWS.md index 990ea82..54d2879 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# Version (development version) +# Version 0.15.1 [2024-11-20] ## Bug Fixes diff --git a/cran-comments.md b/cran-comments.md index 24f3b92..e69de29 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,3 +0,0 @@ -I've verified this submission has no negative impact on any of the 110 reverse package dependencies available on CRAN (n = 107) and Bioconductor (n = 3). - -Thank you