From 2d7852dce03ecc14daa9f1a9fff5a348eeb154a3 Mon Sep 17 00:00:00 2001 From: olivroy Date: Thu, 25 Apr 2024 13:31:38 -0400 Subject: [PATCH 1/7] Update snapshots with tidyselect 1.2.1 --- tests/testthat/_snaps/drop-na.md | 4 ++-- tests/testthat/_snaps/pivot-wide.md | 6 +++--- tests/testthat/_snaps/separate-longer.md | 2 +- tests/testthat/_snaps/separate-wider.md | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/testthat/_snaps/drop-na.md b/tests/testthat/_snaps/drop-na.md index abf9c673c..3b5302b26 100644 --- a/tests/testthat/_snaps/drop-na.md +++ b/tests/testthat/_snaps/drop-na.md @@ -5,7 +5,7 @@ Output Error in `drop_na()`: - ! Can't subset columns with `list()`. + ! Can't select columns with `list()`. x `list()` must be numeric or character, not an empty list. --- @@ -15,6 +15,6 @@ Output Error in `drop_na()`: - ! Can't subset columns that don't exist. + ! Can't select columns that don't exist. x Column `z` doesn't exist. diff --git a/tests/testthat/_snaps/pivot-wide.md b/tests/testthat/_snaps/pivot-wide.md index ebee7b210..222f39a1d 100644 --- a/tests/testthat/_snaps/pivot-wide.md +++ b/tests/testthat/_snaps/pivot-wide.md @@ -26,7 +26,7 @@ Output Error in `pivot_wider()`: - ! Can't subset columns that don't exist. + ! Can't select columns that don't exist. x Column `name` doesn't exist. # `values_from` must be supplied if `value` isn't in `data` (#1240) @@ -36,7 +36,7 @@ Output Error in `pivot_wider()`: - ! Can't subset columns that don't exist. + ! Can't select columns that don't exist. x Column `value` doesn't exist. # `names_from` must identify at least 1 column (#1240) @@ -165,7 +165,7 @@ Output Error in `pivot_wider()`: - ! Can't subset columns that don't exist. + ! Can't select columns that don't exist. x Column `foo` doesn't exist. # named `id_cols` gives clear error (#1104) diff --git a/tests/testthat/_snaps/separate-longer.md b/tests/testthat/_snaps/separate-longer.md index a4723ad9a..53911b282 100644 --- a/tests/testthat/_snaps/separate-longer.md +++ b/tests/testthat/_snaps/separate-longer.md @@ -22,7 +22,7 @@ df %>% separate_longer_position(y, width = 1) Condition Error in `separate_longer_position()`: - ! Can't subset columns that don't exist. + ! Can't select columns that don't exist. x Column `y` doesn't exist. Code df %>% separate_longer_position(x, width = 1.5) diff --git a/tests/testthat/_snaps/separate-wider.md b/tests/testthat/_snaps/separate-wider.md index 904dfad89..bf9dcf537 100644 --- a/tests/testthat/_snaps/separate-wider.md +++ b/tests/testthat/_snaps/separate-wider.md @@ -184,7 +184,7 @@ df %>% separate_wider_regex(y, patterns = c(x = "-")) Condition Error in `separate_wider_regex()`: - ! Can't subset columns that don't exist. + ! Can't select columns that don't exist. x Column `y` doesn't exist. Code df %>% separate_wider_regex(x, patterns = ".") From cea59ca34fc87fa28b19e95b040f9e18369cd35c Mon Sep 17 00:00:00 2001 From: olivroy Date: Thu, 25 Apr 2024 13:32:25 -0400 Subject: [PATCH 2/7] document with roxygen2 7.3.1 (just topic reordering) --- DESCRIPTION | 2 +- man/hoist.Rd | 4 ++-- man/unnest_longer.Rd | 4 ++-- man/unnest_wider.Rd | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 43f3df557..e1960342b 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -50,4 +50,4 @@ Config/testthat/edition: 3 Encoding: UTF-8 LazyData: true Roxygen: list(markdown = TRUE) -RoxygenNote: 7.3.0 +RoxygenNote: 7.3.1 diff --git a/man/hoist.Rd b/man/hoist.Rd index f830cee96..e840c912d 100644 --- a/man/hoist.Rd +++ b/man/hoist.Rd @@ -97,8 +97,8 @@ df \%>\% hoist(metadata, } \seealso{ Other rectangling: +\code{\link{unnest}()}, \code{\link{unnest_longer}()}, -\code{\link{unnest_wider}()}, -\code{\link{unnest}()} +\code{\link{unnest_wider}()} } \concept{rectangling} diff --git a/man/unnest_longer.Rd b/man/unnest_longer.Rd index 6d8245d48..b26cdeca9 100644 --- a/man/unnest_longer.Rd +++ b/man/unnest_longer.Rd @@ -140,7 +140,7 @@ df \%>\% \seealso{ Other rectangling: \code{\link{hoist}()}, -\code{\link{unnest_wider}()}, -\code{\link{unnest}()} +\code{\link{unnest}()}, +\code{\link{unnest_wider}()} } \concept{rectangling} diff --git a/man/unnest_wider.Rd b/man/unnest_wider.Rd index 6044960fa..00b8f305b 100644 --- a/man/unnest_wider.Rd +++ b/man/unnest_wider.Rd @@ -142,7 +142,7 @@ df \%>\% \seealso{ Other rectangling: \code{\link{hoist}()}, -\code{\link{unnest_longer}()}, -\code{\link{unnest}()} +\code{\link{unnest}()}, +\code{\link{unnest_longer}()} } \concept{rectangling} From d9d09711a5766c4678a17487dbf45dcb3b811dfc Mon Sep 17 00:00:00 2001 From: olivroy Date: Thu, 25 Apr 2024 14:06:30 -0400 Subject: [PATCH 3/7] update gha to avoid warnings (and potentially succeed for r-devel? --- .github/workflows/R-CMD-check.yaml | 3 ++- .github/workflows/check-devel.yaml | 2 +- .github/workflows/pkgdown.yaml | 4 ++-- .github/workflows/pr-commands.yaml | 4 ++-- .github/workflows/test-coverage.yaml | 6 +++--- vignettes/in-packages.Rmd | 4 ++-- 6 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index ee65ccb57..d8aeb547c 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -42,7 +42,7 @@ jobs: R_KEEP_PKG_SOURCE: yes steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: r-lib/actions/setup-pandoc@v2 @@ -60,3 +60,4 @@ jobs: - uses: r-lib/actions/check-r-package@v2 with: upload-snapshots: true + build_args: 'c("--no-manual","--compact-vignettes=gs+qpdf")' diff --git a/.github/workflows/check-devel.yaml b/.github/workflows/check-devel.yaml index 0b4e4ff64..e6c46a69b 100644 --- a/.github/workflows/check-devel.yaml +++ b/.github/workflows/check-devel.yaml @@ -29,7 +29,7 @@ jobs: R_KEEP_PKG_SOURCE: yes steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: r-lib/actions/setup-pandoc@v2 diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml index ed7650c73..a7276e855 100644 --- a/.github/workflows/pkgdown.yaml +++ b/.github/workflows/pkgdown.yaml @@ -22,7 +22,7 @@ jobs: permissions: contents: write steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: r-lib/actions/setup-pandoc@v2 @@ -41,7 +41,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 diff --git a/.github/workflows/pr-commands.yaml b/.github/workflows/pr-commands.yaml index 71f335b3e..eea58c5ce 100644 --- a/.github/workflows/pr-commands.yaml +++ b/.github/workflows/pr-commands.yaml @@ -14,7 +14,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 +51,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: diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml index 27d452832..21b8a9331 100644 --- a/.github/workflows/test-coverage.yaml +++ b/.github/workflows/test-coverage.yaml @@ -15,7 +15,7 @@ jobs: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: r-lib/actions/setup-r@v2 with: @@ -39,12 +39,12 @@ jobs: 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 diff --git a/vignettes/in-packages.Rmd b/vignettes/in-packages.Rmd index 5e2b1a643..aa2b5d5c2 100644 --- a/vignettes/in-packages.Rmd +++ b/vignettes/in-packages.Rmd @@ -104,8 +104,8 @@ jobs: R-CMD-check: runs-on: macOS-latest steps: - - uses: actions/checkout@v2 - - uses: r-lib/actions/setup-r@v1 + - uses: actions/checkout@v4 + - uses: r-lib/actions/setup-r@v2 - name: Install dependencies run: | install.packages(c("remotes", "rcmdcheck")) From 076cb3189525e2bb84522e35b981aa97f7956102 Mon Sep 17 00:00:00 2001 From: olivroy Date: Tue, 14 May 2024 12:34:43 -0400 Subject: [PATCH 4/7] Re-run `use_tidy_github_actions()` --- .github/workflows/R-CMD-check.yaml | 16 ++++++++-------- .github/workflows/pkgdown.yaml | 2 ++ .github/workflows/pr-commands.yaml | 2 ++ .github/workflows/test-coverage.yaml | 15 +++++++++++++-- 4 files changed, 25 insertions(+), 10 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index d8aeb547c..e712a2167 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -12,6 +12,8 @@ on: name: R-CMD-check +permissions: read-all + jobs: R-CMD-check: runs-on: ${{ matrix.config.os }} @@ -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'} - - {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 }} diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml index a7276e855..c9f0165d4 100644 --- a/.github/workflows/pkgdown.yaml +++ b/.github/workflows/pkgdown.yaml @@ -11,6 +11,8 @@ on: name: pkgdown +permissions: read-all + jobs: pkgdown: runs-on: ubuntu-latest diff --git a/.github/workflows/pr-commands.yaml b/.github/workflows/pr-commands.yaml index eea58c5ce..d1f765096 100644 --- a/.github/workflows/pr-commands.yaml +++ b/.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') }} diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml index 21b8a9331..fefc52e27 100644 --- a/.github/workflows/test-coverage.yaml +++ b/.github/workflows/test-coverage.yaml @@ -8,6 +8,8 @@ on: name: test-coverage +permissions: read-all + jobs: test-coverage: runs-on: ubuntu-latest @@ -23,18 +25,27 @@ jobs: - 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") ) + 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: | From d93d88785d7eb90b80d2df0de9da2ec217a7aaa5 Mon Sep 17 00:00:00 2001 From: olivroy Date: Mon, 5 Aug 2024 09:32:44 -0400 Subject: [PATCH 5/7] `use_tidy_github_actions()` --- .github/workflows/R-CMD-check.yaml | 6 +++--- .github/workflows/pkgdown.yaml | 2 +- .github/workflows/pr-commands.yaml | 6 +++++- .github/workflows/test-coverage.yaml | 2 +- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index e712a2167..064677b49 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -10,7 +10,7 @@ on: pull_request: branches: [main, master] -name: R-CMD-check +name: R-CMD-check.yaml permissions: read-all @@ -27,8 +27,8 @@ jobs: - {os: macos-latest, r: 'release'} - {os: windows-latest, r: 'release'} - # 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'} diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml index c9f0165d4..4bbce7508 100644 --- a/.github/workflows/pkgdown.yaml +++ b/.github/workflows/pkgdown.yaml @@ -9,7 +9,7 @@ on: types: [published] workflow_dispatch: -name: pkgdown +name: pkgdown.yaml permissions: read-all diff --git a/.github/workflows/pr-commands.yaml b/.github/workflows/pr-commands.yaml index d1f765096..2edd93f27 100644 --- a/.github/workflows/pr-commands.yaml +++ b/.github/workflows/pr-commands.yaml @@ -4,7 +4,7 @@ on: issue_comment: types: [created] -name: Commands +name: pr-commands.yaml permissions: read-all @@ -15,6 +15,8 @@ jobs: runs-on: ubuntu-latest env: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} + permissions: + contents: write steps: - uses: actions/checkout@v4 @@ -52,6 +54,8 @@ jobs: runs-on: ubuntu-latest env: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} + permissions: + contents: write steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/test-coverage.yaml b/.github/workflows/test-coverage.yaml index fefc52e27..988226098 100644 --- a/.github/workflows/test-coverage.yaml +++ b/.github/workflows/test-coverage.yaml @@ -6,7 +6,7 @@ on: pull_request: branches: [main, master] -name: test-coverage +name: test-coverage.yaml permissions: read-all From e0746e5631adab6e610682ab3e9b5b7f136e1782 Mon Sep 17 00:00:00 2001 From: olivroy Date: Mon, 5 Aug 2024 09:33:38 -0400 Subject: [PATCH 6/7] Update badge --- README.Rmd | 2 +- README.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.Rmd b/README.Rmd index 115fe14ec..96db1ac75 100644 --- a/README.Rmd +++ b/README.Rmd @@ -17,7 +17,7 @@ knitr::opts_chunk$set( [![CRAN status](https://www.r-pkg.org/badges/version/tidyr)](https://cran.r-project.org/package=tidyr) [![R-CMD-check](https://github.com/tidyverse/tidyr/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/tidyverse/tidyr/actions/workflows/R-CMD-check.yaml) -[![Codecov test coverage](https://codecov.io/gh/tidyverse/tidyr/branch/main/graph/badge.svg)](https://app.codecov.io/gh/tidyverse/tidyr?branch=main) +[![Codecov test coverage](https://codecov.io/gh/tidyverse/tidyr/graph/badge.svg)](https://app.codecov.io/gh/tidyverse/tidyr) ## Overview diff --git a/README.md b/README.md index 16ca7fcc9..ef6ea6684 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ status](https://www.r-pkg.org/badges/version/tidyr)](https://cran.r-project.org/package=tidyr) [![R-CMD-check](https://github.com/tidyverse/tidyr/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/tidyverse/tidyr/actions/workflows/R-CMD-check.yaml) [![Codecov test -coverage](https://codecov.io/gh/tidyverse/tidyr/branch/main/graph/badge.svg)](https://app.codecov.io/gh/tidyverse/tidyr?branch=main) +coverage](https://codecov.io/gh/tidyverse/tidyr/graph/badge.svg)](https://app.codecov.io/gh/tidyverse/tidyr) ## Overview From 7a741efccfae57de1f04e1e6346f672e290572b0 Mon Sep 17 00:00:00 2001 From: olivroy Date: Mon, 5 Aug 2024 09:35:43 -0400 Subject: [PATCH 7/7] update roxygen2 --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index e1960342b..680abe6d2 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -50,4 +50,4 @@ Config/testthat/edition: 3 Encoding: UTF-8 LazyData: true Roxygen: list(markdown = TRUE) -RoxygenNote: 7.3.1 +RoxygenNote: 7.3.2