From 2df665d738289177d6439774cb57d3cb2f344e65 Mon Sep 17 00:00:00 2001 From: "The Carpentries Apprentice (beta)" <64428345+carpentries-bot@users.noreply.github.com> Date: Mon, 1 May 2023 22:51:46 -0700 Subject: [PATCH] [actions] update 17 packages (#28) Co-authored-by: Athanasiamo --- renv/activate.R | 24 +++-- renv/profiles/lesson-requirements/renv.lock | 108 +++++++++++--------- 2 files changed, 75 insertions(+), 57 deletions(-) diff --git a/renv/activate.R b/renv/activate.R index e17d5886..a8fdc320 100644 --- a/renv/activate.R +++ b/renv/activate.R @@ -2,7 +2,7 @@ local({ # the requested version of renv - version <- "0.17.2" + version <- "0.17.3" # the project directory project <- getwd() @@ -63,6 +63,10 @@ local({ if (is.environment(x) || length(x)) x else y } + `%??%` <- function(x, y) { + if (is.null(x)) y else x + } + bootstrap <- function(version, library) { # attempt to download renv @@ -83,11 +87,22 @@ local({ renv_bootstrap_repos <- function() { + # get CRAN repository + cran <- getOption("renv.repos.cran", "https://cloud.r-project.org") + # check for repos override repos <- Sys.getenv("RENV_CONFIG_REPOS_OVERRIDE", unset = NA) - if (!is.na(repos)) + if (!is.na(repos)) { + + # check for RSPM; if set, use a fallback repository for renv + rspm <- Sys.getenv("RSPM", unset = NA) + if (identical(rspm, repos)) + repos <- c(RSPM = rspm, CRAN = cran) + return(repos) + } + # check for lockfile repositories repos <- tryCatch(renv_bootstrap_repos_lockfile(), error = identity) if (!inherits(repos, "error") && length(repos)) @@ -104,10 +119,7 @@ local({ repos <- getOption("repos") # ensure @CRAN@ entries are resolved - repos[repos == "@CRAN@"] <- getOption( - "renv.repos.cran", - "https://cloud.r-project.org" - ) + repos[repos == "@CRAN@"] <- cran # add in renv.bootstrap.repos if set default <- c(FALLBACK = "https://cloud.r-project.org") diff --git a/renv/profiles/lesson-requirements/renv.lock b/renv/profiles/lesson-requirements/renv.lock index e4a0628e..98e091f2 100644 --- a/renv/profiles/lesson-requirements/renv.lock +++ b/renv/profiles/lesson-requirements/renv.lock @@ -1,6 +1,6 @@ { "R": { - "Version": "4.2.3", + "Version": "4.3.0", "Repositories": [ { "Name": "carpentries", @@ -30,7 +30,7 @@ }, "MASS": { "Package": "MASS", - "Version": "7.3-58.3", + "Version": "7.3-59", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -41,13 +41,13 @@ "stats", "utils" ], - "Hash": "9586b552d57f5516fe4d25398c1bacd6" + "Hash": "26570ae748e78cb2b0f56019dd2ba354" }, "Matrix": { "Package": "Matrix", - "Version": "1.5-3", + "Version": "1.5-4", "Source": "Repository", - "Repository": "RSPM", + "Repository": "CRAN", "Requirements": [ "R", "graphics", @@ -57,7 +57,7 @@ "stats", "utils" ], - "Hash": "4006dffe49958d2dd591c17e61e60591" + "Hash": "e779c7d9f35cc364438578f334cffee2" }, "R6": { "Package": "R6", @@ -188,14 +188,14 @@ }, "cachem": { "Package": "cachem", - "Version": "1.0.7", + "Version": "1.0.8", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "fastmap", "rlang" ], - "Hash": "cda74447c42f529de601fe4d4050daef" + "Hash": "c35768291560ce302c0a6589f92e837d" }, "callr": { "Package": "callr", @@ -355,7 +355,7 @@ }, "dplyr": { "Package": "dplyr", - "Version": "1.1.1", + "Version": "1.1.2", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -374,7 +374,7 @@ "utils", "vctrs" ], - "Hash": "eb5742d256a0d9306d85ea68756d8187" + "Hash": "dea6970ff715ca541c387de363ff405e" }, "dtplyr": { "Package": "dtplyr", @@ -445,7 +445,7 @@ }, "fontawesome": { "Package": "fontawesome", - "Version": "0.5.0", + "Version": "0.5.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -453,7 +453,7 @@ "htmltools", "rlang" ], - "Hash": "e80750aec5717dedc019ad7ee40e4a7c" + "Hash": "1e22b8cabbad1eae951a75e9f8b52378" }, "forcats": { "Package": "forcats", @@ -473,20 +473,20 @@ }, "fs": { "Package": "fs", - "Version": "1.6.1", + "Version": "1.6.2", "Source": "Repository", - "Repository": "RSPM", + "Repository": "CRAN", "Requirements": [ "R", "methods" ], - "Hash": "f4dcd23b67e33d851d2079f703e8b985" + "Hash": "94af08e0aa9675a16fadbb3aaaa90d2a" }, "gargle": { "Package": "gargle", - "Version": "1.3.0", + "Version": "1.4.0", "Source": "Repository", - "Repository": "RSPM", + "Repository": "CRAN", "Requirements": [ "R", "cli", @@ -498,12 +498,11 @@ "openssl", "rappdirs", "rlang", - "rstudioapi", "stats", "utils", "withr" ], - "Hash": "bb3208dcdfeb2e68bf33c87601b3cbe3" + "Hash": "8c72a723822dc317613da5ff8e8da6ee" }, "generics": { "Package": "generics", @@ -769,9 +768,9 @@ }, "lattice": { "Package": "lattice", - "Version": "0.20-45", + "Version": "0.21-8", "Source": "Repository", - "Repository": "RSPM", + "Repository": "CRAN", "Requirements": [ "R", "grDevices", @@ -780,7 +779,7 @@ "stats", "utils" ], - "Hash": "b64cdbb2b340437c4ee047a1f4c4377b" + "Hash": "0b8a6d63c8770f02a8b5635f3c431e6b" }, "lifecycle": { "Package": "lifecycle", @@ -903,14 +902,15 @@ "Package": "openssl", "Version": "2.0.6", "Source": "Repository", - "Repository": "https://carpentries.r-universe.dev", + "Repository": "RSPM", + "RemoteType": "repository", "RemoteUrl": "https://github.com/jeroen/openssl", "RemoteRef": "v2.0.6", "RemoteSha": "72aa50a79b99bb1eb57a2668b1c437b1adecbabb", "Requirements": [ "askpass" ], - "Hash": "0f7cd2962e3044bb940cca4f4b5cecbe" + "Hash": "51976e7d0fcabbadb3c1baec93103756" }, "palmerpenguins": { "Package": "palmerpenguins", @@ -958,16 +958,16 @@ }, "processx": { "Package": "processx", - "Version": "3.8.0", + "Version": "3.8.1", "Source": "Repository", - "Repository": "RSPM", + "Repository": "CRAN", "Requirements": [ "R", "R6", "ps", "utils" ], - "Hash": "a33ee2d9bf07564efb888ad98410da84" + "Hash": "d75b4059d781336efba24021915902b4" }, "progress": { "Package": "progress", @@ -984,14 +984,14 @@ }, "ps": { "Package": "ps", - "Version": "1.7.4", + "Version": "1.7.5", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "utils" ], - "Hash": "d88be14c6790aa6fd7b27a2079a45a85" + "Hash": "709d852d33178db54b17c722e5b1e594" }, "purrr": { "Package": "purrr", @@ -1012,7 +1012,8 @@ "Package": "ragg", "Version": "1.2.5", "Source": "Repository", - "Repository": "https://carpentries.r-universe.dev", + "Repository": "RSPM", + "RemoteType": "repository", "RemoteUrl": "https://github.com/r-lib/ragg", "RemoteRef": "v1.2.5", "RemoteSha": "dafb0d8e0308c4db56abed2290f32a1ca0719307", @@ -1020,7 +1021,7 @@ "systemfonts", "textshaping" ], - "Hash": "690bc058ea2b1b8a407d3cfe3dce3ef9" + "Hash": "fa83fe2ea7fc41d5033a0759a8172910" }, "rappdirs": { "Package": "rappdirs", @@ -1089,13 +1090,13 @@ }, "renv": { "Package": "renv", - "Version": "0.17.2", + "Version": "0.17.3", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "utils" ], - "Hash": "aaf3c7f769695266a2113db67a25148b" + "Hash": "4543b8cd233ae25c6aba8548be9e747e" }, "reprex": { "Package": "reprex", @@ -1121,14 +1122,14 @@ }, "rlang": { "Package": "rlang", - "Version": "1.1.0", + "Version": "1.1.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "utils" ], - "Hash": "dc079ccd156cde8647360f473c1fa718" + "Hash": "a85c767b55f0bf9b7ad16c6d7baee5bb" }, "rmarkdown": { "Package": "rmarkdown", @@ -1271,7 +1272,8 @@ "Package": "systemfonts", "Version": "1.0.4", "Source": "Repository", - "Repository": "https://carpentries.r-universe.dev", + "Repository": "RSPM", + "RemoteType": "repository", "RemoteUrl": "https://github.com/r-lib/systemfonts", "RemoteRef": "v1.0.4", "RemoteSha": "7cefacd49d39bb77e88f99d161a76a8cea28dc1b", @@ -1279,13 +1281,14 @@ "R", "cpp11" ], - "Hash": "90b28393209827327de889f49935140a" + "Hash": "fd4f62a091a20ea96ecb9350b6f8d951" }, "textshaping": { "Package": "textshaping", "Version": "0.3.6", "Source": "Repository", - "Repository": "https://carpentries.r-universe.dev", + "Repository": "RSPM", + "RemoteType": "repository", "RemoteUrl": "https://github.com/r-lib/textshaping", "RemoteRef": "v0.3.6", "RemoteSha": "0ae8e32a2dab09a920db4b6a60fc10380ba1c4bc", @@ -1294,7 +1297,7 @@ "cpp11", "systemfonts" ], - "Hash": "1ab6223d3670fac7143202cb6a2d43d5" + "Hash": "b0f9ff08a8a4885acc43248bf3e37541" }, "tibble": { "Package": "tibble", @@ -1407,13 +1410,13 @@ }, "tinytex": { "Package": "tinytex", - "Version": "0.44", + "Version": "0.45", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "xfun" ], - "Hash": "c0f007e2eeed7722ce13d42b84a22e07" + "Hash": "e4e357f28c2edff493936b6cb30c3d65" }, "tzdb": { "Package": "tzdb", @@ -1448,7 +1451,7 @@ }, "vctrs": { "Package": "vctrs", - "Version": "0.6.1", + "Version": "0.6.2", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -1458,7 +1461,7 @@ "lifecycle", "rlang" ], - "Hash": "06eceb3a5d716fd0654cc23ca3d71a99" + "Hash": "a745bda7aff4734c17294bb41d4e4607" }, "viridisLite": { "Package": "viridisLite", @@ -1472,9 +1475,9 @@ }, "vroom": { "Package": "vroom", - "Version": "1.6.1", + "Version": "1.6.3", "Source": "Repository", - "Repository": "RSPM", + "Repository": "CRAN", "Requirements": [ "R", "bit64", @@ -1494,7 +1497,7 @@ "vctrs", "withr" ], - "Hash": "7015a74373b83ffaef64023f4a0f5033" + "Hash": "8318e64ffb3a70e652494017ec455561" }, "withr": { "Package": "withr", @@ -1511,25 +1514,28 @@ }, "xfun": { "Package": "xfun", - "Version": "0.38", + "Version": "0.39", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "stats", "tools" ], - "Hash": "1ed71215d45e85562d3b1b29a068ccec" + "Hash": "8f56e9acb54fb525e66464d57ab58bcb" }, "xml2": { "Package": "xml2", - "Version": "1.3.3", + "Version": "1.3.4", "Source": "Repository", - "Repository": "RSPM", + "Repository": "https://carpentries.r-universe.dev", + "RemoteUrl": "https://github.com/r-lib/xml2", + "RemoteRef": "v1.3.4", + "RemoteSha": "c64689836e7e610dff94687241113a4f5d86a174", "Requirements": [ "R", "methods" ], - "Hash": "40682ed6a969ea5abfd351eb67833adc" + "Hash": "7dc765ac9b909487326a7d471fdd3821" }, "yaml": { "Package": "yaml",