From f26e9d59027477884cbe0454cec539b178c86de1 Mon Sep 17 00:00:00 2001 From: DavisVaughan Date: Fri, 17 Jul 2020 10:05:58 -0400 Subject: [PATCH 1/8] Update CRAN comments --- cran-comments.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From ee192ff1de9ed2b8f0f66090c2c042a775e9c1f1 Mon Sep 17 00:00:00 2001 From: DavisVaughan Date: Fri, 17 Jul 2020 10:06:18 -0400 Subject: [PATCH 2/8] Increment version number --- DESCRIPTION | 2 +- NEWS.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 13d1f9e..bd7c3f5 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")) 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()`. From 922b32e728b2381188186c922e2ebf4d7253fd90 Mon Sep 17 00:00:00 2001 From: DavisVaughan Date: Fri, 17 Jul 2020 10:07:11 -0400 Subject: [PATCH 3/8] CRAN-RELEASE --- CRAN-RELEASE | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 CRAN-RELEASE diff --git a/CRAN-RELEASE b/CRAN-RELEASE new file mode 100644 index 0000000..173e086 --- /dev/null +++ b/CRAN-RELEASE @@ -0,0 +1,2 @@ +This package was submitted to CRAN on 2020-07-17. +Once it is accepted, delete this file and tag the release (commit ee192ff1de). From 4b6fbcfa34a3f7c71071b3f01fdcfc7953182033 Mon Sep 17 00:00:00 2001 From: DavisVaughan Date: Mon, 20 Jul 2020 09:37:09 -0400 Subject: [PATCH 4/8] Avoid r-lib/vctrs#1190 issue --- R/rollify.R | 8 ++++++-- man/rollify.Rd | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) 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/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)) \%>\% From 6037ea8c962ba92f5feec4bc3bc4ce29cfc74b9a Mon Sep 17 00:00:00 2001 From: DavisVaughan Date: Mon, 20 Jul 2020 09:43:44 -0400 Subject: [PATCH 5/8] CRAN-RELEASE --- CRAN-RELEASE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CRAN-RELEASE b/CRAN-RELEASE index 173e086..6b2acd5 100644 --- a/CRAN-RELEASE +++ b/CRAN-RELEASE @@ -1,2 +1,2 @@ -This package was submitted to CRAN on 2020-07-17. -Once it is accepted, delete this file and tag the release (commit ee192ff1de). +This package was submitted to CRAN on 2020-07-20. +Once it is accepted, delete this file and tag the release (commit 4b6fbcfa34). From 88771533a1307ba3260d4017e547498bf033139c Mon Sep 17 00:00:00 2001 From: DavisVaughan Date: Tue, 21 Jul 2020 08:58:08 -0400 Subject: [PATCH 6/8] Suggest rmarkdown --- DESCRIPTION | 1 + 1 file changed, 1 insertion(+) diff --git a/DESCRIPTION b/DESCRIPTION index bd7c3f5..d0c70c1 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -39,6 +39,7 @@ Suggests: covr, gapminder, knitr, + rmarkdown, testthat, tidyr (>= 1.0.0) VignetteBuilder: knitr From db6a59f64d782326448a71766e911ebdad630165 Mon Sep 17 00:00:00 2001 From: DavisVaughan Date: Tue, 21 Jul 2020 08:59:21 -0400 Subject: [PATCH 7/8] CRAN-RELEASE --- CRAN-RELEASE | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CRAN-RELEASE b/CRAN-RELEASE index 6b2acd5..ffa5154 100644 --- a/CRAN-RELEASE +++ b/CRAN-RELEASE @@ -1,2 +1,2 @@ -This package was submitted to CRAN on 2020-07-20. -Once it is accepted, delete this file and tag the release (commit 4b6fbcfa34). +This package was submitted to CRAN on 2020-07-21. +Once it is accepted, delete this file and tag the release (commit 88771533a1). From a242f1fdaf3757198b45acfc7f74caa368158e00 Mon Sep 17 00:00:00 2001 From: DavisVaughan Date: Thu, 23 Jul 2020 15:11:31 -0400 Subject: [PATCH 8/8] Delete CRAN-RELEASE --- CRAN-RELEASE | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 CRAN-RELEASE diff --git a/CRAN-RELEASE b/CRAN-RELEASE deleted file mode 100644 index ffa5154..0000000 --- a/CRAN-RELEASE +++ /dev/null @@ -1,2 +0,0 @@ -This package was submitted to CRAN on 2020-07-21. -Once it is accepted, delete this file and tag the release (commit 88771533a1).