Update to covr 3.6.3 (#23)

* Adjusted DESCRIPTION and NEWS.md * Different condition to skip tests * Bump version for release --------- Co-authored-by: Jim Hester <[email protected]>
r-lib · Oct 11, 2023 · 2238519 · 2238519
1 parent 1426c5b
commit 2238519
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 7 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Encoding: UTF-8
 Package: covr
 Title: Test Coverage for Packages
-Version: 3.6.2.9001
+Version: 3.6.3.9001
 Authors@R: c(
     person("Jim", "Hester", email = "[email protected]", role = c("aut", "cre")),
     person("Willem", "Ligtenberg", role = "ctb"),

diff --git a/NEWS.md b/NEWS.md
@@ -2,6 +2,12 @@
 
 * Added support for `klmr/box` modules. This works best with `file_coverage()`. (@radbasa, #491)
 
+# covr 3.6.3
+
+* Updates to internal usage of `is.atomic()` to work with upcoming R release (@mmaechler , #542)
+
+* `package_coverage()` now works correctly with ignore files when it is not run in the package root directory (@mpadge, #538)
+
 # covr 3.6.2
 
 # covr 3.6.1

diff --git a/cran-comments.md b/cran-comments.md
@@ -1,4 +1,4 @@
-This is a patch release to fix a test which assumed R is on the PATH, and that it is the same R being used to check.
+This is a patch release to fix a change made in R-devel
 
 ## R CMD check results
 There were no NOTEs, ERRORs or WARNINGs.
diff --git a/tests/testthat/helper.R b/tests/testthat/helper.R
@@ -1,3 +1,8 @@
 is_r_devel <- function() {
   startsWith(R.version$status, "Under development")
 }
+
+is_win_r41 <- function() {
+  x <- getRversion()
+  is_windows() && x$major == 4 && x$minor == 1
+}
diff --git a/tests/testthat/test-Compiled.R b/tests/testthat/test-Compiled.R
@@ -1,7 +1,7 @@
 context("Compiled")
 test_that("Compiled code coverage is reported including code in headers", {
   skip_on_cran()
-  skip_if(is_windows() && getRversion() == "4.1")
+  skip_if(is_win_r41())
 
   cov <- as.data.frame(package_coverage("TestCompiled", relative_path = TRUE))
 
@@ -34,7 +34,7 @@ test_that("Compiled code coverage is reported including code in headers", {
 
 test_that("Can pass path to relative_path argument", {
   skip_on_cran()
-  skip_if(is_windows() && getRversion() == "4.1")
+  skip_if(is_win_r41())
   cov <- as.data.frame(package_coverage("TestCompiled", relative_path = "."))
 
   expect_true(all(unique(cov$filename) %in% c(
@@ -47,7 +47,7 @@ test_that("Can pass path to relative_path argument", {
 
 test_that("Source code subdirectories are found", {
   skip_on_cran()
-  skip_if(is_windows() && getRversion() == "4.1")
+  skip_if(is_win_r41())
   cov <- as.data.frame(package_coverage("TestCompiledSubdir", relative_path = TRUE))
 
   expect_equal(cov[cov$first_line == "9", "value"], 4)
@@ -63,7 +63,7 @@ test_that("Source code subdirectories are found", {
 
 test_that("Compiled code coverage is reported under non-standard char's", {
   skip_on_cran()
-  skip_if(is_windows() && getRversion() == "4.1")
+  skip_if(is_win_r41())
   cov <- as.data.frame(package_coverage("Test+Char/TestCompiled", relative_path = TRUE))
 
   expect_equal(cov[cov$first_line == "9", "value"], 4)

diff --git a/tests/testthat/test-tally_coverage.R b/tests/testthat/test-tally_coverage.R
@@ -1,6 +1,6 @@
 test_that("tally_coverage includes compiled code", {
   skip_on_cran()
-  skip_if(is_windows() && getRversion() == "4.1")
+  skip_if(is_win_r41())
 
   cov <- package_coverage(test_path("TestCompiled"))
   tall <- tally_coverage(cov)