cleaning up the tests

Author: dsweber2

Makefile

@@ -17,18 +17,12 @@ prod-covid-log:
 prod-covid:
 	export TAR_RUN_PROJECT=covid_hosp_prod; Rscript scripts/run.R
 
-prod-covid-2:
-	export TAR_RUN_PROJECT=covid_hosp_prod_2; Rscript scripts/run.R
-
 prod-flu-log:
 	export TAR_RUN_PROJECT=flu_hosp_prod; Rscript scripts/run.R >> cache/logs/prod_flu 2>&1
 
 prod-flu:
 	export TAR_RUN_PROJECT=flu_hosp_prod; Rscript scripts/run.R
 
-prod-flu-2:
-	export TAR_RUN_PROJECT=flu_hosp_prod2; Rscript scripts/run.R
-
 prod: prod-covid prod-flu update-site netlify
 
 prod-log: prod-covid-log prod-flu-log update-site-log netlify-log

_targets.yaml

@@ -18,13 +18,3 @@ covid_hosp_prod:
   store: covid_hosp_prod
   use_crew: yes
   reporter_make: timestamp
-covid_hosp_prod_2:
-  script: scripts/covid_hosp_prod_2.R
-  store: covid_hosp_prod_2
-  use_crew: yes
-  reporter_make: timestamp
-flu_hosp_prod2:
-  script: scripts/flu_hosp_prod2.R
-  store: flu_hosp_prod2
-  use_crew: yes
-  reporter_make: timestamp

flu_hosp_prod2/.gitignore

@@ -2,7 +2,8 @@
 local({
 
   # the requested version of renv
-  version <- "1.1.5"
+  version <- "1.1.6"
+  attr(version, "md5") <- "3036c4b273d882c56e8cdd660ebaf6f0"
   attr(version, "sha") <- NULL
 
   # the project directory
@@ -215,6 +216,16 @@ local({
     section <- header(sprintf("Bootstrapping renv %s", friendly))
     catf(section)
 
+    # try to install renv from cache
+    md5 <- attr(version, "md5", exact = TRUE)
+    if (length(md5)) {
+      pkgpath <- renv_bootstrap_find(version)
+      if (length(pkgpath) && file.exists(pkgpath)) {
+        file.copy(pkgpath, library, recursive = TRUE)
+        return(invisible())
+      }
+    }
+  
     # attempt to download renv
     catf("- Downloading renv ... ", appendLF = FALSE)
     withCallingHandlers(
@@ -240,7 +251,6 @@ local({
 
     # add empty line to break up bootstrapping from normal output
     catf("")
-  
     return(invisible())
   }
 
@@ -256,14 +266,22 @@ local({
     # check for repos override
     repos <- Sys.getenv("RENV_CONFIG_REPOS_OVERRIDE", unset = NA)
     if (!is.na(repos)) {
-  
-      # check for RSPM; if set, use a fallback repository for renv
-      rspm <- Sys.getenv("RSPM", unset = NA)
-      if (identical(rspm, repos))
-        repos <- c(RSPM = rspm, CRAN = cran)
-  
-      return(repos)
-  
+
+      # split on ';' if present
+      parts <- strsplit(repos, ";", fixed = TRUE)[[1L]]
+
+      # split into named repositories if present
+      idx <- regexpr("=", parts, fixed = TRUE)
+      keys <- substring(parts, 1L, idx - 1L)
+      vals <- substring(parts, idx + 1L)
+      names(vals) <- keys
+
+      # if we have a single unnamed repository, call it CRAN
+      if (length(vals) == 1L && identical(keys, ""))
+        names(vals) <- "CRAN"
+
+      return(vals)
+
     }
 
     # check for lockfile repositories
@@ -511,6 +529,45 @@ local({
 
   }
 
+  renv_bootstrap_find <- function(version) {
+  
+    path <- renv_bootstrap_find_cache(version)
+    if (length(path) && file.exists(path)) {
+      catf("- Using renv %s from global package cache", version)
+      return(path)
+    }
+  
+  }
+  
+  renv_bootstrap_find_cache <- function(version) {
+  
+    md5 <- attr(version, "md5", exact = TRUE)
+    if (is.null(md5))
+      return()
+  
+    # infer path to renv cache
+    cache <- Sys.getenv("RENV_PATHS_CACHE", unset = "")
+    if (!nzchar(cache)) {
+      tools <- asNamespace("tools")
+      if (is.function(tools$R_user_dir)) {
+        root <- tools$R_user_dir("renv", "cache")
+        cache <- file.path(root, "cache")
+      }
+    }
+  
+    # start completing path to cache
+    file.path(
+      cache,
+      renv_bootstrap_cache_version(),
+      renv_bootstrap_platform_prefix(),
+      "renv",
+      version,
+      md5,
+      "renv"
+    )
+  
+  }
+  
   renv_bootstrap_download_tarball <- function(version) {
 
     # if the user has provided the path to a tarball via
@@ -1181,6 +1238,18 @@ local({
 
   }
 
+  renv_bootstrap_cache_version <- function() {
+    # NOTE: users should normally not override the cache version;
+    # this is provided just to make testing easier
+    Sys.getenv("RENV_CACHE_VERSION", unset = "v5")
+  }
+  
+  renv_bootstrap_cache_version_previous <- function() {
+    version <- renv_bootstrap_cache_version()
+    number <- as.integer(substring(version, 2L))
+    paste("v", number - 1L, sep = "")
+  }
+  
   renv_json_read <- function(file = NULL, text = NULL) {
 
     jlerr <- NULL