Replace DEV = TRUE with snapshot.dev

Author: jabenninghoff

DESCRIPTION

@@ -34,7 +34,7 @@ Imports:
     quarto,
     rcmdcheck,
     remotes,
-    renv (>= 1.0.3),
+    renv (>= 1.1.6),
     rlang,
     rmarkdown,
     rstudioapi,

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()`

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))
     }

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

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"

TODO.md

@@ -56,8 +56,8 @@
 - [x] Remove `preset: bootstrap` workaround when pkgdown 2.0.8+ is released (per <https://github.com/r-lib/pkgdown/issues/2376>)
 - [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:
 

man/check_renv.Rd

@@ -18,7 +18,7 @@ test_that("All renv functions are called, unless set to FALSE", {
   begin <- "^"
   end <- "$"
   sep <- "\\n\\n"
-  status <- "renv::status\\(dev = TRUE\\)"
+  status <- "renv::status\\(\\)"
   clean <- "renv::clean\\(\\)"
   update <- "renv::update\\(\\)"
 
@@ -121,7 +121,7 @@ test_that("All renv functions are called according to ci logic", {
   begin <- "^"
   end <- "$"
   sep <- "\\n\\n"
-  renv <- "renv::status\\(dev = TRUE\\)"
+  renv <- "renv::status\\(\\)"
   missing <- "missing_deps\\(\\)"
   pkgdown <- "pkgdown::check_pkgdown\\(\\)"
   styler <- "style_all\\(\\)"

man/ci.Rd

@@ -18,11 +18,12 @@ test_that("use_upkeep_issue validates arguments", {
 
 # upkeep_checklist
 
-base_length <- 43
+base_length <- 47
 
 test_that("upkeep_checklist is expected length for first upkeep", {
   usethis::ui_silence(local_temppkg(type = "rdev"))
   mockery::stub(upkeep_checklist, "desc::desc_has_dep", TRUE)
+  mockery::stub(upkeep_checklist, "renv::settings$snapshot.dev", FALSE)
 
   # get_license() "mit", package_type() "rdev", pkg_minimum_r_version NA, r_version character(0),
   # usethis::git_default_branch() "master", no inst/templates or inst/rmarkdown/templates
@@ -63,11 +64,15 @@ test_that("upkeep_checklist is expected length for first upkeep", {
 
   mockery::stub(upkeep_checklist, "desc::desc_has_dep", FALSE)
   expect_length(upkeep_checklist(), base_length)
+
+  mockery::stub(upkeep_checklist, "renv::settings$snapshot.dev", FALSE)
+  expect_length(upkeep_checklist(), base_length)
 })
 
 test_that("upkeep_checklist is expected length for last upkeep year", {
   usethis::ui_silence(local_temppkg(type = "rdev"))
   mockery::stub(upkeep_checklist, "desc::desc_has_dep", TRUE)
+  mockery::stub(upkeep_checklist, "renv::settings$snapshot.dev", FALSE)
 
   expect_length(upkeep_checklist(), base_length)
   expect_length(upkeep_checklist(2021), base_length)
@@ -76,4 +81,5 @@ test_that("upkeep_checklist is expected length for last upkeep year", {
   expect_length(upkeep_checklist(2024), base_length - 16)
   expect_length(upkeep_checklist(2025), base_length - 16)
   expect_length(upkeep_checklist(2026), base_length - 30)
+  expect_length(upkeep_checklist(2027), base_length - 34)
 })