Skip to content

Commit

Permalink
Merge pull request #297 from datacarpentry/update/packages
Browse files Browse the repository at this point in the history
Update 13 packages
  • Loading branch information
naupaka authored Nov 5, 2024
2 parents 2ec7cea + 4191a9b commit 5d7055b
Show file tree
Hide file tree
Showing 2 changed files with 25 additions and 26 deletions.
10 changes: 4 additions & 6 deletions renv/activate.R
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
}
Expand Down
41 changes: 21 additions & 20 deletions renv/profiles/lesson-requirements/renv.lock
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@
},
"Matrix": {
"Package": "Matrix",
"Version": "1.7-0",
"Version": "1.7-1",
"Source": "Repository",
"Repository": "RSPM",
"Repository": "CRAN",
"Requirements": [
"R",
"grDevices",
Expand All @@ -47,7 +47,7 @@
"stats",
"utils"
],
"Hash": "1920b2f11133b12350024297d8a4ff4a"
"Hash": "5122bb14d8736372411f955e1b16bc8a"
},
"R6": {
"Package": "R6",
Expand Down Expand Up @@ -241,13 +241,13 @@
},
"evaluate": {
"Package": "evaluate",
"Version": "1.0.0",
"Version": "1.0.1",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"R"
],
"Hash": "6b567375113ceb7d9f800de4dd42218e"
"Hash": "3fd29944b231036ad67c3edb32e02201"
},
"fansi": {
"Package": "fansi",
Expand Down Expand Up @@ -289,14 +289,14 @@
},
"fs": {
"Package": "fs",
"Version": "1.6.4",
"Version": "1.6.5",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"R",
"methods"
],
"Hash": "15aeb8c27f5ea5161f9f6a641fafd93a"
"Hash": "7f48af39fa27711ea5fbd183b399920d"
},
"generics": {
"Package": "generics",
Expand Down Expand Up @@ -347,7 +347,7 @@
},
"gtable": {
"Package": "gtable",
"Version": "0.3.5",
"Version": "0.3.6",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
Expand All @@ -356,9 +356,10 @@
"glue",
"grid",
"lifecycle",
"rlang"
"rlang",
"stats"
],
"Hash": "e18861963cbc65a27736e02b3cd3c4a0"
"Hash": "de949855009e2d4d0e52a844e30617ae"
},
"highr": {
"Package": "highr",
Expand Down Expand Up @@ -693,13 +694,13 @@
},
"renv": {
"Package": "renv",
"Version": "1.0.9",
"Version": "1.0.11",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"utils"
],
"Hash": "ef233f0e9064fc88c898b340c9add5c2"
"Hash": "47623f66b4e80b3b0587bc5d7b309888"
},
"rlang": {
"Package": "rlang",
Expand All @@ -714,7 +715,7 @@
},
"rmarkdown": {
"Package": "rmarkdown",
"Version": "2.28",
"Version": "2.29",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
Expand All @@ -733,7 +734,7 @@
"xfun",
"yaml"
],
"Hash": "062470668513dcda416927085ee9bdc7"
"Hash": "df99277f63d01c34e95e3d2f06a79736"
},
"sass": {
"Package": "sass",
Expand Down Expand Up @@ -859,13 +860,13 @@
},
"tinytex": {
"Package": "tinytex",
"Version": "0.53",
"Version": "0.54",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"xfun"
],
"Hash": "9db859e8aabbb474293dde3097839420"
"Hash": "3ec7e3ddcacc2d34a9046941222bf94d"
},
"tzdb": {
"Package": "tzdb",
Expand Down Expand Up @@ -940,19 +941,19 @@
},
"withr": {
"Package": "withr",
"Version": "3.0.1",
"Version": "3.0.2",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"R",
"grDevices",
"graphics"
],
"Hash": "07909200e8bbe90426fbfeb73e1e27aa"
"Hash": "cc2d62c76458d425210d1eb1478b30b4"
},
"xfun": {
"Package": "xfun",
"Version": "0.47",
"Version": "0.49",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
Expand All @@ -961,7 +962,7 @@
"stats",
"tools"
],
"Hash": "36ab21660e2d095fef0d83f689e0477c"
"Hash": "8687398773806cfff9401a2feca96298"
},
"yaml": {
"Package": "yaml",
Expand Down

0 comments on commit 5d7055b

Please sign in to comment.