Merge remote-tracking branch 'upstream/main'

Author: TymekDev

.Rbuildignore

@@ -18,4 +18,5 @@
 ^pkgdown$
 ^renv$
 ^renv\.lock$
+^revdep$
 ^scratch$

.github/workflows/end-to-end.yml

@@ -25,7 +25,7 @@ jobs:
         shell: Rscript {0}
 
       - name: Cache R packages
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ${{ env.R_LIBS_USER }}
           key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }}

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

@@ -1,6 +1,7 @@
 on:
   schedule:
     - cron:  '50 8 1,15 * *'
+  workflow_dispatch:
 
 
 name: Hook dependency updates
@@ -32,13 +33,18 @@ 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 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
         run: Rscript inst/update-existing-hook-dependencies.R
       - name: update existing packages
         run: Rscript inst/update-dependency-graph-existing-packages.R
       - name: Create Pull Request
         uses: peter-evans/[email protected]
         with:
+          token: ${{ secrets.PRECOMMIT_HOOK_DEPENDENCY_UPDATE }}
           commit-message: Update renv dependencies
           branch: hook-dependencies-update
           delete-branch: true
@@ -48,5 +54,5 @@ jobs:
             This PR updates the hook dependencies in `renv.lock`, auto-generated by [create-pull-request][1]. Close and re-open this to trigger `on: pull_request` events to circumvent [limitation of GitHub actions](https://github.com/peter-evans/create-pull-request/blob/master/docs/concepts-guidelines.md#push-pull-request-branches-to-a-fork).
 
             [1]: https://github.com/peter-evans/create-pull-request
-            
+          
             

.github/workflows/hook-release.yml

@@ -0,0 +1,14 @@
+name: hook-release 
+
+on:
+  pull_request:
+    types:
+      - closed
+
+jobs:
+  if_merged:
+    if: github.event.pull_request.merged == true && github.head_ref == 'hook-dependencies-update'
+    runs-on: ubuntu-latest
+    steps:
+    - run: |
+        echo The PR was merged

.github/workflows/hook-tests-legacy.yml

@@ -39,21 +39,21 @@ jobs:
         shell: Rscript {0}
       - name: Cache R packages (macOs)
         if: startsWith(runner.os, 'macOS')
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/Library/Application Support/renv
           key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('renv.lock') }}
           restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-
       - name: Cache R packages (Linux)
         if: startsWith(runner.os, 'Linux')
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.local/share/renv
           key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('renv.lock') }}
           restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-
       - name: Cache R packages (Windows)
         if: startsWith(runner.os, 'Windows')
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~\AppData\Local\renv
           key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('renv.lock') }}

.github/workflows/hook-tests.yaml

@@ -34,21 +34,21 @@ jobs:
         shell: Rscript {0}
       - name: Cache R packages (macOs)
         if: startsWith(runner.os, 'macOS')
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/Library/Application Support/renv
           key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('renv.lock') }}
           restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-
       - name: Cache R packages (Linux)
         if: startsWith(runner.os, 'Linux')
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~/.local/share/renv
           key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('renv.lock') }}
           restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-
       - name: Cache R packages (Windows)
         if: startsWith(runner.os, 'Windows')
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: ~\AppData\Local\renv
           key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('renv.lock') }}

.github/workflows/pkgdown.yaml

@@ -39,7 +39,7 @@ jobs:
 
       - name: Deploy to GitHub pages 🚀
         if: github.event_name != 'pull_request'
-        uses: JamesIves/github-pages-deploy-action@v4.4.3
+        uses: JamesIves/github-pages-deploy-action@v4.5.0
         with:
           clean: false
           branch: gh-pages

.pre-commit-config.yaml

@@ -2,7 +2,7 @@
 # R specific hooks: https://github.com/lorenzwalthert/precommit
 repos:
 -   repo: https://github.com/lorenzwalthert/precommit
-    rev: v0.3.2.9019
+    rev: v0.4.0
     hooks: 
     -   id: style-files
         args: [--style_pkg=styler, --style_fun=tidyverse_style, --cache-root=styler-perm]
@@ -60,6 +60,7 @@ repos:
           inst/usethis-legacy-hook|
           LICENSE|
           renv/.*|
+          revdep/.*|
           tests/testthat/in/.*|
           )$
     -   id: readme-rmd-rendered
@@ -83,23 +84,24 @@ 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|
           renv/activate.R|
           vignettes/FAQ\.Rmd|
           )$
     -   id: pkgdown
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks: 
     -   id: check-added-large-files
     -   id: end-of-file-fixer
         exclude: '\.Rd' # sometimes roxygen fails to generate EOF blank line.
     -   id: file-contents-sorter
         files: '^\.Rbuildignore$'
 -   repo: https://github.com/pre-commit-ci/pre-commit-ci-config
-    rev: v1.5.1
+    rev: v1.6.1
     hooks:
     # Only required when https://pre-commit.ci is used for config validation
     -   id: check-pre-commit-ci-config
@@ -117,11 +119,12 @@ repos:
         -    docopt
         -    fs
         -    yaml
-        -    purrr 
-        -    rlang 
+        -    purrr
+        -    glue
+        -    rlang
         -    git2r
         -    desc
-        -    glue
+        -    lorenzwalthert/precommit
         stages: [commit, push]
     -   id: hooks-config-to-inst
         name: hooks-config-to-inst

API

@@ -11,6 +11,7 @@ open_config(root = here::here())
 open_wordlist(root = here::here())
 path_pre_commit_exec(check_if_exists = TRUE)
 path_precommit_exec(check_if_exists = TRUE)
+precommit_docopt(doc, args = commandArgs(trailingOnly = TRUE), ...)
 robust_purl(path)
 roxygen_assert_additional_dependencies()
 roxygenize_with_cache(key, dirs)

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: precommit
 Title: Pre-Commit Hooks
-Version: 0.3.2.9020
+Version: 0.4.0.9000
 Author: Lorenz Walthert
 Maintainer: Lorenz Walthert <[email protected]>
 Description: Useful git hooks for R building on top of the multi-language
@@ -48,5 +48,5 @@ Roxygen: list(markdown = TRUE, roclets = c( "rd", "namespace", "collate",
     if (rlang::is_installed("pkgapi")) "pkgapi::api_roclet" else {
     warning("Please install r-lib/pkgapi to make sure the file API is kept
     up to date"); NULL} ) )
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.0
 SystemRequirements: git