From 266f8de897ce5c80dbb868d9807f171b110b0b58 Mon Sep 17 00:00:00 2001 From: Emil Hvitfeldt Date: Wed, 14 Sep 2022 21:16:12 -0700 Subject: [PATCH 1/5] use parsnip::condense_control --- R/blend_predictions.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/blend_predictions.R b/R/blend_predictions.R index 8dc0a4f9..03f16b59 100644 --- a/R/blend_predictions.R +++ b/R/blend_predictions.R @@ -138,7 +138,7 @@ blend_predictions <- function(data_stack, if (!is.null(metric)) { check_inherits(metric, "metric_set") } - check_inherits(control, "control_grid") + control <- parsnip::condense_control(control, tune::control_grid()) check_inherits(times, "numeric") check_empty_ellipses(...) From b889d54d934c4c2068a0e95593fd89ad7df5f497 Mon Sep 17 00:00:00 2001 From: Emil Hvitfeldt Date: Wed, 14 Sep 2022 21:16:41 -0700 Subject: [PATCH 2/5] use dev version of parsnip --- DESCRIPTION | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 64021e2a..d5ee3f26 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -29,7 +29,7 @@ Imports: rlang (>= 0.4.0), tibble (>= 2.1.3), purrr (>= 0.3.2), - parsnip (>= 0.0.4), + parsnip (>= 1.0.1.9000), workflows (>= 0.2.3), recipes (>= 0.2.0), rsample (>= 0.1.1), @@ -64,3 +64,5 @@ Roxygen: list(markdown = TRUE) RoxygenNote: 7.2.0 VignetteBuilder: knitr Config/testthat/edition: 3 +Remotes: + tidymodels/parsnip@control_control \ No newline at end of file From e25a82dc966f5cf7a8bc8f0316361b8910603458 Mon Sep 17 00:00:00 2001 From: Emil Hvitfeldt Date: Wed, 14 Sep 2022 21:16:46 -0700 Subject: [PATCH 3/5] add news --- NEWS.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NEWS.md b/NEWS.md index c5b5ee8e..61842698 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,6 +4,8 @@ To be released as stacks 1.0.1. * Removes an unneeded data import attribute from the `tree_frogs` example data and its associated objects. + +* `blend_predictions()` doesn't error anymore if `control` argument isn't a `control_grid()` object. Will work as long as the object passed to `control` includes the same elements as `control_grid()`. # stacks 1.0.0 From 7107bcd9948f3d6a1eba02b95e1414ab9fdc7379 Mon Sep 17 00:00:00 2001 From: simonpcouch Date: Fri, 23 Sep 2022 12:47:55 -0400 Subject: [PATCH 4/5] remove Remotes, use consistent indentation --- DESCRIPTION | 2 -- NEWS.md | 4 +++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index d5ee3f26..a33d26fe 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -64,5 +64,3 @@ Roxygen: list(markdown = TRUE) RoxygenNote: 7.2.0 VignetteBuilder: knitr Config/testthat/edition: 3 -Remotes: - tidymodels/parsnip@control_control \ No newline at end of file diff --git a/NEWS.md b/NEWS.md index 61842698..4e4f11e2 100644 --- a/NEWS.md +++ b/NEWS.md @@ -5,7 +5,9 @@ To be released as stacks 1.0.1. * Removes an unneeded data import attribute from the `tree_frogs` example data and its associated objects. -* `blend_predictions()` doesn't error anymore if `control` argument isn't a `control_grid()` object. Will work as long as the object passed to `control` includes the same elements as `control_grid()`. +* `blend_predictions()` doesn't error anymore if `control` argument isn't a + `control_grid()` object. Will work as long as the object passed to `control` + includes the same elements as `control_grid()`. # stacks 1.0.0 From 2b63ba37c95369544e98c11c1db661997b237c97 Mon Sep 17 00:00:00 2001 From: simonpcouch Date: Fri, 23 Sep 2022 12:49:11 -0400 Subject: [PATCH 5/5] woops, does need a Remotes --- DESCRIPTION | 2 ++ 1 file changed, 2 insertions(+) diff --git a/DESCRIPTION b/DESCRIPTION index a33d26fe..841ad2d1 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -64,3 +64,5 @@ Roxygen: list(markdown = TRUE) RoxygenNote: 7.2.0 VignetteBuilder: knitr Config/testthat/edition: 3 +Remotes: + tidymodels/parsnip