Merge branch 'dev'

LudvigOlsen · Jan 12, 2023 · 0b570ef · 0b570ef
2 parents 3ae1876 + 68dc5c1
commit 0b570ef
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: rearrr
 Title: Rearranging Data
-Version: 0.3.2.9000
+Version: 0.3.3
 Authors@R: 
     c(person(given = "Ludvig Renbo",
              family = "Olsen",

diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,7 @@
 
-# rearrr 0.3.2.9000
+# rearrr 0.3.3
+
+* Makes tests compatible with `purrr v1.0.1`. (#2)
 
 # rearrr 0.3.2
 

diff --git a/R/helpers.R b/R/helpers.R
@@ -606,10 +606,10 @@ is_checkmate_v2_1 <- function(){
   v$major == 2 && v$minor >= 1
 }
 
-is_purr_v1_or_pre1_dev <- function(){
+is_purr_v1 <- function(){
   v <- get_pkg_version("purrr")
-  #current dev version is called 0.9000.0.9000
-  v$major == 1 || v$major == 0 && v$minor == 9000
+  v$major >= 1
 }
 
-purrr_error <- ifelse(is_purr_v1_or_pre1_dev(), "rlangerror", "simpleError")
+if (is_purr_v1()) {purrr_error <- c("purrr_error_indexed", "rlang_error")
+} else {purrr_error <- "simpleError"}