Merge branch 'r-lib:main' into main

.covrignore

@@ -1,3 +1,3 @@
 R/deprec-*.R
 R/compat-*.R
-R/usethis-defunct.R
+R/usethis-deprecated.R

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

@@ -10,7 +10,9 @@ on:
   pull_request:
     branches: [main, master]
 
-name: R-CMD-check
+name: R-CMD-check.yaml
+
+permissions: read-all
 
 jobs:
   R-CMD-check:
@@ -25,17 +27,15 @@ 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'}
+          # 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'}
+          - {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 }}
@@ -54,7 +54,7 @@ jobs:
 
       - uses: r-lib/actions/setup-r-dependencies@v2
         with:
-          extra-packages: any::rcmdcheck, magick=?ignore-before-r=4.0.0
+          extra-packages: any::rcmdcheck
           needs: check
 
       - name: Configure Git User
@@ -64,8 +64,6 @@ jobs:
           git config --global user.email 41898282+github-actions[bot]@users.noreply.github.com
 
       - uses: r-lib/actions/check-r-package@v2
-        env:
-          _R_CALLS_INVALID_NUMERIC_VERSION_: true
-          _R_CHECK_FORCE_SUGGESTS_: false
         with:
           upload-snapshots: true
+          build_args: 'c("--no-manual","--compact-vignettes=gs+qpdf")'

.github/workflows/pkgdown.yaml

@@ -9,7 +9,9 @@ on:
     types: [published]
   workflow_dispatch:
 
-name: pkgdown
+name: pkgdown.yaml
+
+permissions: read-all
 
 jobs:
   pkgdown:

.github/workflows/pr-commands.yaml

@@ -4,7 +4,9 @@ on:
   issue_comment:
     types: [created]
 
-name: Commands
+name: pr-commands.yaml
+
+permissions: read-all
 
 jobs:
   document:
@@ -13,6 +15,8 @@ jobs:
     runs-on: ubuntu-latest
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+    permissions:
+      contents: write
     steps:
       - uses: actions/checkout@v4
 
@@ -50,6 +54,8 @@ jobs:
     runs-on: ubuntu-latest
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+    permissions:
+      contents: write
     steps:
       - uses: actions/checkout@v4
 

.github/workflows/test-coverage.yaml

@@ -6,7 +6,9 @@ on:
   pull_request:
     branches: [main, master]
 
-name: test-coverage
+name: test-coverage.yaml
+
+permissions: read-all
 
 jobs:
   test-coverage:
@@ -23,7 +25,7 @@ jobs:
 
       - uses: r-lib/actions/setup-r-dependencies@v2
         with:
-          extra-packages: any::covr
+          extra-packages: any::covr, any::xml2
           needs: coverage
 
       - name: git config
@@ -33,18 +35,27 @@ jobs:
 
       - 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")
           )
+          covr::to_cobertura(cov)
         shell: Rscript {0}
 
+      - uses: codecov/codecov-action@v4
+        with:
+          fail_ci_if_error: ${{ github.event_name != 'pull_request' && true || false }}
+          file: ./cobertura.xml
+          plugin: 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

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: usethis
 Title: Automate Package and Project Setup
-Version: 2.2.3.9000
+Version: 3.0.0.9000
 Authors@R: c(
     person("Hadley", "Wickham", , "hadley@posit.co", role = "aut",
            comment = c(ORCID = "0000-0003-4757-117X")),
@@ -19,9 +19,9 @@ Description: Automate package and project setup tasks that are otherwise
 License: MIT + file LICENSE
 URL: https://usethis.r-lib.org, https://github.com/r-lib/usethis
 BugReports: https://github.com/r-lib/usethis/issues
-Depends: 
+Depends:
     R (>= 3.6)
-Imports: 
+Imports:
     cli (>= 3.0.1),
     clipr (>= 0.3.0),
     crayon,
@@ -39,11 +39,12 @@ Imports:
     rprojroot (>= 1.2),
     rstudioapi,
     stats,
+    tools,
     utils,
     whisker,
     withr (>= 2.3.0),
     yaml
-Suggests: 
+Suggests:
     covr,
     knitr,
     magick,
@@ -60,4 +61,4 @@ Config/testthat/start-first: github-actions, release
 Encoding: UTF-8
 Language: en-US
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.3.1
+RoxygenNote: 7.3.2

NAMESPACE

@@ -11,12 +11,9 @@ export(browse_cran)
 export(browse_github)
 export(browse_github_actions)
 export(browse_github_issues)
-export(browse_github_pat)
 export(browse_github_pulls)
-export(browse_github_token)
 export(browse_package)
 export(browse_project)
-export(browse_travis)
 export(create_download_url)
 export(create_from_github)
 export(create_github_token)
@@ -36,7 +33,6 @@ export(edit_rstudio_snippets)
 export(edit_template)
 export(gh_token_help)
 export(git_branch_default)
-export(git_credentials)
 export(git_default_branch)
 export(git_default_branch_configure)
 export(git_default_branch_rediscover)
@@ -45,7 +41,6 @@ export(git_protocol)
 export(git_remotes)
 export(git_sitrep)
 export(git_vaccinate)
-export(github_token)
 export(issue_close_community)
 export(issue_reprex_needed)
 export(local_project)
@@ -56,10 +51,8 @@ export(pr_init)
 export(pr_merge_main)
 export(pr_pause)
 export(pr_pull)
-export(pr_pull_upstream)
 export(pr_push)
 export(pr_resume)
-export(pr_sync)
 export(pr_view)
 export(proj_activate)
 export(proj_get)
@@ -92,8 +85,6 @@ export(use_agpl3_license)
 export(use_agpl_license)
 export(use_apache_license)
 export(use_apl2_license)
-export(use_appveyor)
-export(use_appveyor_badge)
 export(use_article)
 export(use_author)
 export(use_badge)
@@ -127,7 +118,6 @@ export(use_devtools)
 export(use_directory)
 export(use_git)
 export(use_git_config)
-export(use_git_credentials)
 export(use_git_hook)
 export(use_git_ignore)
 export(use_git_protocol)
@@ -165,7 +155,6 @@ export(use_partial_warnings)
 export(use_pipe)
 export(use_pkgdown)
 export(use_pkgdown_github_pages)
-export(use_pkgdown_travis)
 export(use_posit_cloud_badge)
 export(use_proprietary_license)
 export(use_r)
@@ -186,9 +175,9 @@ export(use_spell_check)
 export(use_standalone)
 export(use_template)
 export(use_test)
+export(use_test_helper)
 export(use_testthat)
 export(use_tibble)
-export(use_tidy_ci)
 export(use_tidy_coc)
 export(use_tidy_contributing)
 export(use_tidy_dependencies)
@@ -198,14 +187,11 @@ export(use_tidy_github)
 export(use_tidy_github_actions)
 export(use_tidy_github_labels)
 export(use_tidy_issue_template)
-export(use_tidy_labels)
 export(use_tidy_logo)
 export(use_tidy_style)
 export(use_tidy_support)
 export(use_tidy_thanks)
 export(use_tidy_upkeep_issue)
-export(use_travis)
-export(use_travis_badge)
 export(use_tutorial)
 export(use_upkeep_issue)
 export(use_usethis)