Skip to content

Commit

Permalink
update dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@nebfield
nebfield committed Oct 17, 2023
1 parent 53fc82d commit 692622e
Show file tree
Hide file tree
Showing 2 changed files with 73 additions and 74 deletions.
78 changes: 39 additions & 39 deletions renv.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
},
"bslib": {
"Package": "bslib",
"Version": "0.5.0",
"Version": "0.5.1",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
Expand All @@ -47,7 +47,7 @@
"rlang",
"sass"
],
"Hash": "1b117970533deb6d4e992c1b34e9d905"
"Hash": "283015ddfbb9d7bf15ea9f0b5698f0d9"
},
"cachem": {
"Package": "cachem",
Expand All @@ -73,14 +73,14 @@
},
"digest": {
"Package": "digest",
"Version": "0.6.31",
"Version": "0.6.33",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"R",
"utils"
],
"Hash": "8b708f296afd9ae69f450f9640be8990"
"Hash": "b18a9cf3c003977b0cc49d5e76ebe48d"
},
"ellipsis": {
"Package": "ellipsis",
Expand All @@ -95,14 +95,14 @@
},
"evaluate": {
"Package": "evaluate",
"Version": "0.21",
"Version": "0.22",
"Source": "Repository",
"Repository": "CRAN",
"Repository": "RSPM",
"Requirements": [
"R",
"methods"
],
"Hash": "d59f3b464e8da1aef82dc04b588b8dfb"
"Hash": "66f39c7a21e03c4dcb2c2d21d738d603"
},
"fastmap": {
"Package": "fastmap",
Expand All @@ -113,26 +113,26 @@
},
"fontawesome": {
"Package": "fontawesome",
"Version": "0.5.1",
"Version": "0.5.2",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"R",
"htmltools",
"rlang"
],
"Hash": "1e22b8cabbad1eae951a75e9f8b52378"
"Hash": "c2efdd5f0bcd1ea861c2d4e2a883a67d"
},
"fs": {
"Package": "fs",
"Version": "1.6.2",
"Version": "1.6.3",
"Source": "Repository",
"Repository": "CRAN",
"Repository": "RSPM",
"Requirements": [
"R",
"methods"
],
"Hash": "94af08e0aa9675a16fadbb3aaaa90d2a"
"Hash": "47b5f30c720c23999b913a1a635cf0bb"
},
"glue": {
"Package": "glue",
Expand All @@ -158,9 +158,9 @@
},
"htmltools": {
"Package": "htmltools",
"Version": "0.5.5",
"Version": "0.5.6.1",
"Source": "Repository",
"Repository": "CRAN",
"Repository": "RSPM",
"Requirements": [
"R",
"base64enc",
Expand All @@ -171,7 +171,7 @@
"rlang",
"utils"
],
"Hash": "ba0240784ad50a62165058a27459304a"
"Hash": "1e12fe667316a76508898839ecfb2d00"
},
"jquerylib": {
"Package": "jquerylib",
Expand All @@ -185,17 +185,17 @@
},
"jsonlite": {
"Package": "jsonlite",
"Version": "1.8.5",
"Version": "1.8.7",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"methods"
],
"Hash": "3ee4d9899e4db3e976fc82b98d24a31a"
"Hash": "266a20443ca13c65688b2116d5220f76"
},
"knitr": {
"Package": "knitr",
"Version": "1.43",
"Version": "1.44",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
Expand All @@ -207,7 +207,7 @@
"xfun",
"yaml"
],
"Hash": "9775eb076713f627c07ce41d8199d8f6"
"Hash": "60885b9f746c9dfaef110d070b5f7dc0"
},
"lifecycle": {
"Package": "lifecycle",
Expand Down Expand Up @@ -258,15 +258,15 @@
"Version": "0.1.0",
"Source": "GitHub",
"RemoteType": "github",
"RemoteHost": "api.github.com",
"RemoteUsername": "intervene-EU-H2020",
"RemoteRepo": "pgsCompaR",
"RemoteRef": "main",
"RemoteSha": "8df2b655d9b0029fc3f0a6b3ae3525c34974a133",
"RemoteSha": "8349b30354b1558227a14af7c053a7fad592ba21",
"RemoteHost": "api.github.com",
"Requirements": [
"R"
],
"Hash": "0c9cffde439d7db39fb131bef95fae32"
"Hash": "ea46db7bfe1c35bc1005efa81a7ef2c9"
},
"rappdirs": {
"Package": "rappdirs",
Expand All @@ -280,13 +280,13 @@
},
"renv": {
"Package": "renv",
"Version": "1.0.0",
"Version": "1.0.3",
"Source": "Repository",
"Repository": "CRAN",
"Repository": "RSPM",
"Requirements": [
"utils"
],
"Hash": "c321cd99d56443dbffd1c9e673c0c1a2"
"Hash": "41b847654f567341725473431dd0d5ab"
},
"rlang": {
"Package": "rlang",
Expand All @@ -301,9 +301,9 @@
},
"rmarkdown": {
"Package": "rmarkdown",
"Version": "2.22",
"Version": "2.25",
"Source": "Repository",
"Repository": "CRAN",
"Repository": "RSPM",
"Requirements": [
"R",
"bslib",
Expand All @@ -321,21 +321,21 @@
"xfun",
"yaml"
],
"Hash": "75a01be060d800ceb14e32c666cacac9"
"Hash": "d65e35823c817f09f4de424fcdfa812a"
},
"sass": {
"Package": "sass",
"Version": "0.4.6",
"Version": "0.4.7",
"Source": "Repository",
"Repository": "CRAN",
"Repository": "RSPM",
"Requirements": [
"R6",
"fs",
"htmltools",
"rappdirs",
"rlang"
],
"Hash": "cc3ec7dd33982ef56570229b62d6388e"
"Hash": "6bd4d33b50ff927191ec9acbf52fd056"
},
"stringi": {
"Package": "stringi",
Expand Down Expand Up @@ -369,38 +369,38 @@
},
"tinytex": {
"Package": "tinytex",
"Version": "0.45",
"Version": "0.48",
"Source": "Repository",
"Repository": "CRAN",
"Repository": "RSPM",
"Requirements": [
"xfun"
],
"Hash": "e4e357f28c2edff493936b6cb30c3d65"
"Hash": "8f96d229b7311beb32b94cf413b13f84"
},
"vctrs": {
"Package": "vctrs",
"Version": "0.6.2",
"Version": "0.6.4",
"Source": "Repository",
"Repository": "CRAN",
"Repository": "RSPM",
"Requirements": [
"R",
"cli",
"glue",
"lifecycle",
"rlang"
],
"Hash": "a745bda7aff4734c17294bb41d4e4607"
"Hash": "266c1ca411266ba8f365fcc726444b87"
},
"xfun": {
"Package": "xfun",
"Version": "0.39",
"Version": "0.40",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"stats",
"tools"
],
"Hash": "8f56e9acb54fb525e66464d57ab58bcb"
"Hash": "be07d23211245fc7d4209f54c4e4ffc8"
},
"yaml": {
"Package": "yaml",
Expand Down
69 changes: 34 additions & 35 deletions renv/activate.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,27 @@
local({

# the requested version of renv
version <- "1.0.0"
version <- "1.0.3"
attr(version, "sha") <- NULL

# the project directory
project <- getwd()

# use start-up diagnostics if enabled
diagnostics <- Sys.getenv("RENV_STARTUP_DIAGNOSTICS", unset = "FALSE")
if (diagnostics) {
start <- Sys.time()
profile <- tempfile("renv-startup-", fileext = ".Rprof")
utils::Rprof(profile)
on.exit({
utils::Rprof(NULL)
elapsed <- signif(difftime(Sys.time(), start, units = "auto"), digits = 2L)
writeLines(sprintf("- renv took %s to run the autoloader.", format(elapsed)))
writeLines(sprintf("- Profile: %s", profile))
print(utils::summaryRprof(profile))
}, add = TRUE)
}

# figure out whether the autoloader is enabled
enabled <- local({

Expand Down Expand Up @@ -504,7 +519,7 @@ local({

# open the bundle for reading
# We use gzcon for everything because (from ?gzcon)
# > Reading from a connection which does not supply a ‘gzip’ magic
# > Reading from a connection which does not supply a 'gzip' magic
# > header is equivalent to reading from the original connection
conn <- gzcon(file(bundle, open = "rb", raw = TRUE))
on.exit(close(conn))
Expand Down Expand Up @@ -767,10 +782,12 @@ local({
renv_bootstrap_validate_version <- function(version, description = NULL) {

# resolve description file
description <- description %||% {
path <- getNamespaceInfo("renv", "path")
packageDescription("renv", lib.loc = dirname(path))
}
#
# avoid passing lib.loc to `packageDescription()` below, since R will
# use the loaded version of the package by default anyhow. note that
# this function should only be called after 'renv' is loaded
# https://github.com/rstudio/renv/issues/1625
description <- description %||% packageDescription("renv")

# check whether requested version 'version' matches loaded version of renv
sha <- attr(version, "sha", exact = TRUE)
Expand Down Expand Up @@ -841,7 +858,7 @@ local({
hooks <- getHook("renv::autoload")
for (hook in hooks)
if (is.function(hook))
tryCatch(hook(), error = warning)
tryCatch(hook(), error = warnify)

# load the project
renv::load(project)
Expand Down Expand Up @@ -982,10 +999,15 @@ local({

}

renv_bootstrap_version_friendly <- function(version, sha = NULL) {
renv_bootstrap_version_friendly <- function(version, shafmt = NULL, sha = NULL) {
sha <- sha %||% attr(version, "sha", exact = TRUE)
parts <- c(version, sprintf("[sha: %s]", substring(sha, 1L, 7L)))
paste(parts, collapse = " ")
parts <- c(version, sprintf(shafmt %||% " [sha: %s]", substring(sha, 1L, 7L)))
paste(parts, collapse = "")
}

renv_bootstrap_exec <- function(project, libpath, version) {
if (!renv_bootstrap_load(project, libpath, version))
renv_bootstrap_run(version, libpath)
}

renv_bootstrap_run <- function(version, libpath) {
Expand All @@ -1012,11 +1034,6 @@ local({

}


renv_bootstrap_in_rstudio <- function() {
commandArgs()[[1]] == "RStudio"
}

renv_json_read <- function(file = NULL, text = NULL) {

jlerr <- NULL
Expand Down Expand Up @@ -1155,26 +1172,8 @@ local({
# construct full libpath
libpath <- file.path(root, prefix)

# attempt to load
if (renv_bootstrap_load(project, libpath, version))
return(TRUE)

if (renv_bootstrap_in_rstudio()) {
setHook("rstudio.sessionInit", function(...) {
renv_bootstrap_run(version, libpath)

# Work around buglet in RStudio if hook uses readline
tryCatch(
{
tools <- as.environment("tools:rstudio")
tools$.rs.api.sendToConsole("", echo = FALSE, focus = FALSE)
},
error = function(cnd) {}
)
})
} else {
renv_bootstrap_run(version, libpath)
}
# run bootstrap code
renv_bootstrap_exec(project, libpath, version)

invisible()

Expand Down

0 comments on commit 692622e

Please sign in to comment.