missing loading of geodata; rm curl

PredictiveEcology · May 31, 2024 · 4e2dac3 · 4e2dac3
1 parent 696e6b8
commit 4e2dac3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -6,7 +6,7 @@ URL:
     https://spades-project.predictiveecology.org/,
     https://github.com/PredictiveEcology/SpaDES.project
 Date: 2024-05-31
-Version: 0.0.8.9057
+Version: 0.0.8.9058
 Authors@R: c(
     person("Eliot J B", "McIntire", email = "[email protected]",
            role = c("aut", "cre"), comment = c(ORCID = "0000-0002-6914-8316")),
@@ -31,7 +31,6 @@ Imports:
 Suggests:
     covr,
     crayon,
-    curl,
     digest,
     ellipsis,
     filelock,

diff --git a/R/setupProject.R b/R/setupProject.R
@@ -2291,7 +2291,7 @@ setupStudyArea <- function(studyArea, paths, envir, verbose = getOption("Require
     if (requireNamespace("reproducible", quietly = TRUE))
       # Cache doesn't evaluate the `theCall` inside eval, so need .cacheExtra to identify the actual contents
       studyArea <- reproducible::Cache(eval(theCall), .cacheExtra = list(studyArea, getStudyArea),
-                                       omitArgs = c("enclos", "envir"),
+                                       omitArgs = c("enclos", "envir"), verbose = verbose,
                                        cachePath = paths$cachePath, .functionName = "getStudyArea")
     else
       studyArea <- eval(theCall)

diff --git a/tests/testthat/helpers.R b/tests/testthat/helpers.R
@@ -14,7 +14,7 @@ setupTest <- function(pkgs, envir = parent.frame(), name = .rndstr(1), first = F
 
   warns <- capture_warnings({
     # withr::local_package("googledrive", .local_envir = envir)
-    withr::local_package("curl", .local_envir = envir)
+    # withr::local_package("curl", .local_envir = envir)
     withr::local_package("crayon", .local_envir = envir)
     withr::local_package("httr", .local_envir = envir)
     withr::local_package("waldo", .local_envir = envir)
@@ -31,8 +31,12 @@ setupTest <- function(pkgs, envir = parent.frame(), name = .rndstr(1), first = F
   #   }
   # }
 
-  # if (!missing(pkgs))
-  #   lapply(pkgs, withr::local_package, .local_envir = envir)
+  if (!missing(pkgs)) {
+    lapply(pkgs, function(pk) {
+      skip_if_not_installed(pk)
+      withr::local_package(pk, .local_envir = envir)
+    })
+  }
 
   # withr::local_libpaths(Require::tempdir2(.rndstr(1)), .local_envir = envir)