diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index bedf5015..24e8c585 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -19,7 +19,6 @@ repos: - dplyr - lifecycle - logger - - magrittr - methods - rlang - shiny diff --git a/DESCRIPTION b/DESCRIPTION index dabfec93..ef9ebe42 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -19,7 +19,6 @@ URL: https://insightsengineering.github.io/teal.transform/, https://github.com/insightsengineering/teal.transform/ BugReports: https://github.com/insightsengineering/teal.transform/issues Depends: - magrittr (>= 1.5), R (>= 3.6) Imports: checkmate (>= 2.1.0), @@ -46,7 +45,7 @@ VignetteBuilder: knitr RdMacros: lifecycle -Config/Needs/verdepcheck: tidyverse/magrittr, mllg/checkmate, +Config/Needs/verdepcheck: mllg/checkmate, tidyverse/dplyr, r-lib/lifecycle, daroczig/logger, r-lib/rlang, rstudio/rmarkdown, rstudio/shiny, daattali/shinyjs, rstudio/shinyvalidate, insightsengineering/teal.data, diff --git a/NAMESPACE b/NAMESPACE index 49700e8d..4c783712 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -33,6 +33,7 @@ S3method(value_choices,character) S3method(value_choices,data.frame) S3method(variable_choices,character) S3method(variable_choices,data.frame) +export("%>%") export(add_no_selected_choices) export(all_choices) export(check_no_multiple_selection) @@ -66,5 +67,5 @@ export(split_by_sep) export(value_choices) export(variable_choices) import(shiny) +importFrom(dplyr,"%>%") importFrom(lifecycle,badge) -importFrom(magrittr,"%>%") diff --git a/NEWS.md b/NEWS.md index bcb4b1fe..a3150942 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,7 +1,12 @@ # teal.transform 0.4.0.9019 +### Breaking changes + +* Namespace from `magrittr` package is no longer available when loading `teal.transform`. Only re-exports pipe `%>%` operator from `dplyr` package. + ### Miscellaneous +* Removed `magrittr` from package dependencies. * Specified minimal version of package dependencies. # teal.transform 0.4.0 diff --git a/R/teal.transform-package.R b/R/teal.transform-package.R index 27b4722f..3a646cdc 100644 --- a/R/teal.transform-package.R +++ b/R/teal.transform-package.R @@ -3,6 +3,9 @@ "_PACKAGE" #' @import shiny -#' @importFrom magrittr %>% +#' @importFrom dplyr %>% #' @importFrom lifecycle badge NULL + +#' @export +dplyr::`%>%` diff --git a/man/reexports.Rd b/man/reexports.Rd new file mode 100644 index 00000000..4a4a50fd --- /dev/null +++ b/man/reexports.Rd @@ -0,0 +1,16 @@ +% Generated by roxygen2: do not edit by hand +% Please edit documentation in R/teal.transform-package.R +\docType{import} +\name{reexports} +\alias{reexports} +\alias{\%>\%} +\title{Objects exported from other packages} +\keyword{internal} +\description{ +These objects are imported from other packages. Follow the links +below to see their documentation. + +\describe{ + \item{dplyr}{\code{\link[dplyr:reexports]{\%>\%}}} +}} +