diff --git a/DESCRIPTION b/DESCRIPTION index 13bcd966..0900c96d 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: rdev Title: R Development Tools -Version: 1.15.6 +Version: 1.16.0 Authors@R: person("John", "Benninghoff", , "jbenninghoff@mac.com", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-6230-4742")) @@ -34,7 +34,7 @@ Imports: quarto, rcmdcheck, remotes, - renv (>= 1.0.3), + renv (>= 1.1.6), rlang, rmarkdown, rstudioapi, diff --git a/NEWS.md b/NEWS.md index 0a2126d0..76b5ae80 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,7 @@ +# rdev 1.16.0 + +* Updated `check_renv()` and `ci()`, replacing `renv::status(dev = TRUE)` with new renv 1.1.6 setting `renv::settings$snapshot.dev(TRUE)` + # rdev 1.15.6 * Added instructions for YAML chunk syntax update to `upkeep_checklist()` diff --git a/R/ci.R b/R/ci.R index a216cd5f..437661ea 100644 --- a/R/ci.R +++ b/R/ci.R @@ -1,7 +1,7 @@ #' Check renv #' -#' Runs [`renv`][renv::renv-package] [`status(dev = TRUE)`][renv::status()], -#' [`clean()`][renv::clean()], and optionally [`update()`][renv::update()] +#' Runs [`renv`][renv::renv-package] [`status()`][renv::status()], [`clean()`][renv::clean()] +#' and optionally [`update()`][renv::update()] #' #' @param update run [renv::update()] #' @@ -14,8 +14,8 @@ check_renv <- function(update = rlang::is_interactive()) { checkmate::assert_flag(update) - writeLines("renv::status(dev = TRUE)") - renv::status(dev = TRUE) + writeLines("renv::status()") + renv::status() writeLines("\nrenv::clean()") renv::clean() @@ -84,7 +84,7 @@ print_tbl <- function(df) { #' #' Run continuous integration tests locally. #' -#' If [`renv::status(dev = TRUE)`][renv::status()] is not synchronized, `ci()` will stop. +#' If [`renv::status()`][renv::status()] is not synchronized, `ci()` will stop. #' #' If [missing_deps()] returns any missing dependencies, `ci()` will stop. #' @@ -98,7 +98,7 @@ print_tbl <- function(df) { #' Output from `missing`, `extra`, and `urls` is printed as a [tibble][tibble::tibble()] for #' improved readability in the console. #' -#' @param renv check [`renv::status(dev = TRUE)`][renv::status()] +#' @param renv check [`renv::status()`][renv::status()] #' @param missing run [missing_deps()] #' @param pkgdown check [pkgdown::check_pkgdown()] if `_pkgdown.yml` exists #' @param styler style all files using [style_all()], see details @@ -142,8 +142,8 @@ ci <- function(renv = TRUE, # nolint: cyclocomp_linter. checkmate::assert_flag(rcmdcheck) if (renv) { - writeLines("renv::status(dev = TRUE)") - status <- renv::status(dev = TRUE) + writeLines("renv::status()") + status <- renv::status() if (!status$synchronized) { return(invisible(status)) } diff --git a/R/setup.R b/R/setup.R index 29fad08e..27aa51ea 100644 --- a/R/setup.R +++ b/R/setup.R @@ -110,7 +110,7 @@ use_spelling <- function(lang = "en-US", prompt = FALSE) { usethis::use_package("fs", type = "Suggests") usethis::use_package("withr", type = "Suggests") desc::desc_normalize() - renv::snapshot(dev = TRUE, prompt = prompt) + renv::snapshot(prompt = prompt) } #' Use rdev code coverage @@ -145,7 +145,7 @@ use_codecov <- function(prompt = FALSE) { usethis::use_package("covr", type = "Suggests") renv::install("DT") usethis::use_package("DT", type = "Suggests") - renv::snapshot(dev = TRUE, prompt = prompt) + renv::snapshot(prompt = prompt) } #' Get license option @@ -514,7 +514,10 @@ use_rdev_package <- function(quiet = TRUE) { # run renv::init() last to restart the session # specify repos to use CRAN mirror instead of Posit Public Package Manager - renv::init(settings = list(snapshot.type = "implicit"), repos = "https://cloud.r-project.org") + renv::init( + settings = list(snapshot.type = "implicit", snapshot.dev = TRUE), + repos = "https://cloud.r-project.org" + ) } #' Use Analysis Package Layout @@ -669,7 +672,7 @@ use_analysis_package <- function(use_quarto = TRUE, prompt = FALSE) { } else { usethis::use_package("pkgdown", type = "Suggests") } - renv::snapshot(dev = TRUE, prompt = prompt) + renv::snapshot(prompt = prompt) ret <- list( dirs = analysis_dirs, rbuildignore = analysis_rbuildignore, gitignore = analysis_gitignore diff --git a/R/upkeep.R b/R/upkeep.R index e10d0d64..b64ae845 100644 --- a/R/upkeep.R +++ b/R/upkeep.R @@ -127,6 +127,15 @@ upkeep_checklist <- function(last_upkeep = last_upkeep_year()) { # nolint: cyclo "" ) } + if (last_upkeep <= 2026 && !renv::settings$snapshot.dev()) { + bullets <- c( + bullets, + "### 2026", + "", + todo("`renv::settings$snapshot.dev(TRUE)`"), + "" + ) + } minimum_r_version <- pkg_minimum_r_version() if (is.na(minimum_r_version) || "3.6.3" > minimum_r_version) minimum_r_version <- "3.6.3" diff --git a/README.md b/README.md index 50b35915..a1102374 100644 --- a/README.md +++ b/README.md @@ -93,7 +93,7 @@ For my workflow, I typically check renv when I start: library(rdev) check_renv() -#> renv::status(dev = TRUE) +#> renv::status() #> No issues found -- the project is in a consistent state. #> #> renv::clean() @@ -107,7 +107,7 @@ locally: ``` r ci() -#> renv::status(dev = TRUE) +#> renv::status() #> No issues found -- the project is in a consistent state. #> #> missing_deps() @@ -234,10 +234,10 @@ ci() #> * creating vignettes ... OK #> * checking for LF line-endings in source and make files and shell scripts #> * checking for empty or unneeded directories -#> * building ‘rdev_1.15.6.tar.gz’ +#> * building ‘rdev_1.16.0.tar.gz’ #> #> ── R CMD check ───────────────────────────────────────────────────────────────── -#> * using log directory ‘/private/var/folders/vn/cw5f9gws42v9m8mdsds_zbl00000gp/T/RtmpqNxoSE/file820a21bb3a1a/rdev.Rcheck’ +#> * using log directory ‘/private/var/folders/vn/cw5f9gws42v9m8mdsds_zbl00000gp/T/RtmpxJhUXI/file155b515153087/rdev.Rcheck’ #> * using R version 4.5.2 (2025-10-31) #> * using platform: aarch64-apple-darwin20 #> * R was compiled by @@ -247,7 +247,7 @@ ci() #> * using session charset: UTF-8 #> * using option ‘--no-manual’ #> * checking for file ‘rdev/DESCRIPTION’ ... OK -#> * this is package ‘rdev’ version ‘1.15.6’ +#> * this is package ‘rdev’ version ‘1.16.0’ #> * package encoding: UTF-8 #> * checking package namespace information ... OK #> * checking package dependencies ... OK @@ -302,8 +302,8 @@ ci() #> * DONE #> #> Status: OK -#> ── R CMD check results ──────────────────────────────────────── rdev 1.15.6 ──── -#> Duration: 26.8s +#> ── R CMD check results ──────────────────────────────────────── rdev 1.16.0 ──── +#> Duration: 26.4s #> #> 0 errors ✔ | 0 warnings ✔ | 0 notes ✔ ``` diff --git a/TODO.md b/TODO.md index 429d319c..493ca227 100644 --- a/TODO.md +++ b/TODO.md @@ -56,8 +56,8 @@ - [x] Remove `preset: bootstrap` workaround when pkgdown 2.0.8+ is released (per ) - [x] Replace `GITHUB_PAT` in `.Renviron` with [gitcreds](https://usethis.r-lib.org/articles/git-credentials.html) - [x] Review use of [usethis functions](https://usethis.r-lib.org/reference/index.html), including [pull request helpers](https://usethis.r-lib.org/articles/pr-functions.html) +- [X] Replace `dev = TRUE` logic after renv 1.1.6+ is released; see renv [#1695](https://github.com/rstudio/renv/issues/1695), [#2190](https://github.com/rstudio/renv/pull/2190) - [ ] Update tests with new testthat features (`testthat::auto_test_package()`, `testthat::describe()`, Reporters, `testthat::local_mocked_bindings()`) -- [ ] Replace `dev = TRUE` logic after renv 1.1.6+ is released; see renv [#1695](https://github.com/rstudio/renv/issues/1695), [#2190](https://github.com/rstudio/renv/pull/2190) - [ ] Update errors and messages after reading Advanced R [Conditions](https://adv-r.hadley.nz/conditions.html) and re-reading the Tidyverse [Style Guide](https://style.tidyverse.org/index.html) - [ ] Reduce the number of Imports, per R CMD check: diff --git a/docs/404.html b/docs/404.html index 7d1b6a31..79b08f95 100644 --- a/docs/404.html +++ b/docs/404.html @@ -27,7 +27,7 @@ rdev - 1.15.6 + 1.16.0