Merge branch 'release/3.10.2'

psychelzh · Mar 31, 2024 · f838485 · f838485
2 parents 3f68379 + e201875
commit f838485
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: tarflow.iquizoo
 Title: Setup "targets" Workflows for "iquizoo" Data Processing
-Version: 3.10.1
+Version: 3.10.2
 Authors@R: c(
     person("Liang", "Zhang", , "[email protected]", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0001-9041-1150")),
@@ -20,7 +20,7 @@ Depends:
 Imports:
     cachem,
     cli,
-    data.iquizoo (>= 2023.10.22),
+    data.iquizoo (>= 2024.3.31.2),
     DBI,
     memoise,
     rlang (>= 1.0.0),

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,8 @@
+# tarflow.iquizoo 3.10.2
+
+* Fixed compatibility issue with 'data.iquizoo' 2024.03.31-2.
+* Bumped minimum version of 'data.iquizoo' to 2024.03.31-2.
+
 # tarflow.iquizoo 3.10.1
 
 ## New Features

diff --git a/R/targets.R b/R/targets.R
@@ -258,7 +258,7 @@ tar_prep_raw <- function(contents,
           preproc_data(tar_parsed, prep_fun, .input = input, .extra = extra),
           packages = "preproc.iquizoo"
         ),
-        data.iquizoo::match_preproc(contents, type = "inner")
+        data.iquizoo::merge_preproc(contents)
       )
     }
   )