Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 23 additions & 4 deletions renv/activate.R
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
local({

# the requested version of renv
version <- "1.1.7"
attr(version, "md5") <- "dd5d60f155dadff4c88c2fc6680504b4"
version <- "1.2.0"
attr(version, "md5") <- "b7d230b07507f361d3bcf794d157a188"
attr(version, "sha") <- NULL

# the project directory
Expand Down Expand Up @@ -226,13 +226,17 @@ local({
section <- header(sprintf("Bootstrapping renv %s", friendly))
catf(section)

# ensure the target library path exists; required for file.copy(..., recursive = TRUE)
dir.create(library, showWarnings = FALSE, recursive = TRUE)

# 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())
ok <- file.copy(pkgpath, library, recursive = TRUE)
if (isTRUE(ok))
return(invisible())
}
}

Expand Down Expand Up @@ -1231,6 +1235,21 @@ local({
}

renv_bootstrap_run <- function(project, libpath, version) {
tryCatch(
renv_bootstrap_run_impl(project, libpath, version),
error = function(e) {
msg <- paste(
"failed to bootstrap renv: the project will not be loaded.",
paste("Reason:", conditionMessage(e)),
"Use `renv::activate()` to re-initialize the project.",
sep = "\n"
)
warning(msg, call. = FALSE)
}
)
}

renv_bootstrap_run_impl <- function(project, libpath, version) {

# perform bootstrap
bootstrap(version, libpath)
Expand Down
44 changes: 22 additions & 22 deletions renv/profiles/lesson-requirements/renv.lock
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"R": {
"Version": "4.5.2",
"Version": "4.5.3",
"Repositories": [
{
"Name": "carpentries",
Expand Down Expand Up @@ -320,16 +320,16 @@
},
"fs": {
"Package": "fs",
"Version": "1.6.6",
"Version": "2.0.1",
"Source": "Repository",
"Title": "Cross-Platform File System Operations Based on 'libuv'",
"Authors@R": "c( person(\"Jim\", \"Hester\", role = \"aut\"), person(\"Hadley\", \"Wickham\", , \"hadley@posit.co\", role = \"aut\"), person(\"Gábor\", \"Csárdi\", , \"csardi.gabor@gmail.com\", role = c(\"aut\", \"cre\")), person(\"libuv project contributors\", role = \"cph\", comment = \"libuv library\"), person(\"Joyent, Inc. and other Node contributors\", role = \"cph\", comment = \"libuv library\"), person(\"Posit Software, PBC\", role = c(\"cph\", \"fnd\")) )",
"Authors@R": "c( person(\"Jim\", \"Hester\", role = \"aut\"), person(\"Hadley\", \"Wickham\", role = \"aut\"), person(\"Gábor\", \"Csárdi\", role = \"aut\"), person(\"Jeroen\", \"Ooms\", , \"jeroenooms@gmail.com\", role = \"cre\"), person(\"libuv project contributors\", role = \"cph\", comment = \"libuv library\"), person(\"Joyent, Inc. and other Node contributors\", role = \"cph\", comment = \"libuv library\"), person(\"Posit Software, PBC\", role = c(\"cph\", \"fnd\"), comment = c(ROR = \"03wc8by49\")) )",
"Description": "A cross-platform interface to file system operations, built on top of the 'libuv' C library.",
"License": "MIT + file LICENSE",
"URL": "https://fs.r-lib.org, https://github.com/r-lib/fs",
"BugReports": "https://github.com/r-lib/fs/issues",
"Depends": [
"R (>= 3.6)"
"R (>= 4.1)"
],
"Imports": [
"methods"
Expand All @@ -347,22 +347,22 @@
"withr"
],
"VignetteBuilder": "knitr",
"ByteCompile": "true",
"SystemRequirements": "libuv: libuv-devel (rpm) or libuv1-dev (deb). Alternatively to build the vendored libuv 'cmake' is required. GNU make.",
"Config/Needs/website": "tidyverse/tidytemplate",
"Config/testthat/edition": "3",
"Config/usethis/last-upkeep": "2025-04-23",
"Copyright": "file COPYRIGHTS",
"Encoding": "UTF-8",
"Language": "en-US",
"RoxygenNote": "7.2.3",
"SystemRequirements": "GNU make",
"RoxygenNote": "7.3.3",
"NeedsCompilation": "yes",
"Author": "Jim Hester [aut], Hadley Wickham [aut], Gábor Csárdi [aut, cre], libuv project contributors [cph] (libuv library), Joyent, Inc. and other Node contributors [cph] (libuv library), Posit Software, PBC [cph, fnd]",
"Maintainer": "Gábor Csárdi <csardi.gabor@gmail.com>",
"Author": "Jim Hester [aut], Hadley Wickham [aut], Gábor Csárdi [aut], Jeroen Ooms [cre], libuv project contributors [cph] (libuv library), Joyent, Inc. and other Node contributors [cph] (libuv library), Posit Software, PBC [cph, fnd] (ROR: <https://ror.org/03wc8by49>)",
"Maintainer": "Jeroen Ooms <jeroenooms@gmail.com>",
"Repository": "CRAN"
},
"highr": {
"Package": "highr",
"Version": "0.11",
"Version": "0.12",
"Source": "Repository",
"Type": "Package",
"Title": "Syntax Highlighting for R Source Code",
Expand All @@ -384,11 +384,11 @@
"BugReports": "https://github.com/yihui/highr/issues",
"VignetteBuilder": "knitr",
"Encoding": "UTF-8",
"RoxygenNote": "7.3.1",
"RoxygenNote": "7.3.3",
"NeedsCompilation": "no",
"Author": "Yihui Xie [aut, cre] (<https://orcid.org/0000-0003-0645-5666>), Yixuan Qiu [aut], Christopher Gandrud [ctb], Qiang Li [ctb]",
"Author": "Yihui Xie [aut, cre] (ORCID: <https://orcid.org/0000-0003-0645-5666>), Yixuan Qiu [aut], Christopher Gandrud [ctb], Qiang Li [ctb]",
"Maintainer": "Yihui Xie <xie@yihui.name>",
"Repository": "RSPM"
"Repository": "CRAN"
},
"htmltools": {
"Package": "htmltools",
Expand Down Expand Up @@ -674,7 +674,7 @@
},
"renv": {
"Package": "renv",
"Version": "1.1.7",
"Version": "1.2.0",
"Source": "Repository",
"Type": "Package",
"Title": "Project Environments",
Expand Down Expand Up @@ -716,20 +716,20 @@
"webfakes"
],
"Encoding": "UTF-8",
"NeedsCompilation": "yes",
"RoxygenNote": "7.3.3",
"VignetteBuilder": "knitr",
"Config/Needs/website": "tidyverse/tidytemplate",
"Config/testthat/edition": "3",
"Config/testthat/parallel": "true",
"Config/testthat/start-first": "bioconductor,python,install,restore,snapshot,retrieve,remotes",
"NeedsCompilation": "no",
"Author": "Kevin Ushey [aut, cre] (ORCID: <https://orcid.org/0000-0003-2880-7407>), Hadley Wickham [aut] (ORCID: <https://orcid.org/0000-0003-4757-117X>), Posit Software, PBC [cph, fnd]",
"Maintainer": "Kevin Ushey <kevin@rstudio.com>",
"Repository": "CRAN"
"Repository": "https://packagemanager.posit.co/cran/__linux__/jammy/latest"
},
"rlang": {
"Package": "rlang",
"Version": "1.1.7",
"Version": "1.2.0",
"Source": "Repository",
"Title": "Functions for Base Types and Core R and 'Tidyverse' Features",
"Description": "A toolbox for working with base types, core R features like the condition system, and core 'Tidyverse' features like tidy evaluation.",
Expand Down Expand Up @@ -757,7 +757,7 @@
"pkgload",
"rmarkdown",
"stats",
"testthat (>= 3.2.0)",
"testthat (>= 3.3.2)",
"tibble",
"usethis",
"vctrs (>= 0.2.3)",
Expand All @@ -780,7 +780,7 @@
},
"rmarkdown": {
"Package": "rmarkdown",
"Version": "2.30",
"Version": "2.31",
"Source": "Repository",
"Type": "Package",
"Title": "Dynamic Documents for R",
Expand Down Expand Up @@ -827,7 +827,7 @@
"Config/Needs/website": "rstudio/quillt, pkgdown",
"Config/testthat/edition": "3",
"Encoding": "UTF-8",
"RoxygenNote": "7.3.2",
"RoxygenNote": "7.3.3",
"SystemRequirements": "pandoc (>= 1.14) - http://pandoc.org",
"NeedsCompilation": "no",
"Author": "JJ Allaire [aut], Yihui Xie [aut, cre] (ORCID: <https://orcid.org/0000-0003-0645-5666>), Christophe Dervieux [aut] (ORCID: <https://orcid.org/0000-0003-4474-2498>), Jonathan McPherson [aut], Javier Luraschi [aut], Kevin Ushey [aut], Aron Atkins [aut], Hadley Wickham [aut], Joe Cheng [aut], Winston Chang [aut], Richard Iannone [aut] (ORCID: <https://orcid.org/0000-0003-3925-190X>), Andrew Dunning [ctb] (ORCID: <https://orcid.org/0000-0003-0464-5036>), Atsushi Yasumoto [ctb, cph] (ORCID: <https://orcid.org/0000-0002-8335-495X>, cph: Number sections Lua filter), Barret Schloerke [ctb], Carson Sievert [ctb] (ORCID: <https://orcid.org/0000-0002-4958-2844>), Devon Ryan [ctb] (ORCID: <https://orcid.org/0000-0002-8549-0971>), Frederik Aust [ctb] (ORCID: <https://orcid.org/0000-0003-4900-788X>), Jeff Allen [ctb], JooYoung Seo [ctb] (ORCID: <https://orcid.org/0000-0002-4064-6012>), Malcolm Barrett [ctb], Rob Hyndman [ctb], Romain Lesur [ctb], Roy Storey [ctb], Ruben Arslan [ctb], Sergio Oller [ctb], Posit Software, PBC [cph, fnd], jQuery UI contributors [ctb, cph] (jQuery UI library; authors listed in inst/rmd/h/jqueryui/AUTHORS.txt), Mark Otto [ctb] (Bootstrap library), Jacob Thornton [ctb] (Bootstrap library), Bootstrap contributors [ctb] (Bootstrap library), Twitter, Inc [cph] (Bootstrap library), Alexander Farkas [ctb, cph] (html5shiv library), Scott Jehl [ctb, cph] (Respond.js library), Ivan Sagalaev [ctb, cph] (highlight.js library), Greg Franko [ctb, cph] (tocify library), John MacFarlane [ctb, cph] (Pandoc templates), Google, Inc. [ctb, cph] (ioslides library), Dave Raggett [ctb] (slidy library), W3C [cph] (slidy library), Dave Gandy [ctb, cph] (Font-Awesome), Ben Sperry [ctb] (Ionicons), Drifty [cph] (Ionicons), Aidan Lister [ctb, cph] (jQuery StickyTabs), Benct Philip Jonsson [ctb, cph] (pagebreak Lua filter), Albert Krewinkel [ctb, cph] (pagebreak Lua filter)",
Expand Down Expand Up @@ -872,7 +872,7 @@
},
"tinytex": {
"Package": "tinytex",
"Version": "0.58",
"Version": "0.59",
"Source": "Repository",
"Type": "Package",
"Title": "Helper Functions to Install and Maintain TeX Live, and Compile LaTeX Documents",
Expand All @@ -897,7 +897,7 @@
},
"xfun": {
"Package": "xfun",
"Version": "0.56",
"Version": "0.57",
"Source": "Repository",
"Type": "Package",
"Title": "Supporting Functions for Packages Maintained by 'Yihui Xie'",
Expand Down
Loading