Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Always compare a version to character, not double #1872

Merged
merged 4 commits into from
Jul 5, 2023
Merged

Always compare a version to character, not double #1872

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
23faaa7
Set env var in the GHA workflow
jennybc Jul 4, 2023
5c8dcd7
Update or eliminate invalid getRversion() usage
jennybc Jul 4, 2023
a6f3abc
Test my hypothesis that pkgload is the remaining problem
jennybc Jul 5, 2023
53e3329
Merge branch 'main' into always-character-version
jennybc Jul 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/R-CMD-check.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,7 @@ jobs:
git config --global user.email "[email protected]"

- uses: r-lib/actions/check-r-package@v2
env:
_R_CALLS_INVALID_NUMERIC_VERSION_: true
with:
upload-snapshots: true
4 changes: 3 additions & 1 deletion DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand All @@ -47,7 +48,6 @@ Suggests:
covr,
knitr,
magick,
pkgload,
rmarkdown,
roxygen2 (>= 7.1.2),
spelling (>= 1.2),
Expand All @@ -59,3 +59,5 @@ Encoding: UTF-8
Language: en-US
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.2.3
Remotes:
r-lib/pkgload@jenny-experiment
2 changes: 1 addition & 1 deletion tests/testthat/test-author.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
2 changes: 0 additions & 2 deletions tests/testthat/test-tidyverse.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand All @@ -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")

Expand Down
Loading