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

Upgrade packages #2

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
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
79 changes: 43 additions & 36 deletions renv.lock
Original file line number Diff line number Diff line change
Expand Up @@ -11,17 +11,17 @@
"Packages": {
"R6": {
"Package": "R6",
"Version": "2.5.0",
"Version": "2.5.1",
"Source": "Repository",
"Repository": "CRAN",
"Hash": "b203113193e70978a696b2809525649d"
"Hash": "470851b6d5d0ac559e9d01bb352b4021"
},
"Rcpp": {
"Package": "Rcpp",
"Version": "1.0.6",
"Version": "1.0.7",
"Source": "Repository",
"Repository": "CRAN",
"Hash": "dbb5e436998a7eba5a9d682060533338"
"Hash": "dab19adae4440ae55aa8a9d238b246bb"
},
"base64enc": {
"Package": "base64enc",
Expand All @@ -32,10 +32,10 @@
},
"bookdown": {
"Package": "bookdown",
"Version": "0.22",
"Version": "0.23",
"Source": "Repository",
"Repository": "CRAN",
"Hash": "8fb0b67dfdf9d751fc93cb0036def3cc"
"Hash": "bc07f4b5b93bbf21075429e0c7e090f8"
},
"brio": {
"Package": "brio",
Expand All @@ -53,10 +53,10 @@
},
"cli": {
"Package": "cli",
"Version": "2.5.0",
"Version": "3.0.1",
"Source": "Repository",
"Repository": "CRAN",
"Hash": "a94ba44cee3ea571e813721e64184172"
"Hash": "e3ae5d68dea0c55a12ea12a9fda02e61"
},
"crayon": {
"Package": "crayon",
Expand Down Expand Up @@ -100,6 +100,13 @@
"Repository": "CRAN",
"Hash": "d447b40982c576a72b779f0a3b3da227"
},
"fastmap": {
"Package": "fastmap",
"Version": "1.1.0",
"Source": "Repository",
"Repository": "CRAN",
"Hash": "77bd60a6157420d4ffa93b27cf6a58b8"
},
"fs": {
"Package": "fs",
"Version": "1.5.0",
Expand All @@ -123,17 +130,17 @@
},
"htmltools": {
"Package": "htmltools",
"Version": "0.5.1.1",
"Version": "0.5.2",
"Source": "Repository",
"Repository": "CRAN",
"Hash": "af2c2531e55df5cf230c4b5444fc973c"
"Hash": "526c484233f42522278ab06fb185cb26"
},
"httpuv": {
"Package": "httpuv",
"Version": "1.6.1",
"Version": "1.6.2",
"Source": "Repository",
"Repository": "CRAN",
"Hash": "54344a78aae37bc6ef39b1240969df8e"
"Hash": "a42959b003aad9fc351b10250c5a6b77"
},
"jquerylib": {
"Package": "jquerylib",
Expand All @@ -158,10 +165,10 @@
},
"later": {
"Package": "later",
"Version": "1.2.0",
"Version": "1.3.0",
"Source": "Repository",
"Repository": "CRAN",
"Hash": "b61890ae77fea19fc8acadd25db70aa4"
"Hash": "7e7b457d7766bc47f2a5f21cc2984f8e"
},
"lifecycle": {
"Package": "lifecycle",
Expand All @@ -186,17 +193,17 @@
},
"mime": {
"Package": "mime",
"Version": "0.10",
"Version": "0.11",
"Source": "Repository",
"Repository": "RSPM",
"Hash": "26fa77e707223e1ce042b2b5d09993dc"
"Repository": "CRAN",
"Hash": "8974a907200fc9948d636fe7d85ca9fb"
},
"pillar": {
"Package": "pillar",
"Version": "1.6.1",
"Version": "1.6.2",
"Source": "Repository",
"Repository": "CRAN",
"Hash": "8672ae02bd20f6479bce2d06c7ff1401"
"Hash": "43f228eb4b49093d1c8a5c93cae9efe9"
},
"pkgconfig": {
"Package": "pkgconfig",
Expand All @@ -221,10 +228,10 @@
},
"renv": {
"Package": "renv",
"Version": "0.13.2",
"Version": "0.14.0",
"Source": "Repository",
"Repository": "CRAN",
"Hash": "079cb1f03ff972b30401ed05623cbe92"
"Hash": "30e5eba91b67f7f4d75d31de14bbfbdc"
},
"rlang": {
"Package": "rlang",
Expand All @@ -235,10 +242,10 @@
},
"rmarkdown": {
"Package": "rmarkdown",
"Version": "2.9",
"Version": "2.10",
"Source": "Repository",
"Repository": "CRAN",
"Hash": "912c09266d5470516df4df7a303cde92"
"Hash": "1fb097f233ee98968f8e5d0bcd42df6d"
},
"sass": {
"Package": "sass",
Expand All @@ -249,10 +256,10 @@
},
"servr": {
"Package": "servr",
"Version": "0.22",
"Version": "0.23",
"Source": "Repository",
"Repository": "CRAN",
"Hash": "8cfe5c1d3a8c8304496ba3034e080405"
"Hash": "75a40cd4f8503fe175be6b213009767f"
},
"sessioninfo": {
"Package": "sessioninfo",
Expand All @@ -263,10 +270,10 @@
},
"stringi": {
"Package": "stringi",
"Version": "1.6.1",
"Version": "1.7.4",
"Source": "Repository",
"Repository": "CRAN",
"Hash": "3b9a9c9454b864b08713715396689b9e"
"Hash": "ebaccb577da50829a3bb1b8296f318a5"
},
"stringr": {
"Package": "stringr",
Expand All @@ -277,24 +284,24 @@
},
"tibble": {
"Package": "tibble",
"Version": "3.1.2",
"Version": "3.1.4",
"Source": "Repository",
"Repository": "CRAN",
"Hash": "349b40a9f144516d537c875e786ec8b8"
"Hash": "5e8ad5621e5c94b24ec07b88eee13df8"
},
"tinytex": {
"Package": "tinytex",
"Version": "0.32",
"Version": "0.33",
"Source": "Repository",
"Repository": "CRAN",
"Hash": "db9a6f2cf147751322d22c9f6647c7bd"
"Hash": "6e0ad90ac5669e35d5456cb61b295acb"
},
"utf8": {
"Package": "utf8",
"Version": "1.2.1",
"Version": "1.2.2",
"Source": "Repository",
"Repository": "RSPM",
"Hash": "c3ad47dc6da0751f18ed53c4613e3ac7"
"Repository": "CRAN",
"Hash": "c9c462b759a5cc844ae25b5942654d13"
},
"vctrs": {
"Package": "vctrs",
Expand All @@ -312,10 +319,10 @@
},
"xfun": {
"Package": "xfun",
"Version": "0.24",
"Version": "0.25",
"Source": "Repository",
"Repository": "CRAN",
"Hash": "88cdb9779a657ad80ad942245fffba31"
"Hash": "853d45ffff0a9af1e0af017cd359f75e"
},
"xml2": {
"Package": "xml2",
Expand Down
18 changes: 16 additions & 2 deletions renv/activate.R
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,27 @@
local({

# the requested version of renv
version <- "0.13.2"
version <- "0.14.0"

# the project directory
project <- getwd()

# allow environment variable to control activation
activate <- Sys.getenv("RENV_ACTIVATE_PROJECT")
if (!nzchar(activate)) {

# don't auto-activate when R CMD INSTALL is running
if (nzchar(Sys.getenv("R_INSTALL_PKG")))
return(FALSE)

}

# bail if activation was explicitly disabled
if (tolower(activate) %in% c("false", "f", "0"))
return(FALSE)

# avoid recursion
if (!is.na(Sys.getenv("RENV_R_INITIALIZING", unset = NA)))
if (nzchar(Sys.getenv("RENV_R_INITIALIZING")))
return(invisible(TRUE))

# signal that we're loading renv during R startup
Expand Down