merge master

iNZightVIT · Apr 3, 2024 · 54b3cbe · 54b3cbe
2 parents 933edfa + 24263ad
commit 54b3cbe
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 2 deletions.
diff --git a/.github/install_deps.R b/.github/install_deps.R
@@ -13,7 +13,8 @@ options(
         RSPM = Sys.getenv("RSPM"),
         CRAN = "https://cloud.r-project.org"
     ),
-    install.packages.compile.from.source = "never"
+    install.packages.compile.from.source =
+        ifelse(OS == "macOS", "always", "never")
 )
 
 

diff --git a/.github/workflows/revdep-check.yaml b/.github/workflows/revdep-check.yaml
@@ -3,6 +3,7 @@ on:
     branches:
       - dev
       - "release/**"
+      - "hotfix/**"
 
 name: Check reverse dependencies
 

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: iNZightTools
 Type: Package
 Title: Tools for 'iNZight'
-Version: 2.0.0
+Version: 2.0.1
 Depends: R (>= 4.0)
 Imports:
     dplyr (>= 1.1.0),

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+# iNZightTools 2.0.1
+
+- Fix issue where NULL values passed to `interpolate()` triggering an error
+
 # iNZightTools 2.0.0
 
 ## Breaking changes

diff --git a/R/code_writing.R b/R/code_writing.R
@@ -1,4 +1,8 @@
 as_call <- function(x) {
+    if (is.null(x)) {
+        return(x)
+    }
+
     if (inherits(x, "formula")) {
         stopifnot(length(x) == 2)
         x[[2]]

diff --git a/cran-comments.md b/cran-comments.md
@@ -17,3 +17,7 @@ We checked 2 reverse dependencies, comparing R CMD check results across CRAN and
 
 - We saw 0 new problems
 - We failed to check 0 packages
+
+## Notes
+
+This release fixes a bug in a function triggered by the latest R-devel.
diff --git a/docs/CNAME b/docs/CNAME
@@ -0,0 +1 @@
+tools.inzight.nz
diff --git a/tests/testthat/test_tidy_code.R b/tests/testthat/test_tidy_code.R
@@ -1,5 +1,7 @@
 library(magrittr)
 
+skip_if_not_installed("styler")
+
 test_that("Cody tidying does not break code", {
     x <- readLines("messy_gapminder.txt")
     z <- tidy_all_code(x)