remove reshape2 package dependency

HopkinsIDD · Dec 2, 2023 · 519405c · 519405c
1 parent bbec9f9
commit 519405c
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 30 deletions.
diff --git a/build/renv/renv.lock b/build/renv/renv.lock
@@ -933,10 +933,7 @@
         "foreach",
         "glue",
         "lubridate",
-        "raster",
-        "reshape2",
         "rlang",
-        "sf",
         "stringdist",
         "stringi",
         "stringr",
@@ -1508,16 +1505,6 @@
       "Hash": "2ebe8c2ec200da649738b0fc35a9b1a1",
       "Requirements": []
     },
-    "plyr": {
-      "Package": "plyr",
-      "Version": "1.8.8",
-      "Source": "Repository",
-      "Repository": "CRAN",
-      "Hash": "d744387aef9047b0b48be2933d78e862",
-      "Requirements": [
-        "Rcpp"
-      ]
-    },
     "png": {
       "Package": "png",
       "Version": "0.1-7",
@@ -1757,18 +1744,6 @@
         "withr"
       ]
     },
-    "reshape2": {
-      "Package": "reshape2",
-      "Version": "1.4.4",
-      "Source": "Repository",
-      "Repository": "CRAN",
-      "Hash": "bb5996d0bd962d214a11140d77589917",
-      "Requirements": [
-        "Rcpp",
-        "plyr",
-        "stringr"
-      ]
-    },
     "reticulate": {
       "Package": "reticulate",
       "Version": "1.25",
@@ -1786,7 +1761,6 @@
         "withr"
       ]
     },
-
     "rlang": {
       "Package": "rlang",
       "Version": "1.0.6",

diff --git a/flepimop/R_packages/flepicommon/DESCRIPTION b/flepimop/R_packages/flepicommon/DESCRIPTION
@@ -18,7 +18,6 @@ Imports:
     data.table,
     rlang,
     ggraph,
-    plyr,
     doParallel,
     foreach,
     jsonlite,

diff --git a/flepimop/R_packages/flepicommon/NAMESPACE b/flepimop/R_packages/flepicommon/NAMESPACE
@@ -33,4 +33,3 @@ import(lubridate)
 import(purrr)
 import(vroom)
 importFrom(magrittr,"%>%")
-importFrom(plyr,revalue)
diff --git a/flepimop/R_packages/flepicommon/R/DataUtils.R b/flepimop/R_packages/flepicommon/R/DataUtils.R
@@ -164,7 +164,6 @@ read_file_of_type <- function(extension,...){
 ##'  $ Confirmed: num [1:198] 3 4 1 3 5 1 3 5 2 3 ...
 ##'  $ Deaths   : num [1:198] 0 0 0 0 0 0 0 0 0 0 ...
 ##'
-##' @importFrom plyr revalue
 ##' @return the case data frame
 ##'
 get_islandareas_data <- function() {
@@ -181,7 +180,7 @@ get_islandareas_data <- function() {
 
   nyt_data <- dplyr::filter(nyt_data, state %in% names(ISLAND_AREAS))
   nyt_data <- dplyr::rename(nyt_data, Update=date, source=state, FIPS=fips, Confirmed=cases, Deaths=deaths) # Rename columns
-  nyt_data <- dplyr::mutate(nyt_data, FIPS=paste0(FIPS,"000"), source=plyr::revalue(source, ISLAND_AREAS, warn_missing=FALSE))
+  nyt_data <- dplyr::mutate(nyt_data, FIPS=paste0(FIPS,"000"), source=dplyr::recode(source, ISLAND_AREAS, warn_missing=FALSE))
 
   validation_date <- Sys.getenv("VALIDATION_DATE")
   if ( validation_date != '' ) {