Merge branch 'main' into pkgdown

Author: olivroy

.github/workflows/R-CMD-check.yaml

@@ -8,9 +8,10 @@ on:
   push:
     branches: [main, master]
   pull_request:
-    branches: [main, master]
 
-name: R-CMD-check
+name: R-CMD-check.yaml
+
+permissions: read-all
 
 jobs:
   R-CMD-check:
@@ -25,24 +26,28 @@ jobs:
           - {os: macos-latest,   r: 'release'}
 
           - {os: windows-latest, r: 'release'}
-          # Use 3.6 to trigger usage of RTools35
-          - {os: windows-latest, r: '3.6'}
-          # use 4.1 to check with rtools40's older compiler
-          - {os: windows-latest, r: '4.1'}
-
-          - {os: ubuntu-latest,   r: 'devel', http-user-agent: 'release'}
-          - {os: ubuntu-latest,   r: 'release'}
-          - {os: ubuntu-latest,   r: 'oldrel-1'}
-          - {os: ubuntu-latest,   r: 'oldrel-2'}
-          - {os: ubuntu-latest,   r: 'oldrel-3'}
-          - {os: ubuntu-latest,   r: 'oldrel-4'}
+          # specifying oldrel-3 instead of oldrel-4, because ragg is a problem
+          # and that's what ragg itself is doing (???)
+          # seems like we lose coverage of rtools40's compiler, but that also
+          # doesn't seem like a devtools problem
+          # https://github.com/r-lib/ragg/pull/195/commits/0ce19424eab2dad15b38b41992804e3226d86e22
+          - {os: windows-latest, r: 'oldrel-3'}
+          # use 4.0 or 4.1 to check with rtools40's older compiler
+          #- {os: windows-latest, r: 'oldrel-4'}
+
+          - {os: ubuntu-latest,  r: 'devel', http-user-agent: 'release'}
+          - {os: ubuntu-latest,  r: 'release'}
+          - {os: ubuntu-latest,  r: 'oldrel-1'}
+          - {os: ubuntu-latest,  r: 'oldrel-2'}
+          - {os: ubuntu-latest,  r: 'oldrel-3'}
+          - {os: ubuntu-latest,  r: 'oldrel-4'}
 
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
       R_KEEP_PKG_SOURCE: yes
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/setup-pandoc@v2
 
@@ -60,3 +65,4 @@ jobs:
       - uses: r-lib/actions/check-r-package@v2
         with:
           upload-snapshots: true
+          build_args: 'c("--no-manual","--compact-vignettes=gs+qpdf")'

.github/workflows/pkgdown.yaml

@@ -4,12 +4,13 @@ on:
   push:
     branches: [main, master]
   pull_request:
-    branches: [main, master]
   release:
     types: [published]
   workflow_dispatch:
 
-name: pkgdown
+name: pkgdown.yaml
+
+permissions: read-all
 
 jobs:
   pkgdown:
@@ -22,7 +23,7 @@ jobs:
     permissions:
       contents: write
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/setup-pandoc@v2
 
@@ -41,7 +42,7 @@ jobs:
 
       - name: Deploy to GitHub pages 🚀
         if: github.event_name != 'pull_request'
-        uses: JamesIves/github-pages-deploy-action@v4.4.1
+        uses: JamesIves/github-pages-deploy-action@v4.5.0
         with:
           clean: false
           branch: gh-pages

.github/workflows/pr-commands.yaml

@@ -6,6 +6,8 @@ on:
 
 name: Commands
 
+permissions: read-all
+
 jobs:
   document:
     if: ${{ github.event.issue.pull_request && (github.event.comment.author_association == 'MEMBER' || github.event.comment.author_association == 'OWNER') && startsWith(github.event.comment.body, '/document') }}
@@ -14,7 +16,7 @@ jobs:
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/pr-fetch@v2
         with:
@@ -51,7 +53,7 @@ jobs:
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/pr-fetch@v2
         with:

.github/workflows/test-coverage.yaml

@@ -4,9 +4,10 @@ on:
   push:
     branches: [main, master]
   pull_request:
-    branches: [main, master]
 
-name: test-coverage
+name: test-coverage.yaml
+
+permissions: read-all
 
 jobs:
   test-coverage:
@@ -15,36 +16,47 @@ jobs:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - uses: r-lib/actions/setup-r@v2
         with:
           use-public-rspm: true
 
       - uses: r-lib/actions/setup-r-dependencies@v2
         with:
-          extra-packages: any::covr
+          extra-packages: any::covr, any::xml2
           needs: coverage
 
       - name: Test coverage
         run: |
-          covr::codecov(
+          cov <- covr::package_coverage(
             quiet = FALSE,
             clean = FALSE,
             install_path = file.path(normalizePath(Sys.getenv("RUNNER_TEMP"), winslash = "/"), "package")
           )
+          print(cov)
+          covr::to_cobertura(cov)
         shell: Rscript {0}
 
+      - uses: codecov/codecov-action@v5
+        with:
+          # Fail if error if not on PR, or if on PR and token is given
+          fail_ci_if_error: ${{ github.event_name != 'pull_request' || secrets.CODECOV_TOKEN }}
+          files: ./cobertura.xml
+          plugins: noop
+          disable_search: true
+          token: ${{ secrets.CODECOV_TOKEN }}
+
       - name: Show testthat output
         if: always()
         run: |
           ## --------------------------------------------------------------------
-          find ${{ runner.temp }}/package -name 'testthat.Rout*' -exec cat '{}' \; || true
+          find '${{ runner.temp }}/package' -name 'testthat.Rout*' -exec cat '{}' \; || true
         shell: bash
 
       - name: Upload test results
         if: failure()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: coverage-test-failures
           path: ${{ runner.temp }}/package

DESCRIPTION

@@ -1,47 +1,47 @@
 Package: devtools
 Title: Tools to Make Developing R Packages Easier
-Version: 2.4.5.9000
+Version: 2.4.6.9000
 Authors@R: c(
     person("Hadley", "Wickham", role = "aut"),
     person("Jim", "Hester", role = "aut"),
     person("Winston", "Chang", role = "aut"),
     person("Jennifer", "Bryan", , "[email protected]", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0002-6983-2759")),
-    person("Posit Software, PBC", role = c("cph", "fnd"))
+    person("Posit Software, PBC", role = c("cph", "fnd"),
+           comment = c(ROR = "03wc8by49"))
   )
 Description: Collection of package development tools.
 License: MIT + file LICENSE
 URL: https://devtools.r-lib.org/, https://github.com/r-lib/devtools
 BugReports: https://github.com/r-lib/devtools/issues
-Depends: 
-    R (>= 3.6),
-    usethis (>= 2.1.6)
-Imports: 
-    cli (>= 3.3.0),
-    desc (>= 1.4.1),
+Depends:
+    R (>= 4.1),
+    usethis (>= 3.2.1)
+Imports:
+    cli (>= 3.6.5),
+    desc (>= 1.4.3),
     ellipsis (>= 0.3.2),
-    fs (>= 1.5.2),
-    lifecycle (>= 1.0.1),
+    fs (>= 1.6.6),
+    lifecycle (>= 1.0.4),
     memoise (>= 2.0.1),
-    miniUI (>= 0.1.1.1),
-    pkgbuild (>= 1.3.1),
-    pkgdown (>= 2.0.6),
-    pkgload (>= 1.3.0),
-    profvis (>= 0.3.7),
+    miniUI (>= 0.1.2),
+    pkgbuild (>= 1.4.8),
+    pkgdown (>= 2.1.3),
+    pkgload (>= 1.4.1),
+    profvis (>= 0.4.0),
     rcmdcheck (>= 1.4.0),
-    remotes (>= 2.4.2),
-    rlang (>= 1.0.4),
-    roxygen2 (>= 7.2.1),
-    rprojroot (>= 2.0.4),
-    rversions (>= 2.1.1),
-    sessioninfo (>= 1.2.2),
+    remotes (>= 2.5.0),
+    rlang (>= 1.1.6),
+    roxygen2 (>= 7.3.3),
+    rversions (>= 2.1.2),
+    sessioninfo (>= 1.2.3),
     stats,
-    testthat (>= 3.2.0),
+    testthat (>= 3.2.3),
     tools,
     urlchecker (>= 1.0.1),
     utils,
-    withr (>= 2.5.0)
-Suggests: 
+    withr (>= 3.0.2)
+Suggests:
     BiocManager (>= 1.30.18),
     callr (>= 3.7.1),
     covr (>= 3.5.1),
@@ -61,11 +61,11 @@ Suggests:
     rmarkdown (>= 2.14),
     rstudioapi (>= 0.13),
     spelling (>= 2.2)
-VignetteBuilder: 
+VignetteBuilder:
     knitr
 Config/Needs/website: tidyverse/tidytemplate
 Config/testthat/edition: 3
 Encoding: UTF-8
 Language: en-US
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.3

LICENSE

@@ -1,2 +1,2 @@
-YEAR: 2023
+YEAR: 2025
 COPYRIGHT HOLDER: devtools authors

LICENSE.md

@@ -1,6 +1,6 @@
 # MIT License
 
-Copyright (c) 2023 devtools authors
+Copyright (c) 2025 devtools authors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

NEWS.md

@@ -2,11 +2,18 @@
 
 * `check()` now runs `pkgdown::check_pkgdown()` optionally (@olivroy, #2449)
 
+# devtools 2.4.6
+
+* Functions that use httr now explicitly check that it is installed
+  (@catalamarti, #2573).
+
 * `test_coverage()` now works if the package has not been installed.
 
 * `test_coverage_active_file()` now reports if any tests failed and does
   a better job of executing snapshot comparisons.
 
+* `dev_mode()` and `check_rhub()` are deprecated.
+
 # devtools 2.4.5
 
 * `check(cleanup =)` was deprecated in devtools v1.11.0 (2016-04-12) and was
@@ -525,7 +532,7 @@ you should switch your package to depend on **usethis** directly instead.
 * `document()`, `load_all()`, `check()`, `build()` and `test()` now
   automatically save open files when they are run inside the RStudio IDE. (#1576)
 
-* New `check_rhub()` function to check packages using <https://builder.r-hub.io/>.
+* New `check_rhub()` function to check packages using `https://builder.r-hub.io/`.
 
 * `run_examples` was mistakenly passing `show` to
   `pkgload::run_example`, causing it to fail (@amcdavid, #1449)

R/check-mac.R

@@ -40,6 +40,7 @@ check_mac_release <- function(pkg = ".", dep_pkgs = character(), args = NULL, ma
 
   url <- "https://mac.r-project.org/macbuilder/v1/submit"
 
+  rlang::check_installed("httr")
   body <- list(pkgfile = httr::upload_file(built_path))
 
   if (length(dep_built_paths) > 0) {
@@ -65,7 +66,7 @@ check_mac_release <- function(pkg = ".", dep_pkgs = character(), args = NULL, ma
 
     cli::cat_rule(col = "cyan")
     cli::cli_inform(c(
-      i = "Check {.url {response_url}} the results in 5-10 mins (~{time})."
+      i = "Check {.url {response_url}} for the results in 5-10 mins (~{time})."
     ))
   }
 

R/check.R

@@ -45,7 +45,7 @@
 #' @param pkgdown Should run [pkgdown::check_pkgdown()]?
 #' @param ... Additional arguments passed on to [pkgbuild::build()].
 #' @param vignettes If `FALSE`, do not build or check vignettes, equivalent to
-#'   using `args = '--ignore-vignettes' and `build_args = '--no-build-vignettes'.
+#'   using `args = '--ignore-vignettes'` and `build_args = '--no-build-vignettes'`.
 #' @param cleanup `r lifecycle::badge("deprecated")` See `check_dir` for details.
 #' @seealso [release()] if you want to send the checked package to
 #'   CRAN.