diff --git a/DESCRIPTION b/DESCRIPTION index a0b203f..f246292 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -23,14 +23,15 @@ Imports: utils, tidyr (>= 1.0.0), purrr, - broom, + broom (>= 0.5.6), rlang (>= 0.3.1), tibble (>= 2.1.3), dplyr (>= 0.7.1), magrittr, corrplot, tidyselect (>= 1.0.0), - car + car, + generics (>= 0.0.2) Suggests: knitr, rmarkdown, @@ -104,6 +105,8 @@ Collate: 'shapiro_test.R' 'sign_test.R' 'tukey_hsd.R' + 'utils-manova.R' + 'utils-pipe.R' 'welch_anova_test.R' 'wilcox_effsize.R' 'wilcox_test.R' diff --git a/NAMESPACE b/NAMESPACE index 399941f..238d569 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -128,7 +128,6 @@ export(tukey_hsd) export(welch_anova_test) export(wilcox_effsize) export(wilcox_test) -importFrom(broom,augment) importFrom(broom,tidy) importFrom(car,Anova) importFrom(car,Manova) @@ -151,6 +150,8 @@ importFrom(dplyr,select) importFrom(dplyr,summarise) importFrom(dplyr,tibble) importFrom(dplyr,ungroup) +importFrom(generics,augment) +importFrom(generics,tidy) importFrom(magrittr,"%<>%") importFrom(magrittr,"%>%") importFrom(magrittr,extract) diff --git a/R/reexports.R b/R/reexports.R index 1ba3908..ce151a7 100644 --- a/R/reexports.R +++ b/R/reexports.R @@ -1,6 +1,3 @@ -#' @importFrom magrittr %>% -#' @export -magrittr::`%>%` #' @importFrom tibble tibble #' @export tibble::tibble @@ -28,15 +25,12 @@ tidyr::gather #' @importFrom tidyr spread #' @export tidyr::spread -#' @importFrom broom tidy +#' @importFrom generics tidy #' @export -broom::tidy -#' @importFrom broom augment +generics::tidy +#' @importFrom generics augment #' @export -broom::augment +generics::augment #' @importFrom car Anova #' @export car::Anova -#' @importFrom car Manova -#' @export -car::Manova diff --git a/R/utils-manova.R b/R/utils-manova.R new file mode 100644 index 0000000..80750af --- /dev/null +++ b/R/utils-manova.R @@ -0,0 +1,10 @@ +#' Manova exported from car package +#' +#' See \code{car::\link[car:Anova]{Manova}} for details. +#' +#' @name Manova +#' @rdname Manova +#' @keywords internal +#' @export +#' @importFrom car Manova +NULL diff --git a/R/utils-pipe.R b/R/utils-pipe.R new file mode 100644 index 0000000..e79f3d8 --- /dev/null +++ b/R/utils-pipe.R @@ -0,0 +1,11 @@ +#' Pipe operator +#' +#' See \code{magrittr::\link[magrittr:pipe]{\%>\%}} for details. +#' +#' @name %>% +#' @rdname pipe +#' @keywords internal +#' @export +#' @importFrom magrittr %>% +#' @usage lhs \%>\% rhs +NULL diff --git a/docs/news/index.html b/docs/news/index.html index 7424edd..98a61ee 100644 --- a/docs/news/index.html +++ b/docs/news/index.html @@ -124,6 +124,7 @@

Minor changes