From 23faaa78dc300e879b1b1f54f3af9293462ff6c7 Mon Sep 17 00:00:00 2001 From: Jenny Bryan Date: Tue, 4 Jul 2023 13:35:16 -0700 Subject: [PATCH 1/3] Set env var in the GHA workflow --- .github/workflows/R-CMD-check.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 2a4fbdc83..759287126 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -63,5 +63,7 @@ jobs: git config --global user.email "$GITHUB_ACTOR@users.noreply.github.com" - uses: r-lib/actions/check-r-package@v2 + env: + _R_CALLS_INVALID_NUMERIC_VERSION_: true with: upload-snapshots: true From 5c8dcd756cd4f233edaf21d8725f89d89848e1d1 Mon Sep 17 00:00:00 2001 From: Jenny Bryan Date: Tue, 4 Jul 2023 15:56:18 -0700 Subject: [PATCH 2/3] Update or eliminate invalid getRversion() usage This is about numeric versions becoming more rigorously character vs numeric. --- tests/testthat/test-author.R | 2 +- tests/testthat/test-tidyverse.R | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/tests/testthat/test-author.R b/tests/testthat/test-author.R index d336ebdab..987961334 100644 --- a/tests/testthat/test-author.R +++ b/tests/testthat/test-author.R @@ -73,7 +73,7 @@ test_that("Decline to tweak an existing author", { test_that("Placeholder author is challenged", { # apparently the format method for `person` used to handle ORCIDs differently - skip_if(getRversion() < 4.0) + skip_if(getRversion() < "4.0") withr::local_options(usethis.description = NULL) create_local_package() diff --git a/tests/testthat/test-tidyverse.R b/tests/testthat/test-tidyverse.R index 178a560aa..45246cd97 100644 --- a/tests/testthat/test-tidyverse.R +++ b/tests/testthat/test-tidyverse.R @@ -57,7 +57,6 @@ test_that("use_tidy_github() adds and Rbuildignores files", { }) test_that("styling the package works", { - skip_if(getRversion() < 3.2) skip_if_no_git_user() skip_if_not_installed("styler") @@ -72,7 +71,6 @@ test_that("styling the package works", { test_that("styling of non-packages works", { - skip_if(getRversion() < 3.2) skip_if_no_git_user() skip_if_not_installed("styler") From a6f3abc412c7769ed7fdceea1dd9ad629e9863ac Mon Sep 17 00:00:00 2001 From: Jenny Bryan Date: Tue, 4 Jul 2023 17:36:22 -0700 Subject: [PATCH 3/3] Test my hypothesis that pkgload is the remaining problem --- DESCRIPTION | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 632054c03..7328c2e8d 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -33,6 +33,7 @@ Imports: glue (>= 1.3.0), jsonlite, lifecycle (>= 1.0.0), + pkgload (>= 1.3.2.9000), purrr, rappdirs, rlang (>= 1.1.0), @@ -47,7 +48,6 @@ Suggests: covr, knitr, magick, - pkgload, rmarkdown, roxygen2 (>= 7.1.2), spelling (>= 1.2), @@ -59,3 +59,5 @@ Encoding: UTF-8 Language: en-US Roxygen: list(markdown = TRUE) RoxygenNote: 7.2.3 +Remotes: + r-lib/pkgload@jenny-experiment