Merge branch 'main' of https://github.com/ChloeYou/epipredict

Author: ChloeYou

.github/workflows/R-CMD-check.yaml

@@ -1,8 +1,8 @@
 on:
   push:
-    branches: [main, master]
+    branches: [main, frosting]
   pull_request:
-    branches: [main, master]
+    branches: [main, frosting]
 
 name: R-CMD-check
 

R/epi_recipe.R

@@ -408,5 +408,8 @@ kill_levels <- function(x, keys) {
 #' @export
 as_tibble.epi_df <- function(x, ...) {
   # so that downstream calls to as_tibble don't clobber our metadata
+  # this avoids infinite recursion inside dplyr::dplyr_col_modify
+  # TODO: this needs a different approach, long-term
+  class(x) <- class(x)[class(x) != "grouped_df"]
   return(x)
 }

tests/testthat/test-frosting.R

@@ -36,5 +36,3 @@ test_that("prediction works without any postprocessor", {
   expect_equal(tail(p$time_value, 1), as.Date("2021-12-31"))
   expect_equal(unique(p$geo_value), c("ak", "ca", "ny"))
 })
-
-

tests/testthat/test-layer_predict.R

@@ -19,8 +19,7 @@ test_that("predict layer works alone", {
   expect_equal(ncol(p), 3L)
   expect_s3_class(p, "epi_df")
   expect_equal(nrow(p), 108L)
-  expect_named(p, c("geo_value", "time_value", ".pred"))
-
+  expect_named(p, c("time_value", "geo_value", ".pred"))
 })
 
 test_that("prediction with interval works", {
@@ -32,9 +31,5 @@ test_that("prediction with interval works", {
   expect_equal(ncol(p), 4L)
   expect_s3_class(p, "epi_df")
   expect_equal(nrow(p), 108L)
-  expect_named(p, c("geo_value", "time_value", ".pred_lower", ".pred_upper"))
-
-
-
+  expect_named(p, c("time_value", "geo_value", ".pred_lower", ".pred_upper"))
 })
-