Merge pull request #539 from lorenzwalthert/dev-hook-dependency-update-fix

Fix hook dependency updates

[ci skip]

Author: lorenzwalthert

.github/workflows/hook-dependencies-update.yml

@@ -33,8 +33,8 @@ jobs:
           Rscript -e "install.packages('remotes'); remotes::install_github('r-hub/sysreqs')"
           sysreqs=$(Rscript -e "cat(sysreqs::sysreq_commands('DESCRIPTION'))")
           sudo -s eval "$sysreqs"
-      - name: install renv
-        run: Rscript -e "install.packages('renv')"
+      - name: install runtime dependencies
+        run: Rscript -e "install.packages(c('renv', 'jsonlite'))"
       - name: update PPM URL
         run: Rscript inst/update-ppm-url.R
       - name: update dependency graph among packages

.pre-commit-config.yaml

@@ -83,7 +83,7 @@ repos:
           (?x)^(
           inst/hooks/exported/pkgdown.R|
           tests/testthat/in/.*|
-          inst/renv-update\.R|
+          inst/update-renv-prepare.R|
           inst/update-ppm-url.R|
           inst/update-dependency-graph-existing-packages\.R|
           inst/update-existing-hook-dependencies\.R|

inst/update-dependency-graph-existing-packages.R

@@ -1,5 +1,3 @@
-source("renv/activate.R")
-
 hook_deps <- function(root) {
   out <- renv::dependencies("inst/hooks/exported/")$Package
   desc <- desc::desc()
@@ -14,14 +12,9 @@ hook_deps <- function(root) {
   out <- names(renv:::renv_package_dependencies(out))
   return(sort(out))
 }
-options(
-  # repos = c(
-  #   RSPM = "https://packagemanager.rstudio.com/all/latest",
-  #   CRAN = "https://cran.rstudio.com"
-  # ),
-  install.packages.compile.from.source = "never"
-)
 
+source("inst/update-renv-prepare.R")
+source("renv/activate.R")
 options(renv.snapshot.filter = hook_deps)
 
 renv::snapshot(type = "custom", prompt = FALSE)

inst/update-existing-hook-dependencies.R

@@ -1,12 +1,6 @@
-source("renv/activate.R")
-
-options(
-  repos = c(RSPM = renv::lockfile_read()$R$Repositories$RSPM), # CRAN is not an option, always use PPM
-  install.packages.check.source = "no", # don't check if source packages are available
-  install.packages.compile.from.source = "never" # probably redundant with the above 'no': If source package is available, only use source if no code needs to be compiled (needs compilation flag on CRAN).
-)
-renv::install("jsonlite")
+source("inst/update-renv-prepare.R")
 renv_deps <- names(jsonlite::read_json("renv.lock")$Packages)
+source("renv/activate.R")
 renv::load()
 renv::restore(prompt = FALSE)
 can_be_updated <- renv::update(setdiff(renv_deps, "renv"), prompt = FALSE, check = FALSE)

inst/update-renv-prepare.R

@@ -0,0 +1,4 @@
+options(
+  install.packages.check.source = "no", # don't check if source packages are available
+  install.packages.compile.from.source = "never" # probably redundant with the above 'no': If source package is available, only use source if no code needs to be compiled (needs compilation flag on CRAN).
+)

renv.lock

@@ -5,10 +5,6 @@
       {
         "Name": "RSPM",
         "URL": "https://packagemanager.posit.co/cran/2023-11-17"
-      },
-      {
-        "Name": "CRAN",
-        "URL": "https://cran.rstudio.com"
       }
     ]
   },