Merge pull request #475 from lorenzwalthert/update-dependencies

Hook dependency updates

Author: lorenzwalthert

.Rbuildignore

@@ -13,6 +13,8 @@
 ^inst/WORDLIST$
 ^inst/hooks/local$
 ^inst/renv-update\.R$
+^inst/update-dependency-graph-existing-packages\.R$
+^inst/update-existing-hook-dependencies\.R$
 ^pkgdown$
 ^renv$
 ^renv\.lock$

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

@@ -31,45 +31,9 @@ jobs:
           sysreqs=$(Rscript -e "cat(sysreqs::sysreq_commands('DESCRIPTION'))")
           sudo -s eval "$sysreqs"
       - name: update existing packages
-        run: |
-          options(
-              repos = c(
-                RSPM = "https://packagemanager.rstudio.com/all/latest",
-                CRAN = "https://cran.rstudio.com"
-              ), 
-              install.packages.compile.from.source = "never"
-          )
-          install.packages("renv")
-          install.packages("jsonlite")
-          renv_deps <- names(jsonlite::read_json("renv.lock")$Packages)
-          renv::load()
-          renv::restore(prompt = FALSE)
-          can_be_updated <- renv::update(renv_deps, prompt = FALSE, check = FALSE)
-          renv::snapshot(packages = renv_deps, prompt = FALSE)
-        shell: Rscript {0}
+        run: Rscript inst/update-dependency-graph-existing-packages.R
       - name: update dependency graph among packages
-        run: |
-          # also see corresponding files to update
-          hook_deps <- function(root) {
-            out <- renv::dependencies("inst/hooks/exported/")$Package
-            desc <- desc::desc()
-            deps <- desc$get_deps()
-            dont <- c(
-              "yaml", "usethis", "withr", "rstudioapi", "precommit",
-              "pkgdown", "mockery",
-              "httr"
-            )
-            out <- c(out, "roxygen2", "spelling", "styler", "pkgload", "lintr", "knitr", "git2r", "desc", "mockery")
-            out <- setdiff(c(unique(c(out, deps[deps$type == "Imports", ]$package))), dont)
-            out <- names(renv:::renv_package_dependencies(out))
-            return(sort(out))
-          }
-          options(repos = c(CRAN = "https://packagemanager.rstudio.com/all/latest"))
-          options(renv.snapshot.filter = hook_deps)
-          
-          renv::snapshot(type = "custom", prompt = FALSE)
-          # or renv::snapshot(packages = hook_deps(), prompt = FALSE)
-        shell: Rscript {0}
+        run: Rscript inst/update-existing-hook-dependencies.R
       - name: Create Pull Request
         uses: peter-evans/[email protected]
         with:

.pre-commit-config.yaml

@@ -59,6 +59,7 @@ repos:
           inst/pre-commit-.*|
           inst/usethis-legacy-hook|
           LICENSE|
+          renv/.*|
           tests/testthat/in/.*|
           )$
     -   id: readme-rmd-rendered
@@ -80,9 +81,11 @@ repos:
     -   id: deps-in-desc
         exclude: > 
           (?x)^(
+          inst/hooks/exported/pkgdown.R|
           tests/testthat/in/.*|
           inst/renv-update\.R|
-          inst/hooks/exported/pkgdown.R|
+          inst/update-dependency-graph-existing-packages\.R|
+          inst/update-existing-hook-dependencies\.R|
           renv/activate.R|
           vignettes/FAQ\.Rmd|
           )$

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

@@ -0,0 +1,25 @@
+hook_deps <- function(root) {
+  out <- renv::dependencies("inst/hooks/exported/")$Package
+  desc <- desc::desc()
+  deps <- desc$get_deps()
+  dont <- c(
+    "yaml", "usethis", "withr", "rstudioapi", "precommit",
+    "pkgdown", "mockery",
+    "httr"
+  )
+  out <- c(out, "roxygen2", "spelling", "styler", "pkgload", "lintr", "knitr", "git2r", "desc", "mockery")
+  out <- setdiff(c(unique(c(out, deps[deps$type == "Imports", ]$package))), dont)
+  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"
+)
+
+options(renv.snapshot.filter = hook_deps)
+
+renv::snapshot(type = "custom", prompt = FALSE)

inst/update-existing-hook-dependencies.R

@@ -0,0 +1,11 @@
+options(
+  repos = c(CRAN = "https://packagemanager.rstudio.com/all/latest"),
+  install.packages.compile.from.source = "never"
+)
+install.packages("renv")
+install.packages("jsonlite")
+renv_deps <- names(jsonlite::read_json("renv.lock")$Packages)
+renv::load()
+renv::restore(prompt = FALSE)
+can_be_updated <- renv::update(renv_deps, prompt = FALSE, check = FALSE)
+renv::snapshot(packages = renv_deps, prompt = FALSE)