From d3c7b34414b504e7dcfed2a0fcc4060f25175f63 Mon Sep 17 00:00:00 2001 From: mnneely Date: Tue, 9 Jun 2020 13:23:07 -0700 Subject: [PATCH] Accommodate move of "as.tbl_cube" function from dplyr (as of 1.0.0) to new cubelyr package. --- DESCRIPTION | 5 +++-- R/Pmetrics-package.R | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 5dcf9757..280127d1 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -17,15 +17,16 @@ Description: Parametric and non-parametric which used to be available on CRAN. Authors@R: person("Michael", "Neely", email = "mneely@usc.edu", role = c("aut", "cre")) -Version: 1.9.5 +Version: 1.9.6 URL: http://www.lapk.org -Date: 2020-02-29 +Date: 2020-06-09 Depends: R (>= 3.5.0) Imports: askpass, base64enc, chron, + cubelyr, doParallel, dplyr, foreach, diff --git a/R/Pmetrics-package.R b/R/Pmetrics-package.R index 8066400a..8f92dd79 100644 --- a/R/Pmetrics-package.R +++ b/R/Pmetrics-package.R @@ -13,7 +13,8 @@ #' \url{http://www.lapk.org} #' @keywords package #' -#' @importFrom dplyr select arrange as.tbl_cube filter mutate +#' @importFrom dplyr select arrange filter mutate +#' @importFrom cubelyr as.tbl_cube #' @importFrom foreach %dopar% #' @importFrom ggplot2 ggplot aes geom_line geom_point geom_polygon #' scale_x_log10 scale_x_continuous scale_y_log10 scale_y_continuous xlab ylab