Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Sep 23 update #10

Merged
merged 2 commits into from
Oct 5, 2023
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
78 changes: 40 additions & 38 deletions renv.lock
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
},
"Matrix": {
"Package": "Matrix",
"Version": "1.6-1",
"Version": "1.6-1.1",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
Expand All @@ -39,7 +39,7 @@
"stats",
"utils"
],
"Hash": "cb6855ac711958ca734b75e631b2035d"
"Hash": "1a00d4828f33a9d690806e98bd17150c"
},
"R6": {
"Package": "R6",
Expand Down Expand Up @@ -253,7 +253,7 @@
},
"credentials": {
"Package": "credentials",
"Version": "1.3.2",
"Version": "2.0.1",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
Expand All @@ -263,7 +263,7 @@
"openssl",
"sys"
],
"Hash": "93762d0a34d78e6a025efdbfb5c6bb41"
"Hash": "c7844b32098dcbd1c59cbd8dddb4ecc6"
},
"crosstalk": {
"Package": "crosstalk",
Expand All @@ -285,13 +285,13 @@
},
"curl": {
"Package": "curl",
"Version": "5.0.2",
"Version": "5.1.0",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"R"
],
"Hash": "511bacbfa153a15251166b463b4da4f9"
"Hash": "9123f3ef96a2c1a93927d828b2fe7d4c"
},
"data.table": {
"Package": "data.table",
Expand Down Expand Up @@ -365,14 +365,14 @@
},
"evaluate": {
"Package": "evaluate",
"Version": "0.21",
"Version": "0.22",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"R",
"methods"
],
"Hash": "d59f3b464e8da1aef82dc04b588b8dfb"
"Hash": "66f39c7a21e03c4dcb2c2d21d738d603"
},
"fansi": {
"Package": "fansi",
Expand Down Expand Up @@ -452,7 +452,7 @@
},
"gert": {
"Package": "gert",
"Version": "1.9.3",
"Version": "2.0.0",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
Expand All @@ -463,7 +463,7 @@
"sys",
"zip"
],
"Hash": "b544c397820e05a97d391b2d614a921a"
"Hash": "bbbd21a253d473f4671d7dcbd6d8971f"
},
"ggiraph": {
"Package": "ggiraph",
Expand Down Expand Up @@ -624,20 +624,19 @@
},
"hoaddata": {
"Package": "hoaddata",
"Version": "0.2.7",
"Version": "0.2.71",
"Source": "GitHub",
"RemoteType": "github",
"RemoteHost": "api.github.com",
"RemoteRepo": "hoaddata",
"RemoteUsername": "subugoe",
"RemotePkgRef": "subugoe/hoaddata",
"RemoteRef": "HEAD",
"RemoteSha": "4c2f4ca04f0b883928dacfdbf2f8f56bddf9c5e6",
"RemoteSha": "a9fc13b8c5880e2ffa19d8d3b3981114660dabd9",
"Requirements": [
"R",
"tibble"
],
"Hash": "b06b442b9452601d56f6ca000608ffdf"
"Hash": "dc8a64b637a632817a82b1a6781919cc"
},
"htmltools": {
"Package": "htmltools",
Expand Down Expand Up @@ -783,7 +782,7 @@
},
"knitr": {
"Package": "knitr",
"Version": "1.43",
"Version": "1.44",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
Expand All @@ -795,18 +794,18 @@
"xfun",
"yaml"
],
"Hash": "9775eb076713f627c07ce41d8199d8f6"
"Hash": "60885b9f746c9dfaef110d070b5f7dc0"
},
"labeling": {
"Package": "labeling",
"Version": "0.4.2",
"Version": "0.4.3",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"graphics",
"stats"
],
"Hash": "3d5108641f47470611a32d0bdf357a72"
"Hash": "b64ec208ac5bc1852b285f665d6368b3"
},
"later": {
"Package": "later",
Expand All @@ -821,7 +820,7 @@
},
"lattice": {
"Package": "lattice",
"Version": "0.21-8",
"Version": "0.21-9",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
Expand All @@ -832,7 +831,7 @@
"stats",
"utils"
],
"Hash": "0b8a6d63c8770f02a8b5635f3c431e6b"
"Hash": "5558c61e0136e247252f5f952cdaad6a"
},
"lazyeval": {
"Package": "lazyeval",
Expand All @@ -859,7 +858,7 @@
},
"lubridate": {
"Package": "lubridate",
"Version": "1.9.2",
"Version": "1.9.3",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
Expand All @@ -868,7 +867,7 @@
"methods",
"timechange"
],
"Hash": "e25f18436e3efd42c7c590a1c4c15390"
"Hash": "680ad542fbcf801442c83a6ac5a2126c"
},
"magrittr": {
"Package": "magrittr",
Expand All @@ -882,7 +881,7 @@
},
"markdown": {
"Package": "markdown",
"Version": "1.8",
"Version": "1.9",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
Expand All @@ -891,7 +890,7 @@
"utils",
"xfun"
],
"Hash": "93cecf1e5f828d0fc1605a00ad48e3a2"
"Hash": "4dea09e610da59f847c041d887b4dcfc"
},
"memoise": {
"Package": "memoise",
Expand Down Expand Up @@ -958,13 +957,13 @@
},
"openssl": {
"Package": "openssl",
"Version": "2.1.0",
"Version": "2.1.1",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"askpass"
],
"Hash": "273a6bb4a9844c296a459d2176673270"
"Hash": "2a0dc8c6adfb6f032e4d4af82d258ab5"
},
"patchwork": {
"Package": "patchwork",
Expand Down Expand Up @@ -1055,10 +1054,13 @@
},
"prettyunits": {
"Package": "prettyunits",
"Version": "1.1.1",
"Version": "1.2.0",
"Source": "Repository",
"Repository": "CRAN",
"Hash": "95ef9167b75dde9d2ccc3c7528393e7e"
"Requirements": [
"R"
],
"Hash": "6b01fc98b1e86c4f705ce9dcfd2f57c7"
},
"processx": {
"Package": "processx",
Expand Down Expand Up @@ -1188,13 +1190,13 @@
},
"renv": {
"Package": "renv",
"Version": "1.0.2",
"Version": "1.0.3",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"utils"
],
"Hash": "4b22ac016fe54028b88d0c68badbd061"
"Hash": "41b847654f567341725473431dd0d5ab"
},
"rlang": {
"Package": "rlang",
Expand All @@ -1209,7 +1211,7 @@
},
"rmarkdown": {
"Package": "rmarkdown",
"Version": "2.24",
"Version": "2.25",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
Expand All @@ -1229,7 +1231,7 @@
"xfun",
"yaml"
],
"Hash": "3854c37590717c08c32ec8542a2e0a35"
"Hash": "d65e35823c817f09f4de424fcdfa812a"
},
"rprojroot": {
"Package": "rprojroot",
Expand Down Expand Up @@ -1455,13 +1457,13 @@
},
"tinytex": {
"Package": "tinytex",
"Version": "0.46",
"Version": "0.47",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
"xfun"
],
"Hash": "0c41a73214d982f539c56a7773c7afa5"
"Hash": "8d4ccb733843e513c1c1cdd66a759f0d"
},
"tzdb": {
"Package": "tzdb",
Expand Down Expand Up @@ -1551,7 +1553,7 @@
},
"vroom": {
"Package": "vroom",
"Version": "1.6.3",
"Version": "1.6.4",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
Expand All @@ -1573,7 +1575,7 @@
"vctrs",
"withr"
],
"Hash": "8318e64ffb3a70e652494017ec455561"
"Hash": "9db52c1656cf19c124f93124ea57f0fd"
},
"webshot": {
"Package": "webshot",
Expand Down Expand Up @@ -1609,7 +1611,7 @@
},
"withr": {
"Package": "withr",
"Version": "2.5.0",
"Version": "2.5.1",
"Source": "Repository",
"Repository": "CRAN",
"Requirements": [
Expand All @@ -1618,7 +1620,7 @@
"graphics",
"stats"
],
"Hash": "c0e49a9760983e81e55cdd9be92e7182"
"Hash": "d77c6f74be05c33164e33fbc85540cae"
},
"xfun": {
"Package": "xfun",
Expand Down
27 changes: 3 additions & 24 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.2"
version <- "1.0.3"
attr(version, "sha") <- NULL

# the project directory
Expand Down Expand Up @@ -1034,19 +1034,6 @@ local({

}


renv_bootstrap_in_rstudio <- function() {
commandArgs()[[1]] == "RStudio"
}

# Used to work around buglet in RStudio if hook uses readline
renv_bootstrap_flush_console <- function() {
tryCatch({
tools <- as.environment("tools:rstudio")
tools$.rs.api.sendToConsole("", echo = FALSE, focus = FALSE)
}, error = function(cnd) {})
}

renv_json_read <- function(file = NULL, text = NULL) {

jlerr <- NULL
Expand Down Expand Up @@ -1185,16 +1172,8 @@ local({
# construct full libpath
libpath <- file.path(root, prefix)

if (renv_bootstrap_in_rstudio()) {
# RStudio only updates console once .Rprofile is finished, so
# instead run code on sessionInit
setHook("rstudio.sessionInit", function(...) {
renv_bootstrap_exec(project, libpath, version)
renv_bootstrap_flush_console()
})
} else {
renv_bootstrap_exec(project, libpath, version)
}
# run bootstrap code
renv_bootstrap_exec(project, libpath, version)

invisible()

Expand Down