Skip to content

Commit 8a708cd

Browse files
author
srvanderplas
committed
Update header link path, update renv for R 4.3.0
1 parent 37ce4af commit 8a708cd

File tree

3 files changed

+31
-19
lines changed

3 files changed

+31
-19
lines changed

_quarto.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ format:
102102
css: build_deps/style.css
103103
theme: ['cosmo', build_deps/callouts.scss]
104104
code-link: true
105-
include-in-header: "header.html"
105+
include-in-header: "build_deps/header.html"
106106
code-copy: true
107107
# pdf:
108108
# documentclass: scrreprt

renv.lock

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"R": {
3-
"Version": "4.2.3",
3+
"Version": "4.3.0",
44
"Repositories": [
55
{
66
"Name": "CRAN",
@@ -58,7 +58,7 @@
5858
},
5959
"Hmisc": {
6060
"Package": "Hmisc",
61-
"Version": "5.0-1",
61+
"Version": "5.1-0",
6262
"Source": "Repository",
6363
"Repository": "CRAN",
6464
"Requirements": [
@@ -81,7 +81,7 @@
8181
"rpart",
8282
"viridis"
8383
],
84-
"Hash": "bf9fe82c010a468fb32f913ff56d65e1"
84+
"Hash": "58bdffbf73db41c8bf9e4e2329f92429"
8585
},
8686
"MASS": {
8787
"Package": "MASS",
@@ -504,7 +504,7 @@
504504
},
505505
"dplyr": {
506506
"Package": "dplyr",
507-
"Version": "1.1.1",
507+
"Version": "1.1.2",
508508
"Source": "Repository",
509509
"Repository": "CRAN",
510510
"Requirements": [
@@ -523,7 +523,7 @@
523523
"utils",
524524
"vctrs"
525525
],
526-
"Hash": "eb5742d256a0d9306d85ea68756d8187"
526+
"Hash": "dea6970ff715ca541c387de363ff405e"
527527
},
528528
"dtplyr": {
529529
"Package": "dtplyr",
@@ -594,15 +594,15 @@
594594
},
595595
"fontawesome": {
596596
"Package": "fontawesome",
597-
"Version": "0.5.0",
597+
"Version": "0.5.1",
598598
"Source": "Repository",
599599
"Repository": "CRAN",
600600
"Requirements": [
601601
"R",
602602
"htmltools",
603603
"rlang"
604604
],
605-
"Hash": "e80750aec5717dedc019ad7ee40e4a7c"
605+
"Hash": "1e22b8cabbad1eae951a75e9f8b52378"
606606
},
607607
"forcats": {
608608
"Package": "forcats",
@@ -680,7 +680,7 @@
680680
},
681681
"gdata": {
682682
"Package": "gdata",
683-
"Version": "2.18.0.1",
683+
"Version": "2.19.0",
684684
"Source": "Repository",
685685
"Repository": "CRAN",
686686
"Requirements": [
@@ -690,7 +690,7 @@
690690
"stats",
691691
"utils"
692692
],
693-
"Hash": "8c86ee4c7aa7dd31ef0a28b28649bde4"
693+
"Hash": "c62b8cf5c03602e852c66ad623d385fa"
694694
},
695695
"generics": {
696696
"Package": "generics",
@@ -1584,13 +1584,13 @@
15841584
},
15851585
"sas7bdat": {
15861586
"Package": "sas7bdat",
1587-
"Version": "0.6",
1587+
"Version": "0.7",
15881588
"Source": "Repository",
15891589
"Repository": "CRAN",
15901590
"Requirements": [
15911591
"R"
15921592
],
1593-
"Hash": "15742bc9fcb5532cb0d83d0538e747f4"
1593+
"Hash": "91b6626f563f69460d07af06b9d65d8d"
15941594
},
15951595
"sass": {
15961596
"Package": "sass",
@@ -1961,14 +1961,14 @@
19611961
},
19621962
"xml2": {
19631963
"Package": "xml2",
1964-
"Version": "1.3.3",
1964+
"Version": "1.3.4",
19651965
"Source": "Repository",
19661966
"Repository": "CRAN",
19671967
"Requirements": [
19681968
"R",
19691969
"methods"
19701970
],
1971-
"Hash": "40682ed6a969ea5abfd351eb67833adc"
1971+
"Hash": "7dc765ac9b909487326a7d471fdd3821"
19721972
},
19731973
"yaml": {
19741974
"Package": "yaml",

renv/activate.R

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@ local({
6363
if (is.environment(x) || length(x)) x else y
6464
}
6565

66+
`%??%` <- function(x, y) {
67+
if (is.null(x)) y else x
68+
}
69+
6670
bootstrap <- function(version, library) {
6771

6872
# attempt to download renv
@@ -83,11 +87,22 @@ local({
8387

8488
renv_bootstrap_repos <- function() {
8589

90+
# get CRAN repository
91+
cran <- getOption("renv.repos.cran", "https://cloud.r-project.org")
92+
8693
# check for repos override
8794
repos <- Sys.getenv("RENV_CONFIG_REPOS_OVERRIDE", unset = NA)
88-
if (!is.na(repos))
95+
if (!is.na(repos)) {
96+
97+
# check for RSPM; if set, use a fallback repository for renv
98+
rspm <- Sys.getenv("RSPM", unset = NA)
99+
if (identical(rspm, repos))
100+
repos <- c(RSPM = rspm, CRAN = cran)
101+
89102
return(repos)
90103

104+
}
105+
91106
# check for lockfile repositories
92107
repos <- tryCatch(renv_bootstrap_repos_lockfile(), error = identity)
93108
if (!inherits(repos, "error") && length(repos))
@@ -104,10 +119,7 @@ local({
104119
repos <- getOption("repos")
105120

106121
# ensure @CRAN@ entries are resolved
107-
repos[repos == "@CRAN@"] <- getOption(
108-
"renv.repos.cran",
109-
"https://cloud.r-project.org"
110-
)
122+
repos[repos == "@CRAN@"] <- cran
111123

112124
# add in renv.bootstrap.repos if set
113125
default <- c(FALLBACK = "https://cloud.r-project.org")

0 commit comments

Comments
 (0)