more hotfix updates after team discussion

pharmaverse · Jun 15, 2023 · 5eaf22c · 5eaf22c
1 parent 88d0240
commit 5eaf22c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -9,7 +9,6 @@ export(log_write)
 export(write_log_header)
 export(write_unapproved_functions)
 export(write_used_functions)
-importFrom(dplyr,across)
 importFrom(dplyr,anti_join)
 importFrom(dplyr,coalesce)
 importFrom(dplyr,distinct)
@@ -59,7 +58,6 @@ importFrom(stringr,str_starts)
 importFrom(tibble,tibble)
 importFrom(tidyr,all_of)
 importFrom(tidyr,complete)
-importFrom(tidyr,everything)
 importFrom(tidyr,pivot_wider)
 importFrom(utils,capture.output)
 importFrom(utils,getParseData)

diff --git a/NEWS.md b/NEWS.md
@@ -1,6 +1,7 @@
 # logrx 0.2.2
 
- - hotfix for update to `across()` and `.data$var` updates in source packages (#172)
+ - Hotfix to remove unnecessary `across()` and update `.data$var` top new syntax to match updates in source packages (#172)
+ - Add `{dplyr}` version requirement
 
 # logrx 0.2.1
 

diff --git a/R/get.R b/R/get.R
@@ -139,8 +139,8 @@ get_masked_functions <- function(){
 #' @param file File path of file to run
 #'
 #' @return tibble with `library` and `function_name`
-#' @importFrom dplyr select distinct across mutate coalesce group_by ungroup
-#' @importFrom tidyr pivot_wider complete all_of everything
+#' @importFrom dplyr select distinct mutate coalesce group_by ungroup
+#' @importFrom tidyr pivot_wider complete all_of
 #' @importFrom purrr safely
 #' @importFrom tibble tibble
 #' @importFrom utils getParseData
@@ -197,8 +197,7 @@ get_used_functions <- function(file){
 
    get_library(combine_tokens) %>%
       select(all_of(c("function_name", "library"))) %>%
-      distinct(across(.cols = everything(),
-                      .fns = NULL))
+      distinct()
 
 }
 
@@ -241,7 +240,7 @@ get_library <- function(df){
       mutate(library = ifelse(
          !is.na(df$SYMBOL_PACKAGE),
          paste0("package:", df$SYMBOL_PACKAGE),
-         .data$library)
+         .data[["library"]])
       )
 }