From 2d6b1259019bbed927b8f2c29fa9c6fe513aedb7 Mon Sep 17 00:00:00 2001 From: Andrew Gene Brown Date: Mon, 16 Dec 2024 14:04:18 -0800 Subject: [PATCH] Make testthat usage conditional on R>=4.0 - skip loading testthat on R 3.6 - waldo dependency requires R>=4.0 --- .github/workflows/R-CMD-check.yml | 2 +- tests/testthat.R | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/R-CMD-check.yml b/.github/workflows/R-CMD-check.yml index 69f08da8a..abe7ba821 100644 --- a/.github/workflows/R-CMD-check.yml +++ b/.github/workflows/R-CMD-check.yml @@ -62,7 +62,7 @@ jobs: - uses: r-lib/actions/setup-r-dependencies@v2 with: - extra-packages: any::rcmdcheck, any::remotes, terra=?ignore-before-r=4.1.0, knitr=?ignore-before-r=4.0.0, rmarkdown=?ignore-before-r=4.0.0, RSQLite=?ignore-before-r=4.0.0, local::., brownag/soilDBdata + extra-packages: any::rcmdcheck, any::remotes, terra=?ignore-before-r=4.1.0, knitr=?ignore-before-r=4.0.0, rmarkdown=?ignore-before-r=4.0.0, RSQLite=?ignore-before-r=4.0.0, testthat=?ignore-before-r=4.0.0, local::., brownag/soilDBdata # upgrade: 'TRUE' ## NB: required to force building of source packages cache: false needs: check diff --git a/tests/testthat.R b/tests/testthat.R index 240380256..e594b6989 100644 --- a/tests/testthat.R +++ b/tests/testthat.R @@ -1,4 +1,6 @@ -library(testthat) -library(soilDB) +if (as.integer(R.Version()$major) >= 4) { + library(testthat) + library(soilDB) -test_check("soilDB") + test_check("soilDB") +}