Skip to content

Commit f98bd5e

Browse files
authored
Merge pull request #37 from UW-Madison-DataScience/update/packages
Update 4 packages
2 parents 169d710 + 794149a commit f98bd5e

2 files changed

Lines changed: 39 additions & 20 deletions

File tree

renv/activate.R

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
local({
33

44
# the requested version of renv
5-
version <- "1.1.7"
6-
attr(version, "md5") <- "dd5d60f155dadff4c88c2fc6680504b4"
5+
version <- "1.2.0"
6+
attr(version, "md5") <- "b7d230b07507f361d3bcf794d157a188"
77
attr(version, "sha") <- NULL
88

99
# the project directory
@@ -226,13 +226,17 @@ local({
226226
section <- header(sprintf("Bootstrapping renv %s", friendly))
227227
catf(section)
228228

229+
# ensure the target library path exists; required for file.copy(..., recursive = TRUE)
230+
dir.create(library, showWarnings = FALSE, recursive = TRUE)
231+
229232
# try to install renv from cache
230233
md5 <- attr(version, "md5", exact = TRUE)
231234
if (length(md5)) {
232235
pkgpath <- renv_bootstrap_find(version)
233236
if (length(pkgpath) && file.exists(pkgpath)) {
234-
file.copy(pkgpath, library, recursive = TRUE)
235-
return(invisible())
237+
ok <- file.copy(pkgpath, library, recursive = TRUE)
238+
if (isTRUE(ok))
239+
return(invisible())
236240
}
237241
}
238242

@@ -1231,6 +1235,21 @@ local({
12311235
}
12321236

12331237
renv_bootstrap_run <- function(project, libpath, version) {
1238+
tryCatch(
1239+
renv_bootstrap_run_impl(project, libpath, version),
1240+
error = function(e) {
1241+
msg <- paste(
1242+
"failed to bootstrap renv: the project will not be loaded.",
1243+
paste("Reason:", conditionMessage(e)),
1244+
"Use `renv::activate()` to re-initialize the project.",
1245+
sep = "\n"
1246+
)
1247+
warning(msg, call. = FALSE)
1248+
}
1249+
)
1250+
}
1251+
1252+
renv_bootstrap_run_impl <- function(project, libpath, version) {
12341253

12351254
# perform bootstrap
12361255
bootstrap(version, libpath)

renv/profiles/lesson-requirements/renv.lock

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"R": {
3-
"Version": "4.5.2",
3+
"Version": "4.5.3",
44
"Repositories": [
55
{
66
"Name": "carpentries",
@@ -320,16 +320,16 @@
320320
},
321321
"fs": {
322322
"Package": "fs",
323-
"Version": "1.6.6",
323+
"Version": "2.0.1",
324324
"Source": "Repository",
325325
"Title": "Cross-Platform File System Operations Based on 'libuv'",
326-
"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\")) )",
326+
"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\")) )",
327327
"Description": "A cross-platform interface to file system operations, built on top of the 'libuv' C library.",
328328
"License": "MIT + file LICENSE",
329329
"URL": "https://fs.r-lib.org, https://github.com/r-lib/fs",
330330
"BugReports": "https://github.com/r-lib/fs/issues",
331331
"Depends": [
332-
"R (>= 3.6)"
332+
"R (>= 4.1)"
333333
],
334334
"Imports": [
335335
"methods"
@@ -347,22 +347,22 @@
347347
"withr"
348348
],
349349
"VignetteBuilder": "knitr",
350-
"ByteCompile": "true",
350+
"SystemRequirements": "libuv: libuv-devel (rpm) or libuv1-dev (deb). Alternatively to build the vendored libuv 'cmake' is required. GNU make.",
351351
"Config/Needs/website": "tidyverse/tidytemplate",
352352
"Config/testthat/edition": "3",
353+
"Config/usethis/last-upkeep": "2025-04-23",
353354
"Copyright": "file COPYRIGHTS",
354355
"Encoding": "UTF-8",
355356
"Language": "en-US",
356-
"RoxygenNote": "7.2.3",
357-
"SystemRequirements": "GNU make",
357+
"RoxygenNote": "7.3.3",
358358
"NeedsCompilation": "yes",
359-
"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]",
360-
"Maintainer": "Gábor Csárdi <csardi.gabor@gmail.com>",
359+
"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>)",
360+
"Maintainer": "Jeroen Ooms <jeroenooms@gmail.com>",
361361
"Repository": "CRAN"
362362
},
363363
"highr": {
364364
"Package": "highr",
365-
"Version": "0.11",
365+
"Version": "0.12",
366366
"Source": "Repository",
367367
"Type": "Package",
368368
"Title": "Syntax Highlighting for R Source Code",
@@ -384,11 +384,11 @@
384384
"BugReports": "https://github.com/yihui/highr/issues",
385385
"VignetteBuilder": "knitr",
386386
"Encoding": "UTF-8",
387-
"RoxygenNote": "7.3.1",
387+
"RoxygenNote": "7.3.3",
388388
"NeedsCompilation": "no",
389-
"Author": "Yihui Xie [aut, cre] (<https://orcid.org/0000-0003-0645-5666>), Yixuan Qiu [aut], Christopher Gandrud [ctb], Qiang Li [ctb]",
389+
"Author": "Yihui Xie [aut, cre] (ORCID: <https://orcid.org/0000-0003-0645-5666>), Yixuan Qiu [aut], Christopher Gandrud [ctb], Qiang Li [ctb]",
390390
"Maintainer": "Yihui Xie <xie@yihui.name>",
391-
"Repository": "RSPM"
391+
"Repository": "CRAN"
392392
},
393393
"htmltools": {
394394
"Package": "htmltools",
@@ -674,7 +674,7 @@
674674
},
675675
"renv": {
676676
"Package": "renv",
677-
"Version": "1.1.7",
677+
"Version": "1.2.0",
678678
"Source": "Repository",
679679
"Type": "Package",
680680
"Title": "Project Environments",
@@ -716,13 +716,13 @@
716716
"webfakes"
717717
],
718718
"Encoding": "UTF-8",
719+
"NeedsCompilation": "yes",
719720
"RoxygenNote": "7.3.3",
720721
"VignetteBuilder": "knitr",
721722
"Config/Needs/website": "tidyverse/tidytemplate",
722723
"Config/testthat/edition": "3",
723724
"Config/testthat/parallel": "true",
724725
"Config/testthat/start-first": "bioconductor,python,install,restore,snapshot,retrieve,remotes",
725-
"NeedsCompilation": "no",
726726
"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]",
727727
"Maintainer": "Kevin Ushey <kevin@rstudio.com>",
728728
"Repository": "CRAN"
@@ -897,7 +897,7 @@
897897
},
898898
"xfun": {
899899
"Package": "xfun",
900-
"Version": "0.56",
900+
"Version": "0.57",
901901
"Source": "Repository",
902902
"Type": "Package",
903903
"Title": "Supporting Functions for Packages Maintained by 'Yihui Xie'",

0 commit comments

Comments
 (0)