diff --git a/DESCRIPTION b/DESCRIPTION index 13d1f9e..d0c70c1 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: tibbletime Type: Package Title: Time Aware Tibbles -Version: 0.1.5.9000 +Version: 0.1.6 Authors@R: c( person("Davis", "Vaughan", email = "davis@rstudio.com", role = c("aut", "cre")), person("Matt", "Dancho", email = "mdancho@business-science.io", role = c("aut")) @@ -39,6 +39,7 @@ Suggests: covr, gapminder, knitr, + rmarkdown, testthat, tidyr (>= 1.0.0) VignetteBuilder: knitr diff --git a/NEWS.md b/NEWS.md index 530a1a8..4d8a616 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# tibbletime (development version) +# tibbletime 0.1.6 * Fixed minor tidyr 1.0.0 warnings in tests using `nest()`. diff --git a/R/rollify.R b/R/rollify.R index 9155ce9..c58d6f4 100644 --- a/R/rollify.R +++ b/R/rollify.R @@ -88,9 +88,13 @@ #' #' data(FB) #' +#' summary2 <- function(x) { +#' unclass(summary(x)) +#' } +#' #' # If the function returns >1 value, set the `unlist = FALSE` argument #' # Running 5 number summary -#' summary_roll <- rollify(summary, window = 5, unlist = FALSE) +#' summary_roll <- rollify(summary2, window = 5, unlist = FALSE) #' #' FB_summarised <- dplyr::mutate(FB, summary_roll = summary_roll(adjusted)) #' FB_summarised$summary_roll[[5]] @@ -98,7 +102,7 @@ #' # dplyr::bind_rows() is often helpful in these cases to get #' # meaningful output #' -#' summary_roll <- rollify(~dplyr::bind_rows(summary(.)), window = 5, unlist = FALSE) +#' summary_roll <- rollify(~dplyr::bind_rows(summary2(.)), window = 5, unlist = FALSE) #' FB_summarised <- dplyr::mutate(FB, summary_roll = summary_roll(adjusted)) #' FB_summarised %>% #' dplyr::filter(!is.na(summary_roll)) %>% diff --git a/cran-comments.md b/cran-comments.md index 2530d15..246b344 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,6 +1,6 @@ ## Release Summary -This is a minor release to fix a bug with dplyr 1.0.0 and `ungroup()`. +This is an extremely minor release to fix warnings with tidyr 1.0.0 in tests. ## Test environments * local Mac install, R 4.0.0 diff --git a/man/rollify.Rd b/man/rollify.Rd index 18fda2d..446e900 100644 --- a/man/rollify.Rd +++ b/man/rollify.Rd @@ -115,9 +115,13 @@ dplyr::mutate(FB, roll_mean = roll_mean_na_rm(adjusted)) data(FB) +summary2 <- function(x) { + unclass(summary(x)) +} + # If the function returns >1 value, set the `unlist = FALSE` argument # Running 5 number summary -summary_roll <- rollify(summary, window = 5, unlist = FALSE) +summary_roll <- rollify(summary2, window = 5, unlist = FALSE) FB_summarised <- dplyr::mutate(FB, summary_roll = summary_roll(adjusted)) FB_summarised$summary_roll[[5]] @@ -125,7 +129,7 @@ FB_summarised$summary_roll[[5]] # dplyr::bind_rows() is often helpful in these cases to get # meaningful output -summary_roll <- rollify(~dplyr::bind_rows(summary(.)), window = 5, unlist = FALSE) +summary_roll <- rollify(~dplyr::bind_rows(summary2(.)), window = 5, unlist = FALSE) FB_summarised <- dplyr::mutate(FB, summary_roll = summary_roll(adjusted)) FB_summarised \%>\% dplyr::filter(!is.na(summary_roll)) \%>\%