From 9ad9c13ff38fe7619384958915d02e8ebcd32ca7 Mon Sep 17 00:00:00 2001 From: Daniel Sjoberg Date: Tue, 9 Apr 2024 17:01:00 -0700 Subject: [PATCH 1/5] removing unneeded dependencies --- DESCRIPTION | 14 ++--------- NAMESPACE | 3 +-- R/admiraldev-package.R | 4 +--- R/assertions.R | 9 +++---- R/expect_dfs_equal.R | 1 - R/process_set_values_to.R | 2 +- man/assert_data_frame.Rd | 1 - man/assert_date_var.Rd | 2 +- man/assert_param_does_not_exist.Rd | 3 ++- man/assert_unit.Rd | 3 ++- man/expect_dfs_equal.Rd | 1 - man/process_set_values_to.Rd | 2 +- tests/testthat/test-assertions.R | 26 ++++++++++----------- tests/testthat/test-dataset_vignette.R | 6 ++--- tests/testthat/test-dev_utilities.R | 4 ++-- tests/testthat/test-get.R | 4 ++-- tests/testthat/test-process_set_values_to.R | 6 ++--- vignettes/programming_strategy.Rmd | 5 ++-- vignettes/unit_test_guidance.Rmd | 6 ++--- 19 files changed, 44 insertions(+), 58 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index a792bcb2..cb9d01f4 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -35,35 +35,25 @@ Imports: cli, dplyr (>= 1.0.5), glue (>= 1.6.0), - hms (>= 0.5.3), lifecycle (>= 0.1.0), lubridate (>= 1.7.4), - magrittr (>= 1.5), purrr (>= 0.3.3), rlang (>= 0.4.4), stringr (>= 1.4.0), tidyr (>= 1.0.2), tidyselect (>= 1.0.0) Suggests: - covr, - devtools, diffdf, DT, htmltools, knitr, - lintr, methods, - miniUI, pharmaversesdtm, - pkgdown, rmarkdown, - roxygen2, rstudioapi, spelling, - styler, - testthat (>= 3.0.0), - tibble, - usethis + testthat (>= 3.2.0), + tibble VignetteBuilder: knitr Config/testthat/edition: 3 diff --git a/NAMESPACE b/NAMESPACE index 4c7d13f3..146e3e77 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -69,6 +69,7 @@ export(warn_if_vars_exist) export(what_is_it) importFrom(cli,cli_abort) importFrom(cli,cli_div) +importFrom(dplyr,"%>%") importFrom(dplyr,across) importFrom(dplyr,arrange) importFrom(dplyr,bind_cols) @@ -99,7 +100,6 @@ importFrom(dplyr,ungroup) importFrom(dplyr,union) importFrom(glue,glue) importFrom(glue,glue_collapse) -importFrom(hms,as_hms) importFrom(lifecycle,deprecate_stop) importFrom(lifecycle,deprecate_warn) importFrom(lifecycle,deprecated) @@ -119,7 +119,6 @@ importFrom(lubridate,weeks) importFrom(lubridate,years) importFrom(lubridate,ymd) importFrom(lubridate,ymd_hms) -importFrom(magrittr,"%>%") importFrom(purrr,compose) importFrom(purrr,every) importFrom(purrr,flatten) diff --git a/R/admiraldev-package.R b/R/admiraldev-package.R index 7a3db046..c27b5c2e 100644 --- a/R/admiraldev-package.R +++ b/R/admiraldev-package.R @@ -2,8 +2,7 @@ #' @importFrom dplyr across arrange bind_rows case_when desc ends_with filter #' full_join group_by if_else mutate n pull rename row_number select slice #' starts_with transmute ungroup n_distinct union distinct summarise coalesce -#' bind_cols na_if tibble -#' @importFrom magrittr %>% +#' bind_cols na_if tibble %>% #' @importFrom rlang := abort arg_match as_function as_label as_name as_string #' call2 caller_env call_name current_env .data enexpr enquo eval_bare #' eval_tidy expr expr_interp expr_label exprs f_lhs f_rhs inform missing_arg @@ -21,7 +20,6 @@ #' time_length %--% ymd ymd_hms weeks years hours minutes #' @importFrom tidyr drop_na nest pivot_longer pivot_wider unnest #' @importFrom tidyselect all_of contains vars_select -#' @importFrom hms as_hms #' @importFrom lifecycle deprecate_warn deprecated deprecate_stop #' @importFrom cli cli_abort cli_div #' @importFrom glue glue glue_collapse diff --git a/R/assertions.R b/R/assertions.R index 97b4b490..f8eef643 100644 --- a/R/assertions.R +++ b/R/assertions.R @@ -22,7 +22,6 @@ #' @family assertion #' #' @examples -#' library(tibble) #' library(dplyr) #' library(rlang) #' dm <- tribble( @@ -1169,7 +1168,8 @@ assert_function_param <- function(arg, params) { #' @export #' #' @examples -#' library(tibble) +#' library(dplyr) +#' #' advs <- tribble( #' ~USUBJID, ~VSTESTCD, ~VSTRESN, ~VSSTRESU, ~PARAMCD, ~AVAL, #' "P01", "WEIGHT", 80.1, "kg", "WEIGHT", 80.1, @@ -1242,7 +1242,8 @@ assert_unit <- function(dataset, #' @family assertion #' #' @examples -#' library(tibble) +#' library(dplyr) +#' #' advs <- tribble( #' ~USUBJID, ~VSTESTCD, ~VSTRESN, ~VSSTRESU, ~PARAMCD, ~AVAL, #' "P01", "WEIGHT", 80.1, "kg", "WEIGHT", 80.1, @@ -1675,8 +1676,8 @@ assert_one_to_one <- function(dataset, vars1, vars2) { #' @keywords assertion #' #' @examples -#' library(tibble) #' library(lubridate) +#' library(dplyr) #' library(rlang) #' #' example_fun <- function(dataset, var) { diff --git a/R/expect_dfs_equal.R b/R/expect_dfs_equal.R index efc995cc..e705fb88 100644 --- a/R/expect_dfs_equal.R +++ b/R/expect_dfs_equal.R @@ -17,7 +17,6 @@ #' #' @examples #' library(dplyr, warn.conflicts = FALSE) -#' library(tibble) #' #' tbl1 <- tribble( #' ~USUBJID, ~AGE, ~SEX, diff --git a/R/process_set_values_to.R b/R/process_set_values_to.R index 50921de9..f1322070 100644 --- a/R/process_set_values_to.R +++ b/R/process_set_values_to.R @@ -31,7 +31,7 @@ #' @export #' #' @examples -#' library(tibble) +#' library(dplyr) #' data <- tribble( #' ~AVAL, #' 20 diff --git a/man/assert_data_frame.Rd b/man/assert_data_frame.Rd index cb5fb33c..d628be78 100644 --- a/man/assert_data_frame.Rd +++ b/man/assert_data_frame.Rd @@ -57,7 +57,6 @@ Checks if an argument is a data frame and (optionally) whether is contains a set of required variables } \examples{ -library(tibble) library(dplyr) library(rlang) dm <- tribble( diff --git a/man/assert_date_var.Rd b/man/assert_date_var.Rd index 853fb6c7..d6572a70 100644 --- a/man/assert_date_var.Rd +++ b/man/assert_date_var.Rd @@ -25,8 +25,8 @@ The function throws an error if \code{var} is not a date or datetime variable in Checks if a variable in a dataset is a date or datetime variable } \examples{ -library(tibble) library(lubridate) +library(dplyr) library(rlang) example_fun <- function(dataset, var) { diff --git a/man/assert_param_does_not_exist.Rd b/man/assert_param_does_not_exist.Rd index 1be8196e..1b596f30 100644 --- a/man/assert_param_does_not_exist.Rd +++ b/man/assert_param_does_not_exist.Rd @@ -48,7 +48,8 @@ dataset. Otherwise, the dataset is returned invisibly. Checks if a parameter (\code{PARAMCD}) does not exist in a dataset. } \examples{ -library(tibble) +library(dplyr) + advs <- tribble( ~USUBJID, ~VSTESTCD, ~VSTRESN, ~VSSTRESU, ~PARAMCD, ~AVAL, "P01", "WEIGHT", 80.1, "kg", "WEIGHT", 80.1, diff --git a/man/assert_unit.Rd b/man/assert_unit.Rd index 2cd21165..4762b616 100644 --- a/man/assert_unit.Rd +++ b/man/assert_unit.Rd @@ -56,7 +56,8 @@ Checks if a parameter (\code{PARAMCD}) in a dataset is provided in the expected unit. } \examples{ -library(tibble) +library(dplyr) + advs <- tribble( ~USUBJID, ~VSTESTCD, ~VSTRESN, ~VSSTRESU, ~PARAMCD, ~AVAL, "P01", "WEIGHT", 80.1, "kg", "WEIGHT", 80.1, diff --git a/man/expect_dfs_equal.Rd b/man/expect_dfs_equal.Rd index f4bff834..ae24211d 100644 --- a/man/expect_dfs_equal.Rd +++ b/man/expect_dfs_equal.Rd @@ -25,7 +25,6 @@ thought of as an R-equivalent of SAS proc compare and a useful tool for unit tes } \examples{ library(dplyr, warn.conflicts = FALSE) -library(tibble) tbl1 <- tribble( ~USUBJID, ~AGE, ~SEX, diff --git a/man/process_set_values_to.Rd b/man/process_set_values_to.Rd index 5ed3c567..a9102d1f 100644 --- a/man/process_set_values_to.Rd +++ b/man/process_set_values_to.Rd @@ -32,7 +32,7 @@ catches errors, provides user friendly error messages, and optionally checks the type of the created variables. } \examples{ -library(tibble) +library(dplyr) data <- tribble( ~AVAL, 20 diff --git a/tests/testthat/test-assertions.R b/tests/testthat/test-assertions.R index 615ae02a..76824b17 100644 --- a/tests/testthat/test-assertions.R +++ b/tests/testthat/test-assertions.R @@ -1,7 +1,7 @@ # assert_has_variables ---- ## Test 1: error if a required variable is missing (deprecation error) ---- test_that("assert_has_variables Test 1: error if a required variable is missing (deprecation error)", { # nolint - data <- tibble::tribble( + data <- dplyr::tribble( ~USUBJID, "1" ) @@ -19,7 +19,7 @@ test_that("assert_has_variables Test 1: error if a required variable is missing ## Test 2: no error if a required variable exists (deprecation error) ---- test_that("assert_has_variables Test 2: no error if a required variable exists (deprecation error)", { # nolint - data <- tibble::tribble( + data <- dplyr::tribble( ~USUBJID, "1" ) @@ -80,7 +80,7 @@ test_that("assert_data_frame Test 4: error if not a dataframe", { ## Test 5: assert_data_frame extract_vars() works as intended ---- test_that("assert_data_frame Test 5: assert_data_frame extract_vars() works as intended", { - input <- tibble::tribble( + input <- dplyr::tribble( ~STUDYID, ~USUBJID, ~SEQ, "A", "1", 1, "A", "2", 2, @@ -99,7 +99,7 @@ test_that("assert_data_frame Test 5: assert_data_frame extract_vars() works as i ## Test 6: assert_data_frame works if extract_vars() has NULL input ---- test_that("assert_data_frame Test 6: assert_data_frame works if extract_vars() has NULL input", { - input <- tibble::tribble( + input <- dplyr::tribble( ~STUDYID, ~USUBJID, ~SEQ, "A", "1", 1, "A", "2", 2, @@ -122,7 +122,7 @@ test_that("assert_data_frame Test 7: error if dataframe is grouped", { assert_data_frame(dataset, required_vars = exprs(STUDYID, USUBJID)) } - data <- tibble::tribble( + data <- dplyr::tribble( ~STUDYID, ~USUBJID, ~ARMCD, "xyz", "1", "PLACEBO", "xyz", "2", "ACTIVE" @@ -145,7 +145,7 @@ test_that("assert_data_frame Test 8: error if an expected variable is missing", assert_data_frame(dataset, required_vars = exprs(STUDYID, USUBJID)) } - data <- tibble::tribble( + data <- dplyr::tribble( ~STUDYID, ~ARMCD, "xyz", "PLACEBO", "xyz", "ACTIVE" @@ -167,7 +167,7 @@ test_that("assert_data_frame Test 9: error if expected variables are missing", { assert_data_frame(dataset, required_vars = exprs(STUDYID, USUBJID)) } - data <- tibble::tribble( + data <- dplyr::tribble( ~ARMCD, "PLACEBO", "ACTIVE" @@ -1004,7 +1004,7 @@ test_that("assert_function_param Test 63: error if expected function parameters # assert_unit ---- ## Test 64: no error if the parameter is provided in the expected unit ---- test_that("assert_unit Test 64: no error if the parameter is provided in the expected unit", { - advs <- tibble::tribble( + advs <- dplyr::tribble( ~USUBJID, ~VSTESTCD, ~VSTRESN, ~VSSTRESU, ~PARAMCD, ~AVAL, "P01", "WEIGHT", 80.1, "kg", "WEIGHT", 80.1, "P02", "WEIGHT", 85.7, "kg", "WEIGHT", 85.7 @@ -1017,7 +1017,7 @@ test_that("assert_unit Test 64: no error if the parameter is provided in the exp ## Test 65: error if there are multiple units in the input dataset ---- test_that("assert_unit Test 65: error if there are multiple units in the input dataset", { - advs <- tibble::tribble( + advs <- dplyr::tribble( ~USUBJID, ~VSTESTCD, ~VSTRESN, ~VSSTRESU, ~PARAMCD, ~AVAL, "P01", "WEIGHT", 80.1, "kg", "WEIGHT", 80.1, "P02", "WEIGHT", 85.7, "lb", "WEIGHT", 85.7 @@ -1035,7 +1035,7 @@ test_that("assert_unit Test 65: error if there are multiple units in the input d ## Test 66: error if unexpected unit in the input dataset ---- test_that("assert_unit Test 66: error if unexpected unit in the input dataset", { - advs <- tibble::tribble( + advs <- dplyr::tribble( ~USUBJID, ~VSTESTCD, ~VSTRESN, ~VSSTRESU, ~PARAMCD, ~AVAL, "P01", "WEIGHT", 80.1, "kg", "WEIGHT", 80.1, "P02", "WEIGHT", 85.7, "kg", "WEIGHT", 85.7 @@ -1054,7 +1054,7 @@ test_that("assert_unit Test 66: error if unexpected unit in the input dataset", # assert_param_does_not_exist ---- ## Test 67: error if parameter exists in the input dataset ---- test_that("assert_param_does_not_exist Test 67: error if parameter exists in the input dataset", { - advs <- tibble::tribble( + advs <- dplyr::tribble( ~USUBJID, ~VSTESTCD, ~VSTRESN, ~VSSTRESU, ~PARAMCD, ~AVAL, "P01", "WEIGHT", 80.1, "kg", "WEIGHT", 80.1, "P02", "WEIGHT", 85.7, "kg", "WEIGHT", 85.7 @@ -1073,7 +1073,7 @@ test_that("assert_param_does_not_exist Test 67: error if parameter exists in the ## Test 68: no error if the parameter exists in the dataset ---- test_that("assert_param_does_not_exist Test 68: no error if the parameter exists in the dataset", { - advs <- tibble::tribble( + advs <- dplyr::tribble( ~USUBJID, ~VSTESTCD, ~VSTRESN, ~VSSTRESU, ~PARAMCD, ~AVAL, "P01", "WEIGHT", 80.1, "kg", "WEIGHT", 80.1, "P02", "WEIGHT", 85.7, "kg", "WEIGHT", 85.7 @@ -1289,7 +1289,7 @@ test_that("assert_date_var Test 86: error if variable is not a date or datetime assert_date_var(dataset = dataset, var = !!var) } - my_data <- tibble::tribble( + my_data <- dplyr::tribble( ~USUBJID, ~ADT, "1", ymd("2020-12-06"), "2", ymd("") diff --git a/tests/testthat/test-dataset_vignette.R b/tests/testthat/test-dataset_vignette.R index 8d413bdf..c3aa9fc1 100644 --- a/tests/testthat/test-dataset_vignette.R +++ b/tests/testthat/test-dataset_vignette.R @@ -4,7 +4,7 @@ test_that("dataset_vignette Test 1: A 'knitr_kable' object is outputted when run Sys.setenv(IN_PKGDOWN = "false") # nolint: undesirable_function_linter on.exit(Sys.setenv(IN_PKGDOWN = "")) # nolint: undesirable_function_linter - dm <- tibble::tribble( + dm <- dplyr::tribble( ~STUDYID, ~USUBJID, ~COUNTRY, "STUDY1", "1", "USA", "STUDY1", "2", "USA", @@ -21,7 +21,7 @@ test_that("dataset_vignette Test 2: A 'shiny.tag.list' is outputted when run ins Sys.setenv(IN_PKGDOWN = "true") # nolint: undesirable_function_linter on.exit(Sys.setenv(IN_PKGDOWN = "")) # nolint: undesirable_function_linter - dm <- tibble::tribble( + dm <- dplyr::tribble( ~STUDYID, ~USUBJID, ~COUNTRY, "STUDY1", "1", "USA", "STUDY1", "2", "USA", @@ -36,7 +36,7 @@ test_that("dataset_vignette Test 2: A 'shiny.tag.list' is outputted when run ins ## Test 3: An error is outputted when calling variable not in dataset ---- test_that("dataset_vignette Test 3: An error is outputted when calling variable not in dataset", { - dm <- tibble::tribble( + dm <- dplyr::tribble( ~STUDYID, ~USUBJID, ~COUNTRY, "STUDY1", "1", "USA", "STUDY1", "2", "USA", diff --git a/tests/testthat/test-dev_utilities.R b/tests/testthat/test-dev_utilities.R index acc0ad50..ef10f1d5 100644 --- a/tests/testthat/test-dev_utilities.R +++ b/tests/testthat/test-dev_utilities.R @@ -27,7 +27,7 @@ test_that("convert_dtm_to_dtc Test 3: Error is thrown if dtm is not in correct f # filter_if ---- ## Test 4: Input is returned as is if filter is NULL ---- test_that("filter_if Test 4: Input is returned as is if filter is NULL", { - input <- tibble::tribble( + input <- dplyr::tribble( ~USUBJID, ~VSTESTCD, ~VSSTRESN, "P01", "WEIGHT", 80.9, "P01", "HEIGHT", 189.2 @@ -44,7 +44,7 @@ test_that("filter_if Test 4: Input is returned as is if filter is NULL", { ## Test 5: Input is filtered if filter is not NULL ---- test_that("filter_if Test 5: Input is filtered if filter is not NULL", { - input <- tibble::tribble( + input <- dplyr::tribble( ~USUBJID, ~VSTESTCD, ~VSSTRESN, "P01", "WEIGHT", 80.9, "P01", "HEIGHT", 189.2 diff --git a/tests/testthat/test-get.R b/tests/testthat/test-get.R index 1988fdcc..f1193098 100644 --- a/tests/testthat/test-get.R +++ b/tests/testthat/test-get.R @@ -1,7 +1,7 @@ # get_constant_vars ---- ## Test 1: without ignore_vars ---- test_that("get_constant_vars Test 1: without ignore_vars", { - data <- tibble::tribble( + data <- dplyr::tribble( ~USUBJID, ~AGE, ~AVISIT, "1", 26, "BASELINE", "1", 26, "WEEK 1", @@ -17,7 +17,7 @@ test_that("get_constant_vars Test 1: without ignore_vars", { ## Test 2: with ignore_vars ---- test_that("get_constant_vars Test 2: with ignore_vars", { - data <- tibble::tribble( + data <- dplyr::tribble( ~USUBJID, ~AGE, ~WGTBL, ~HGTBL, ~AVISIT, "1", 26, 61, 172, "BASELINE", "1", 26, 61, 172, "WEEK 1", diff --git a/tests/testthat/test-process_set_values_to.R b/tests/testthat/test-process_set_values_to.R index 44c44712..b0e4ac13 100644 --- a/tests/testthat/test-process_set_values_to.R +++ b/tests/testthat/test-process_set_values_to.R @@ -1,6 +1,6 @@ ## Test 1: add variables ---- test_that("process_set_values_to Test 1: add variables", { - bds <- tibble::tribble( + bds <- dplyr::tribble( ~USUBJID, ~AVAL, "1", 20, "2", 35 @@ -32,7 +32,7 @@ test_that("process_set_values_to Test 1: add variables", { ## Test 2: catch error ---- test_that("process_set_values_to Test 2: catch error", { - bds <- tibble::tribble( + bds <- dplyr::tribble( ~USUBJID, ~AVAL, "1", 20, "2", 35 @@ -54,7 +54,7 @@ test_that("process_set_values_to Test 2: catch error", { ## Test 3: check types ---- test_that("process_set_values_to Test 3: check types", { - bds <- tibble::tribble( + bds <- dplyr::tribble( ~USUBJID, ~AVAL, "1", 20, "2", 35 diff --git a/vignettes/programming_strategy.Rmd b/vignettes/programming_strategy.Rmd index feefbe1b..1590892d 100644 --- a/vignettes/programming_strategy.Rmd +++ b/vignettes/programming_strategy.Rmd @@ -373,7 +373,6 @@ An example is given below: #' @examples #' library(lubridate) #' library(dplyr, warn.conflicts = FALSE) -#' library(tibble) #' #' datain <- tribble( #' ~TRTSDTM, ~ASTDTM, ~AENDT, @@ -410,7 +409,7 @@ Any newly added variable(-s) should be mentioned here. * `@examples`: A fully self-contained example of how to use the function. Self-contained means that, if this code is executed in a new R session, it will run without errors. That means any packages need to be loaded with `library()` and any datasets needed either to be created directly inside the example code or loaded using `data()`. -If a dataset is created in the example, it should be done so using the function `tribble()` (specify `library(tibble)` before calling this function). +If a dataset is created in the example, it should be done so using the function `tribble()` (specify `library(dplyr)` before calling this function). If other functions are called in the example, please specify `library(pkg_name)` then refer to the respective function `fun()` as opposed to the preferred `pkg_name::fun()` notation as specified in [Unit Test Guidance](unit_test_guidance.html#set-up-the-test-script). Make sure to align columns as this ensures quick code readability. @@ -540,7 +539,7 @@ By using the `@importFrom` tag, it is easier to track all of our dependencies in Some of these functions become critically important while using admiral and should be included as an export. This applies to functions which are frequently called within `{admiral }`function calls like `rlang::exprs()`, `dplyr::desc()` -or the pipe operator `magrittr::%>%`. To export these functions, the following R +or the pipe operator `dplyr::%>%`. To export these functions, the following R code should be included in the `R/reexports.R` file using the format: ``` diff --git a/vignettes/unit_test_guidance.Rmd b/vignettes/unit_test_guidance.Rmd index 45ad4f8f..59a09f46 100644 --- a/vignettes/unit_test_guidance.Rmd +++ b/vignettes/unit_test_guidance.Rmd @@ -149,7 +149,7 @@ the testing framework used is testthat and has the following format : ## Test 1: ---- test_that(" Test 1: ", { - input <- tibble::tribble( + input <- dplyr::tribble( ~inputvar1, ~inputvar2, ... ... @@ -176,7 +176,7 @@ Open the newly created file `test-all_funcs.R` and use the following format: ## Test 1: ---- test_that("my_new_func Test 1: ", { - input <- tibble::tribble( + input <- dplyr::tribble( ~inputvar1, ~inputvar2, ... ... @@ -196,7 +196,7 @@ The input and expected output for the unit tests must follow the following rules * If values need to be derived, only unit tested functions can be used. In contrast to the [Programming Strategy](programming_strategy.html#function-header-documentation) documentation for function examples, test files should not include `library(pkg_name)` calls. -If a dataset needs to be created for testing purposes, it should be done so using the function `tribble()` from the `tibble` package with the following command `tibble::tribble()`. +If a dataset needs to be created for testing purposes, it should be done so using the function `tribble()` from the `tibble` package with the following command `dplyr::tribble()`. Furthermore, if other functions need to be called, it should also be done using `pkg_name::fun()`notation. Make sure to align columns as well. This ensures quick code readability. From 3f1bfde962286d63f1a028134056d2f9bf0c658f Mon Sep 17 00:00:00 2001 From: Daniel Sjoberg Date: Tue, 9 Apr 2024 17:03:59 -0700 Subject: [PATCH 2/5] Update DESCRIPTION --- DESCRIPTION | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index cb9d01f4..3697da99 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -52,8 +52,7 @@ Suggests: rmarkdown, rstudioapi, spelling, - testthat (>= 3.2.0), - tibble + testthat (>= 3.2.0) VignetteBuilder: knitr Config/testthat/edition: 3 From efa2953777ddbdf5edc25ebc1161fb8b4a93e0e4 Mon Sep 17 00:00:00 2001 From: Daniel Sjoberg Date: Tue, 9 Apr 2024 17:49:31 -0700 Subject: [PATCH 3/5] Update DESCRIPTION --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 18ba182e..3fb052a5 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -30,7 +30,7 @@ URL: https://pharmaverse.github.io/admiraldev/, https://github.com/pharmaverse/admiraldev/ BugReports: https://github.com/pharmaverse/admiraldev/issues Depends: - R (>= 3.5) + R (>= 4.0) Imports: cli, dplyr (>= 1.0.5), From c95ac54b07e4b7b01af7cb4a7054a081ebf43714 Mon Sep 17 00:00:00 2001 From: Daniel Sjoberg Date: Tue, 9 Apr 2024 17:53:55 -0700 Subject: [PATCH 4/5] Update NEWS.md --- NEWS.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/NEWS.md b/NEWS.md index 4ea9c618..133b5de4 100644 --- a/NEWS.md +++ b/NEWS.md @@ -15,6 +15,13 @@ strategy. (#353) - The "Release Strategy" vignette now contains a short new "Release Tracking" section linking to an external dashboard for CRAN packages that are awaiting release. (#358) +## Other + +- Removed dependencies not needed to build package or package documentation. (#426) + +- Increased minimum R version required to 4.0 to match {admiral}. (#382) + + # admiraldev 1.0.0 ## New Features From 32f9aa1cf0c7460f1178eef67319e14f2357df6b Mon Sep 17 00:00:00 2001 From: Daniel Sjoberg Date: Fri, 12 Apr 2024 12:00:01 -0700 Subject: [PATCH 5/5] Update test-assertions.R --- tests/testthat/test-assertions.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/testthat/test-assertions.R b/tests/testthat/test-assertions.R index c8be126a..b9063e79 100644 --- a/tests/testthat/test-assertions.R +++ b/tests/testthat/test-assertions.R @@ -1291,7 +1291,7 @@ test_that("assert_one_to_one Test 85: error if there is a many to one mapping", ## Test 86: dataset is returned invisible if one-to-one ---- test_that("assert_one_to_one Test 86: dataset is returned invisible if one-to-one", { - df <- tibble::tribble( + df <- dplyr::tribble( ~SPECIES, ~SPECIESN, "DOG", 1L, "CAT", 2L,