Skip to content

Commit

Permalink
[actions] update 12 packages (#81)
Browse files Browse the repository at this point in the history
Co-authored-by: zkamvar <[email protected]>
  • Loading branch information
carpentries-bot and zkamvar authored May 13, 2024
1 parent b212b66 commit bb3a4a4
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 35 deletions.
43 changes: 31 additions & 12 deletions renv/activate.R
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,13 @@
local({

# the requested version of renv
version <- "1.0.5"
version <- "1.0.7"
attr(version, "sha") <- NULL

# the project directory
project <- getwd()
project <- Sys.getenv("RENV_PROJECT")
if (!nzchar(project))
project <- getwd()

# use start-up diagnostics if enabled
diagnostics <- Sys.getenv("RENV_STARTUP_DIAGNOSTICS", unset = "FALSE")
Expand Down Expand Up @@ -129,6 +131,21 @@ local({

}

heredoc <- function(text, leave = 0) {

# remove leading, trailing whitespace
trimmed <- gsub("^\\s*\\n|\\n\\s*$", "", text)

# split into lines
lines <- strsplit(trimmed, "\n", fixed = TRUE)[[1L]]

# compute common indent
indent <- regexpr("[^[:space:]]", lines)
common <- min(setdiff(indent, -1L)) - leave
paste(substring(lines, common), collapse = "\n")

}

startswith <- function(string, prefix) {
substring(string, 1, nchar(prefix)) == prefix
}
Expand Down Expand Up @@ -631,6 +648,9 @@ local({

# if the user has requested an automatic prefix, generate it
auto <- Sys.getenv("RENV_PATHS_PREFIX_AUTO", unset = NA)
if (is.na(auto) && getRversion() >= "4.4.0")
auto <- "TRUE"

if (auto %in% c("TRUE", "True", "true", "1"))
return(renv_bootstrap_platform_prefix_auto())

Expand Down Expand Up @@ -822,24 +842,23 @@ local({

# the loaded version of renv doesn't match the requested version;
# give the user instructions on how to proceed
remote <- if (!is.null(description[["RemoteSha"]])) {
dev <- identical(description[["RemoteType"]], "github")
remote <- if (dev)
paste("rstudio/renv", description[["RemoteSha"]], sep = "@")
} else {
else
paste("renv", description[["Version"]], sep = "@")
}

# display both loaded version + sha if available
friendly <- renv_bootstrap_version_friendly(
version = description[["Version"]],
sha = description[["RemoteSha"]]
sha = if (dev) description[["RemoteSha"]]
)

fmt <- paste(
"renv %1$s was loaded from project library, but this project is configured to use renv %2$s.",
"- Use `renv::record(\"%3$s\")` to record renv %1$s in the lockfile.",
"- Use `renv::restore(packages = \"renv\")` to install renv %2$s into the project library.",
sep = "\n"
)
fmt <- heredoc("
renv %1$s was loaded from project library, but this project is configured to use renv %2$s.
- Use `renv::record(\"%3$s\")` to record renv %1$s in the lockfile.
- Use `renv::restore(packages = \"renv\")` to install renv %2$s into the project library.
")
catf(fmt, friendly, renv_bootstrap_version_friendly(version), remote)

FALSE
Expand Down
46 changes: 23 additions & 23 deletions renv/profiles/lesson-requirements/renv.lock
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,13 @@
},
"BiocManager": {
"Package": "BiocManager",
"Version": "1.30.22",
"Version": "1.30.23",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"utils"
],
"Hash": "d57e43105a1aa9cb54fdb4629725acb1"
"Hash": "47e968dfe563c1b22c2e20a067ec21d5"
},
"BiocParallel": {
"Package": "BiocParallel",
Expand Down Expand Up @@ -513,7 +513,7 @@
},
"bookdown": {
"Package": "bookdown",
"Version": "0.38",
"Version": "0.39",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
Expand All @@ -526,7 +526,7 @@
"xfun",
"yaml"
],
"Hash": "388b27ab03b34a5c9704fb8cd1dae880"
"Hash": "cb4f7066855b6f936e8d25edc9a9cff9"
},
"bslib": {
"Package": "bslib",
Expand Down Expand Up @@ -608,7 +608,7 @@
"Package": "curl",
"Version": "5.2.1",
"Source": "Repository",
"Repository": "carpentries",
"Repository": "RSPM",
"Requirements": [
"R"
],
Expand Down Expand Up @@ -667,14 +667,14 @@
},
"fs": {
"Package": "fs",
"Version": "1.6.3",
"Version": "1.6.4",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"R",
"methods"
],
"Hash": "47b5f30c720c23999b913a1a635cf0bb"
"Hash": "15aeb8c27f5ea5161f9f6a641fafd93a"
},
"futile.logger": {
"Package": "futile.logger",
Expand Down Expand Up @@ -734,7 +734,7 @@
},
"htmltools": {
"Package": "htmltools",
"Version": "0.5.8",
"Version": "0.5.8.1",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
Expand All @@ -746,7 +746,7 @@
"rlang",
"utils"
],
"Hash": "149431ee39aba5bdc264112c8ff94444"
"Hash": "81d371a9cc60640e74e4ab6ac46dcedc"
},
"httr": {
"Package": "httr",
Expand Down Expand Up @@ -785,7 +785,7 @@
},
"knitr": {
"Package": "knitr",
"Version": "1.45",
"Version": "1.46",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
Expand All @@ -797,7 +797,7 @@
"xfun",
"yaml"
],
"Hash": "1ec462871063897135c1bcbe0fc8f07d"
"Hash": "6e008ab1d696a5283c79765fa7b56b47"
},
"lambda.r": {
"Package": "lambda.r",
Expand All @@ -814,7 +814,7 @@
"Package": "lattice",
"Version": "0.22-6",
"Source": "Repository",
"Repository": "CRAN",
"Repository": "RSPM",
"Requirements": [
"R",
"grDevices",
Expand Down Expand Up @@ -863,13 +863,13 @@
},
"matrixStats": {
"Package": "matrixStats",
"Version": "1.2.0",
"Version": "1.3.0",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"R"
],
"Hash": "33a3ca9e732b57244d14f5d732ffc9eb"
"Hash": "4b3ea27a19d669c0405b38134d89a9d1"
},
"memoise": {
"Package": "memoise",
Expand All @@ -894,13 +894,13 @@
},
"openssl": {
"Package": "openssl",
"Version": "2.1.1",
"Version": "2.1.2",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"askpass"
],
"Hash": "2a0dc8c6adfb6f032e4d4af82d258ab5"
"Hash": "ea2475b073243d9d338aa8f086ce973e"
},
"plyr": {
"Package": "plyr",
Expand All @@ -925,13 +925,13 @@
},
"renv": {
"Package": "renv",
"Version": "1.0.5",
"Version": "1.0.7",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"utils"
],
"Hash": "32c3f93e8360f667ca5863272ec8ba6a"
"Hash": "397b7b2a265bc5a7a06852524dabae20"
},
"restfulr": {
"Package": "restfulr",
Expand Down Expand Up @@ -1045,7 +1045,7 @@
},
"stringi": {
"Package": "stringi",
"Version": "1.8.3",
"Version": "1.8.4",
"Source": "Repository",
"Repository": "carpentries",
"Requirements": [
Expand All @@ -1054,7 +1054,7 @@
"tools",
"utils"
],
"Hash": "058aebddea264f4c99401515182e656a"
"Hash": "39e1144fd75428983dc3f63aa53dfa91"
},
"stringr": {
"Package": "stringr",
Expand Down Expand Up @@ -1093,13 +1093,13 @@
},
"tinytex": {
"Package": "tinytex",
"Version": "0.50",
"Version": "0.51",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"xfun"
],
"Hash": "be7a76845222ad20adb761f462eed3ea"
"Hash": "d44e2fcd2e4e076f0aac540208559d1d"
},
"vctrs": {
"Package": "vctrs",
Expand Down Expand Up @@ -1131,7 +1131,7 @@
"Package": "xml2",
"Version": "1.3.6",
"Source": "Repository",
"Repository": "carpentries",
"Repository": "RSPM",
"Requirements": [
"R",
"cli",
Expand Down

0 comments on commit bb3a4a4

Please sign in to comment.