Merge pull request #22 from olivroy/tidyverse

business-science · Dec 8, 2023 · d615bd0 · d615bd0
2 parents d7790ad + d2c18eb
commit d615bd0
Show file tree

Hide file tree

Showing 38 changed files with 241 additions and 271 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -23,23 +23,24 @@ Imports:
     broom (>= 0.5.6),
     dplyr (>= 1.0.0),
     forecast (>= 8.0),
-    lubridate (>= 1.6.0),
     tibble (>= 1.2),
-    tidyr (>= 1.0.0),
     timetk (>= 2.1.0),
-    rlang,
-    tidyverse, 
-    tidyquant
+    rlang
 Suggests:
-    forcats,
+    ggplot2,
     knitr,
+    lubridate,
     rmarkdown,
-    testthat,
+    testthat (>= 2.0.0),
     purrr,
     readr,
     stringr,
     scales,
-    fracdiff
+    fracdiff,
+    tidyr (>= 1.0.0),
+    tidyquant,
+    zoo
 RoxygenNote: 7.2.3
 Roxygen: list(markdown = TRUE)
 VignetteBuilder: knitr
+Config/testthat/edition: 2
diff --git a/NEWS.md b/NEWS.md
@@ -1,8 +1,12 @@
 # sweep (development version)
 
+* sweep no longer imports tidyverse. (@olivroy, #22)
+
+* Remove internal usage of `dplyr::select_()`. (@olivroy, #22)
+
 # sweep 0.2.5
 
-- Fixes to get `sweep` back on CRAN following inadvertent `timetk` archival. 
+* Fixes to get `sweep` back on CRAN following inadvertent `timetk` archival. 
 
 # sweep 0.2.4
 

diff --git a/R/sw_sweep.R b/R/sw_sweep.R
@@ -37,7 +37,6 @@
 #'
 #' @examples
 #' library(forecast)
-#' library(sweep)
 #' library(dplyr)
 #'
 #' # ETS forecasts

diff --git a/R/sw_tidy.R b/R/sw_tidy.R
@@ -23,7 +23,6 @@
 #' @examples
 #' library(dplyr)
 #' library(forecast)
-#' library(sweep)
 #'
 #' WWWusage %>%
 #'     auto.arima() %>%

diff --git a/R/sweep-package.R b/R/sweep-package.R
@@ -12,7 +12,6 @@
 #' To learn more about `sweep`, start with the vignettes:
 #'  `browseVignettes(package = "sweep")`
 #'
-#' @aliases sweep-package
 #' @keywords internal
 "_PACKAGE"
 

diff --git a/R/tidiers_HoltWinters.R b/R/tidiers_HoltWinters.R
@@ -19,7 +19,6 @@
 #' @examples
 #' library(dplyr)
 #' library(forecast)
-#' library(sweep)
 #'
 #' fit_hw <- USAccDeaths %>%
 #'     stats::HoltWinters()

diff --git a/R/tidiers_StructTS.R b/R/tidiers_StructTS.R
@@ -19,7 +19,6 @@
 #' @examples
 #' library(dplyr)
 #' library(forecast)
-#' library(sweep)
 #'
 #' fit_StructTS <- WWWusage %>%
 #'     StructTS()

diff --git a/R/tidiers_arima.R b/R/tidiers_arima.R
@@ -18,7 +18,6 @@
 #' @examples
 #' library(dplyr)
 #' library(forecast)
-#' library(sweep)
 #'
 #' fit_arima <- WWWusage %>%
 #'     auto.arima()

diff --git a/R/tidiers_bats.R b/R/tidiers_bats.R
@@ -17,7 +17,6 @@
 #' @examples
 #' library(dplyr)
 #' library(forecast)
-#' library(sweep)
 #'
 #' fit_bats <- WWWusage %>%
 #'     bats()

diff --git a/R/tidiers_decomposed_ts.R b/R/tidiers_decomposed_ts.R
@@ -14,7 +14,6 @@
 #' @examples
 #' library(dplyr)
 #' library(forecast)
-#' library(sweep)
 #'
 #' fit_decomposed <- USAccDeaths %>%
 #'     decompose()

diff --git a/R/tidiers_ets.R b/R/tidiers_ets.R
@@ -18,7 +18,6 @@
 #' @examples
 #' library(dplyr)
 #' library(forecast)
-#' library(sweep)
 #'
 #' fit_ets <- WWWusage %>%
 #'     ets()

diff --git a/R/tidiers_nnetar.R b/R/tidiers_nnetar.R
@@ -18,7 +18,6 @@
 #' @examples
 #' library(dplyr)
 #' library(forecast)
-#' library(sweep)
 #'
 #' fit_nnetar <- lynx %>%
 #'     nnetar()

diff --git a/R/utils-broom.R b/R/utils-broom.R
@@ -101,7 +101,7 @@ add_index <- function(ret, rename_index) {
 
     # Rearrange index
     ret <- ret %>%
-        dplyr::select_(rename_index, "dplyr::everything()")
+        dplyr::relocate(dplyr::all_of(rename_index))
 
     return(ret)
 

diff --git a/README.Rmd b/README.Rmd
@@ -15,7 +15,6 @@ knitr::opts_chunk$set(
 ```
 
 ```{r, echo=FALSE}
-library(tidyverse)
 library(tidyquant)
 library(sweep)
 ```

diff --git a/man/sw_sweep.Rd b/man/sw_sweep.Rd
diff --git a/man/sw_tidy.Rd b/man/sw_tidy.Rd
diff --git a/man/sweep-package.Rd b/man/sweep-package.Rd
diff --git a/man/tidiers_HoltWinters.Rd b/man/tidiers_HoltWinters.Rd
diff --git a/man/tidiers_StructTS.Rd b/man/tidiers_StructTS.Rd
diff --git a/man/tidiers_arima.Rd b/man/tidiers_arima.Rd
diff --git a/man/tidiers_bats.Rd b/man/tidiers_bats.Rd
diff --git a/man/tidiers_decomposed_ts.Rd b/man/tidiers_decomposed_ts.Rd
diff --git a/man/tidiers_ets.Rd b/man/tidiers_ets.Rd
diff --git a/man/tidiers_nnetar.Rd b/man/tidiers_nnetar.Rd
diff --git a/tests/testthat.R b/tests/testthat.R
@@ -1,10 +1,12 @@
+# This file is part of the standard setup for testthat.
+# It is recommended that you do not modify it.
+#
+# Where should you do additional test configuration?
+# Learn more about the roles of various files in:
+# * https://r-pkgs.org/testing-design.html#sec-tests-files-overview
+# * https://testthat.r-lib.org/articles/special-files.html
+
 library(testthat)
 library(sweep)
-library(timetk)
-library(forecast)
-library(tidyverse)
-library(lubridate)
-library(tidyquant)
-library(fracdiff)
 
 test_check("sweep")