Merge branch 'main' into 183_split_df

atorus-research · Feb 26, 2024 · e2a1162 · e2a1162
2 parents 7bd3db2 + c5468df
commit e2a1162
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 17 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: xportr
 Title: Utilities to Output CDISC SDTM/ADaM XPT Files
-Version: 0.3.1.9021
+Version: 0.3.1.9023
 Authors@R: c(
     person("Eli", "Miller", , "[email protected]", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0002-2127-9456")),
@@ -30,15 +30,13 @@ Imports:
     dplyr (>= 1.0.2),
     glue (>= 1.4.2),
     haven (>= 2.5.0),
-    janitor,
     lifecycle,
     magrittr,
     purrr (>= 0.3.4),
     readr,
     rlang (>= 0.4.10),
     stringr (>= 1.4.0),
-    tidyselect,
-    tm
+    tidyselect
 Suggests: 
     admiral,
     DT,

diff --git a/NAMESPACE b/NAMESPACE
@@ -56,7 +56,6 @@ importFrom(dplyr,ungroup)
 importFrom(glue,glue)
 importFrom(glue,glue_collapse)
 importFrom(graphics,stem)
-importFrom(janitor,make_clean_names)
 importFrom(lifecycle,deprecated)
 importFrom(magrittr,"%>%")
 importFrom(magrittr,extract2)
@@ -67,6 +66,7 @@ importFrom(purrr,map_chr)
 importFrom(purrr,map_dbl)
 importFrom(purrr,pluck)
 importFrom(purrr,walk)
+importFrom(purrr,walk2)
 importFrom(readr,parse_number)
 importFrom(stringr,str_detect)
 importFrom(stringr,str_extract)
@@ -75,7 +75,6 @@ importFrom(stringr,str_replace_all)
 importFrom(tidyselect,all_of)
 importFrom(tidyselect,any_of)
 importFrom(tidyselect,where)
-importFrom(tm,stemDocument)
 importFrom(utils,capture.output)
 importFrom(utils,packageVersion)
 importFrom(utils,str)

diff --git a/NEWS.md b/NEWS.md
@@ -3,12 +3,17 @@
 ## New Features and Bug Fixes
 
 * `xportr_metadata()` can set `verbose` for a whole pipeline, i.e. setting `verbose` in `xportr_metadata()` will populate to all `xportr` functions.  (#151)
+
 * All `xportr` functions now have `verbose = NULL` as the default (#151)
+
 * Remove unused packages from Suggests (#221)
 
 * `xportr_write()` now accepts `metadata` argument which can be used to set the dataset label to stay consistent with the other `xportr_*` functions. It is noteworthy that the dataset label set using the `xportr_df_label()` function will be retained during the `xportr_write()`.
+
 * Exporting a new dataset `dataset_spec` that contains the Dataset Specification for ADSL. (#179)
+
 * Added a check for character variable lengths up to 200 bytes in `xpt_validate()`(#91, #189).
+
 * File name check is moved to strict_checks condition to allow underscores in the file name. Underscores are allowed in xpt but not per FDA requirements. (#126)
 
 * It is now possible to get and set the xportr options using the helper function `xportr_options()` (#130)
@@ -26,6 +31,8 @@
 
 * New argument in `xportr_length()` allows selection between the length from metadata, as previously done, or from the calculated maximum length per variable when `length_source` is set to “data” (#91)
 
+* Make `xportr_type()` drop factor levels when coercing variables
+
 * `xportr_length()` assigns the maximum length value instead of 200 for a character variable when the length is missing in the metadata (#207)
 
 ## Deprecation and Breaking Changes
@@ -51,17 +58,13 @@ done to make the use of xportr functions more explicit. (#182)
 
 * Tests use `{withr}` to create temporary files that are automatically deleted (#219)
 
-# xportr 0.3.1
+# xportr 0.3.2
 
-## New Features and Bug Fixes
-
-* Make `xportr_type()` drop factor levels when coercing variables
+* Removed unused packages, `{tm}` and `{janitor}` from Imports (#241)
 
-## Documentation
-
-* Set up Development version of Website (#187)
+# xportr 0.3.1
 
-## Deprecation and Breaking Changes
+* Fixed issues around code coverage (#170) and `lintr` (#176)
 
 # xportr 0.3.0
 

diff --git a/R/length.R b/R/length.R
@@ -167,6 +167,5 @@ xportr_length <- function(.df,
     max_length_msg(length_msg, verbose)
   }
 
-
   .df
 }
diff --git a/R/xportr-package.R b/R/xportr-package.R
@@ -112,9 +112,8 @@
 #' @importFrom utils capture.output str tail packageVersion
 #' @importFrom stringr str_detect str_extract str_replace str_replace_all
 #' @importFrom readr parse_number
+#' @importFrom purrr map_chr map2_chr walk walk2 map map_dbl pluck
 #' @importFrom purrr map_chr map2_chr walk iwalk map map_dbl pluck
-#' @importFrom janitor make_clean_names
-#' @importFrom tm stemDocument
 #' @importFrom graphics stem
 #' @importFrom magrittr %>% extract2
 #' @importFrom checkmate assert assert_character assert_choice assert_data_frame
-Original file line number
+Diff line change
@@ Expand Up / @@ -167,6 +167,5 @@ xportr_length <- function(.df, @@
         max_length_msg(length_msg, verbose)
       }
       .df
     }