From 134ada76dbb4b77aa78549cfb3d98f95c1337d0f Mon Sep 17 00:00:00 2001 From: Pascal Sauer <156898545+pascal-sauer@users.noreply.github.com> Date: Tue, 24 Sep 2024 12:07:51 +0200 Subject: [PATCH 1/3] pkgType --- .Rprofile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.Rprofile b/.Rprofile index 43d47c62c..bc514ec1f 100644 --- a/.Rprofile +++ b/.Rprofile @@ -37,5 +37,5 @@ if (isTRUE(rownames(installed.packages(priority = "NA")) == "renv")) { # in case bootstrapping fails halfway, install piamenv and rely on requirement auto-fixing if (tryCatch(utils::packageVersion("piamenv") < "0.5.5", error = function(error) TRUE)) { - renv::install("piamenv", type = getOption("pkgType"), prompt = FALSE) + renv::install("piamenv", prompt = FALSE) } From f3bea2e8729086cb3a45a72dd4f2d2078317c3c9 Mon Sep 17 00:00:00 2001 From: Pascal Sauer <156898545+pascal-sauer@users.noreply.github.com> Date: Wed, 16 Oct 2024 10:23:42 +0200 Subject: [PATCH 2/3] renv 1.0.11 --- renv/activate.R | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/renv/activate.R b/renv/activate.R index c360bf296..0eb51088a 100644 --- a/renv/activate.R +++ b/renv/activate.R @@ -2,7 +2,7 @@ local({ # the requested version of renv - version <- "1.0.9" + version <- "1.0.11" attr(version, "sha") <- NULL # the project directory @@ -368,8 +368,7 @@ local({ quiet = TRUE ) - if ("headers" %in% names(formals(utils::download.file))) - { + if ("headers" %in% names(formals(utils::download.file))) { headers <- renv_bootstrap_download_custom_headers(url) if (length(headers) && is.character(headers)) args$headers <- headers @@ -457,9 +456,8 @@ local({ # add custom headers if available -- note that # utils::available.packages() will pass this to download.file() - if ("headers" %in% names(formals(utils::download.file))) - { - headers <- renv_bootstrap_download_custom_headers(url) + if ("headers" %in% names(formals(utils::download.file))) { + headers <- renv_bootstrap_download_custom_headers(repos) if (length(headers) && is.character(headers)) args$headers <- headers } From 408062ec202279c879aaa06a11f2cfb664052407 Mon Sep 17 00:00:00 2001 From: Pascal Sauer <156898545+pascal-sauer@users.noreply.github.com> Date: Wed, 16 Oct 2024 10:33:43 +0200 Subject: [PATCH 3/3] prevent warning by installing rmarkdown --- .Rprofile | 1 + 1 file changed, 1 insertion(+) diff --git a/.Rprofile b/.Rprofile index bc514ec1f..049e1ce91 100644 --- a/.Rprofile +++ b/.Rprofile @@ -27,6 +27,7 @@ if (!"https://rse.pik-potsdam.de/r/packages" %in% getOption("repos")) { # bootstrapping, will only run once after this repo is freshly cloned if (isTRUE(rownames(installed.packages(priority = "NA")) == "renv")) { message("R package dependencies are not installed in this renv, installing now...") + renv::install("rmarkdown", prompt = FALSE) # rmarkdown is required to find dependencies in Rmd files renv::hydrate(prompt = FALSE, report = FALSE) # auto-detect and install all dependencies message("Finished installing R package dependencies.") if (!("upstream" %in% gert::git_remote_list()$name)) {