Merge branch 'release/1.22.1'

ctsit · Apr 23, 2024 · fed4876 · fed4876
2 parents d9d692a + 7c237fd
commit fed4876
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 8 deletions.
diff --git a/.github/workflows/run-tests.yaml b/.github/workflows/run-tests.yaml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
 
     container:
-      image: ghcr.io/ctsit/rstudio-ci:4.2.1
+      image: ghcr.io/ctsit/rstudio-ci:4.3.3
 
     env:
       CI: "TRUE"

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: redcapcustodian
 Type: Package
 Title: Data automation for R-centric workflows with a nod towards REDCap
-Version: 1.22.0
+Version: 1.22.1
 Authors@R: c(
   person("Philip", "Chase",
         email = "[email protected]",
@@ -56,7 +56,7 @@ Imports:
     tidyr,
     vctrs,
     jsonlite,
-    writexl
+    openxlsx
 Suggests:
     RSQLite,
     digest,

diff --git a/Dockerfile b/Dockerfile
@@ -25,7 +25,7 @@ RUN R -e "install.packages(c( \
   'rjson', \
   'sendmailR', \
   'sqldf', \
-  'writexl', \
+  'openxlsx', \
   'kableExtra' \
 ))"
 

diff --git a/NAMESPACE b/NAMESPACE
@@ -61,6 +61,6 @@ export(write_info_log_entry)
 export(write_summary_metrics)
 export(write_to_sql_db)
 importFrom(magrittr,"%>%")
+importFrom(openxlsx,write.xlsx)
 importFrom(rlang,.data)
 importFrom(sendmailR,"sendmail")
-importFrom(writexl,write_xlsx)
diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+# redcapcustodian 1.22.1 (released 2024-04-23)
+- Update run-tests.yaml to use rstudio-ci:4.3.3 (@pbchase, #157)
+- Switch send_mail() to use openxlsx (@ljwoodley, #152, #157)
+
 # redcapcustodian 1.22.0 (released 2024-03-26)
 - Implement hacky fix for tlmgr 2023 being unable to install packages (@ChemiKyle, #156)
 - Fix bug that prevented email_body from being included in email (@ljwoodley, @ChemiKyle, #155)

diff --git a/R/logging.R b/R/logging.R
@@ -656,7 +656,7 @@ write_info_log_entry <- function(conn, target_db_name, table_written = NULL, df,
 #'
 #' }
 #' @importFrom sendmailR "sendmail"
-#' @importFrom writexl write_xlsx
+#' @importFrom openxlsx write.xlsx
 #' @export
 send_email <-
   function(email_body,
@@ -711,7 +711,7 @@ send_email <-
           if (file_extension == "csv") {
             readr::write_csv(df_to_email[[i]], file_fullpath, ...)
           } else if (file_extension == "xlsx") {
-            writexl::write_xlsx(df_to_email[[i]], file_fullpath, ...)
+            openxlsx::write.xlsx(df_to_email[[i]], file_fullpath, ...)
           } else {
             stop("Unsupported file format. Use 'csv' or 'xlsx'.")
           }

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.22.0
+1.22.1