From ecd6520b66a9bb22f77e166b85964d8f41ecd716 Mon Sep 17 00:00:00 2001 From: chanyub Park Date: Tue, 6 Feb 2024 01:39:27 +0900 Subject: [PATCH] update renv need to update for cran test fail. --- .Rprofile | 3 - R/getContent.R | 57 +-- renv.lock | 1044 ++++++++++++++++++++++++++++---------------- renv/.gitignore | 1 + renv/activate.R | 146 +++++-- renv/settings.dcf | 10 - renv/settings.json | 17 + 7 files changed, 814 insertions(+), 464 deletions(-) delete mode 100644 renv/settings.dcf create mode 100644 renv/settings.json diff --git a/.Rprofile b/.Rprofile index bad2806..81b960f 100644 --- a/.Rprofile +++ b/.Rprofile @@ -1,4 +1 @@ source("renv/activate.R") -if (interactive()) { - suppressMessages(require(usethis)) -} diff --git a/R/getContent.R b/R/getContent.R index 58f74a2..a4a4df0 100644 --- a/R/getContent.R +++ b/R/getContent.R @@ -15,16 +15,16 @@ getContent <- function(turl, - col = c("url", - "original_url", - "section", - "datetime", - "edittime", - "press", - "title", - "body", - "value")) { - + col = c( + "url", + "original_url", + "section", + "datetime", + "edittime", + "press", + "title", + "body" + )) { httr2::request(turl) %>% httr2::req_user_agent("N2H4 by chanyub.park ") %>% httr2::req_method("GET") %>% @@ -32,10 +32,12 @@ getContent <- html_obj <- httr2::resp_body_html(root) urlcheck <- root$url - value <- T - if (identical(grep("^https?://n.news.naver.com", - urlcheck), - integer(0))) { + + if ( + identical( + grep("^https?://n.news.naver.com", urlcheck), integer(0) + ) + ) { original_url <- "page is not news section." title <- "page is not news section." datetime <- "page is not news section." @@ -43,27 +45,8 @@ getContent <- press <- "page is not news section." body <- "page is not news section." section <- "page is not news section." - value <- F + } else { - # TODO: 이거 동작하는지 확인해야 함. - chk <- rvest::html_nodes(html_obj, "div#main_content div div") - chk <- rvest::html_attr(chk, "class") - chk <- chk[1] - if (is.na(chk)) { - chk <- "not error" - } - if ("error_msg 404" == chk & value) { - original_url <- "page is moved." - title <- "page is moved." - datetime <- "page is moved." - edittime <- "page is moved." - press <- "page is moved." - body <- "page is moved." - section <- "page is moved." - value <- F - } - } - if (value) { original_url <- getOriginalUrl(html_obj) title <- getContentTitle(html_obj) datetime <- getContentDatetime(html_obj) @@ -84,8 +67,7 @@ getContent <- press = press, title = title, body = body, - section = section, - value = value + section = section ) return(newsInfo[, col]) } @@ -141,7 +123,7 @@ getContentPress <- getContentBody <- function(html_obj, - body_node_info = "div#dic_area", + body_node_info = "article#dic_area", body_attr = "") { node <- rvest::html_nodes(html_obj, body_node_info) body <- rvest::html_text(node) @@ -171,4 +153,3 @@ getSection <- function(turl) { } return(httr2::url_parse(turl)$query$sid) } - diff --git a/renv.lock b/renv.lock index 2b5288f..65244a5 100644 --- a/renv.lock +++ b/renv.lock @@ -1,219 +1,265 @@ { "R": { - "Version": "4.2.1", + "Version": "4.3.2", "Repositories": [ + { + "Name": "RSPM", + "URL": "https://packagemanager.rstudio.com/all/latest" + }, { "Name": "CRAN", - "URL": "https://cran.rstudio.com" + "URL": "https://cloud.r-project.org" } ] }, "Packages": { "MASS": { "Package": "MASS", - "Version": "7.3-58.1", + "Version": "7.3-60.0.1", "Source": "Repository", "Repository": "CRAN", - "Hash": "762e1804143a332333c054759f89a706", - "Requirements": [] + "Requirements": [ + "R", + "grDevices", + "graphics", + "methods", + "stats", + "utils" + ], + "Hash": "b765b28387acc8ec9e9c1530713cb19c" }, "Matrix": { "Package": "Matrix", - "Version": "1.4-1", + "Version": "1.6-5", "Source": "Repository", "Repository": "CRAN", - "Hash": "699c47c606293bdfbc9fd78a93c9c8fe", "Requirements": [ - "lattice" - ] + "R", + "grDevices", + "graphics", + "grid", + "lattice", + "methods", + "stats", + "utils" + ], + "Hash": "8c7115cd3a0e048bda2a7cd110549f7a" }, "R6": { "Package": "R6", "Version": "2.5.1", "Source": "Repository", "Repository": "CRAN", - "Hash": "470851b6d5d0ac559e9d01bb352b4021", - "Requirements": [] + "Requirements": [ + "R" + ], + "Hash": "470851b6d5d0ac559e9d01bb352b4021" }, "RColorBrewer": { "Package": "RColorBrewer", "Version": "1.1-3", "Source": "Repository", "Repository": "CRAN", - "Hash": "45f0398006e83a5b10b72a90663d8d8c", - "Requirements": [] + "Requirements": [ + "R" + ], + "Hash": "45f0398006e83a5b10b72a90663d8d8c" }, "Rcpp": { "Package": "Rcpp", - "Version": "1.0.9", + "Version": "1.0.12", "Source": "Repository", - "Repository": "CRAN", - "Hash": "e9c08b94391e9f3f97355841229124f2", - "Requirements": [] + "Repository": "RSPM", + "Requirements": [ + "methods", + "utils" + ], + "Hash": "5ea2700d21e038ace58269ecdbeb9ec0" }, "askpass": { "Package": "askpass", - "Version": "1.1", + "Version": "1.2.0", "Source": "Repository", - "Repository": "CRAN", - "Hash": "e8a22846fff485f0be3770c2da758713", + "Repository": "RSPM", "Requirements": [ "sys" - ] + ], + "Hash": "cad6cf7f1d5f6e906700b9d3e718c796" }, "base64enc": { "Package": "base64enc", "Version": "0.1-3", "Source": "Repository", "Repository": "CRAN", - "Hash": "543776ae6848fde2f48ff3816d0628bc", - "Requirements": [] + "Requirements": [ + "R" + ], + "Hash": "543776ae6848fde2f48ff3816d0628bc" }, "brew": { "Package": "brew", - "Version": "1.0-7", + "Version": "1.0-8", "Source": "Repository", "Repository": "CRAN", - "Hash": "38875ea52350ff4b4c03849fc69736c8", - "Requirements": [] + "Hash": "d69a786e85775b126bddbee185ae6084" }, "brio": { "Package": "brio", "Version": "1.1.3", "Source": "Repository", "Repository": "CRAN", - "Hash": "976cf154dfb043c012d87cddd8bca363", - "Requirements": [] + "Hash": "976cf154dfb043c012d87cddd8bca363" }, "bslib": { "Package": "bslib", - "Version": "0.4.0", + "Version": "0.5.0", "Source": "Repository", "Repository": "CRAN", - "Hash": "be5ee090716ce1671be6cd5d7c34d091", "Requirements": [ + "R", + "base64enc", "cachem", + "grDevices", "htmltools", "jquerylib", "jsonlite", "memoise", + "mime", "rlang", "sass" - ] + ], + "Hash": "1b117970533deb6d4e992c1b34e9d905" }, "cachem": { "Package": "cachem", - "Version": "1.0.6", + "Version": "1.0.8", "Source": "Repository", "Repository": "CRAN", - "Hash": "648c5b3d71e6a37e3043617489a0a0e9", "Requirements": [ "fastmap", "rlang" - ] + ], + "Hash": "c35768291560ce302c0a6589f92e837d" }, "callr": { "Package": "callr", - "Version": "3.7.2", + "Version": "3.7.3", "Source": "Repository", "Repository": "CRAN", - "Hash": "358689cac9fe93b1bb3a19088d2dbed8", "Requirements": [ + "R", "R6", - "processx" - ] + "processx", + "utils" + ], + "Hash": "9b2191ede20fa29828139b9900922e51" }, "cli": { "Package": "cli", - "Version": "3.3.0", + "Version": "3.6.2", "Source": "Repository", - "Repository": "CRAN", - "Hash": "23abf173c2b783dcc43379ab9bba00ee", + "Repository": "RSPM", "Requirements": [ - "glue" - ] + "R", + "utils" + ], + "Hash": "1216ac65ac55ec0058a6f75d7ca0fd52" }, "clipr": { "Package": "clipr", "Version": "0.8.0", "Source": "Repository", "Repository": "CRAN", - "Hash": "3f038e5ac7f41d4ac41ce658c85e3042", - "Requirements": [] + "Requirements": [ + "utils" + ], + "Hash": "3f038e5ac7f41d4ac41ce658c85e3042" }, "colorspace": { "Package": "colorspace", - "Version": "2.0-3", + "Version": "2.1-0", "Source": "Repository", "Repository": "CRAN", - "Hash": "bb4341986bc8b914f0f0acf2e4a3f2f7", - "Requirements": [] + "Requirements": [ + "R", + "grDevices", + "graphics", + "methods", + "stats" + ], + "Hash": "f20c47fd52fae58b4e377c37bb8c335b" }, "commonmark": { "Package": "commonmark", - "Version": "1.8.0", + "Version": "1.9.0", "Source": "Repository", "Repository": "CRAN", - "Hash": "2ba81b120c1655ab696c935ef33ea716", - "Requirements": [] + "Hash": "d691c61bff84bd63c383874d2d0c3307" }, "cpp11": { "Package": "cpp11", - "Version": "0.4.2", + "Version": "0.4.3", "Source": "Repository", "Repository": "CRAN", - "Hash": "fa53ce256cd280f468c080a58ea5ba8c", - "Requirements": [] + "Hash": "ed588261931ee3be2c700d22e94a29ab" }, "crayon": { "Package": "crayon", - "Version": "1.5.1", + "Version": "1.5.2", "Source": "Repository", "Repository": "CRAN", - "Hash": "8dc45fd8a1ee067a92b85ef274e66d6a", - "Requirements": [] + "Requirements": [ + "grDevices", + "methods", + "utils" + ], + "Hash": "e8a1e41acf02548751f45c718d55aa6a" }, "credentials": { "Package": "credentials", "Version": "1.3.2", "Source": "Repository", "Repository": "CRAN", - "Hash": "93762d0a34d78e6a025efdbfb5c6bb41", "Requirements": [ "askpass", "curl", "jsonlite", "openssl", "sys" - ] + ], + "Hash": "93762d0a34d78e6a025efdbfb5c6bb41" }, "curl": { "Package": "curl", - "Version": "4.3.2", + "Version": "5.2.0", "Source": "Repository", - "Repository": "CRAN", - "Hash": "022c42d49c28e95d69ca60446dbabf88", - "Requirements": [] + "Repository": "RSPM", + "Requirements": [ + "R" + ], + "Hash": "ce88d13c0b10fe88a37d9c59dba2d7f9" }, "desc": { "Package": "desc", - "Version": "1.4.1", + "Version": "1.4.2", "Source": "Repository", "Repository": "CRAN", - "Hash": "eebd27ee58fcc58714eedb7aa07d8ad1", "Requirements": [ + "R", "R6", "cli", - "rprojroot" - ] + "rprojroot", + "utils" + ], + "Hash": "6b9602c7ebbe87101a9c8edb6e8b6d21" }, "devtools": { "Package": "devtools", - "Version": "2.4.4", + "Version": "2.4.5", "Source": "Repository", "Repository": "CRAN", - "Hash": "d6ad91ae6533b84d227bb0b5262c111f", "Requirements": [ + "R", "cli", "desc", "ellipsis", @@ -231,37 +277,49 @@ "roxygen2", "rversions", "sessioninfo", + "stats", "testthat", + "tools", "urlchecker", "usethis", + "utils", "withr" - ] + ], + "Hash": "ea5bc8b4a6a01e4f12d98b58329930bb" }, "diffobj": { "Package": "diffobj", "Version": "0.3.5", "Source": "Repository", "Repository": "CRAN", - "Hash": "bcaa8b95f8d7d01a5dedfd959ce88ab8", "Requirements": [ - "crayon" - ] + "R", + "crayon", + "methods", + "stats", + "tools", + "utils" + ], + "Hash": "bcaa8b95f8d7d01a5dedfd959ce88ab8" }, "digest": { "Package": "digest", - "Version": "0.6.29", + "Version": "0.6.34", "Source": "Repository", - "Repository": "CRAN", - "Hash": "cf6b206a045a684728c3267ef7596190", - "Requirements": [] + "Repository": "RSPM", + "Requirements": [ + "R", + "utils" + ], + "Hash": "7ede2ee9ea8d3edbf1ca84c1e333ad1a" }, "downlit": { "Package": "downlit", - "Version": "0.4.2", + "Version": "0.4.3", "Source": "Repository", "Repository": "CRAN", - "Hash": "79bf3f66590752ffbba20f8d2da94c7c", "Requirements": [ + "R", "brio", "desc", "digest", @@ -272,75 +330,85 @@ "vctrs", "withr", "yaml" - ] + ], + "Hash": "14fa1f248b60ed67e1f5418391a17b14" }, "ellipsis": { "Package": "ellipsis", "Version": "0.3.2", "Source": "Repository", "Repository": "CRAN", - "Hash": "bb0eec2fe32e88d9e2836c2f73ea2077", "Requirements": [ + "R", "rlang" - ] + ], + "Hash": "bb0eec2fe32e88d9e2836c2f73ea2077" }, "evaluate": { "Package": "evaluate", - "Version": "0.16", + "Version": "0.21", "Source": "Repository", "Repository": "CRAN", - "Hash": "9a3d3c345f8a5648abe61608aaa29518", - "Requirements": [] + "Requirements": [ + "R", + "methods" + ], + "Hash": "d59f3b464e8da1aef82dc04b588b8dfb" }, "fansi": { "Package": "fansi", - "Version": "1.0.3", + "Version": "1.0.6", "Source": "Repository", - "Repository": "CRAN", - "Hash": "83a8afdbe71839506baa9f90eebad7ec", - "Requirements": [] + "Repository": "RSPM", + "Requirements": [ + "R", + "grDevices", + "utils" + ], + "Hash": "962174cf2aeb5b9eea581522286a911f" }, "farver": { "Package": "farver", "Version": "2.1.1", "Source": "Repository", "Repository": "CRAN", - "Hash": "8106d78941f34855c440ddb946b8f7a5", - "Requirements": [] + "Hash": "8106d78941f34855c440ddb946b8f7a5" }, "fastmap": { "Package": "fastmap", - "Version": "1.1.0", + "Version": "1.1.1", "Source": "Repository", "Repository": "CRAN", - "Hash": "77bd60a6157420d4ffa93b27cf6a58b8", - "Requirements": [] + "Hash": "f7736a18de97dea803bde0a2daaafb27" }, "fontawesome": { "Package": "fontawesome", - "Version": "0.3.0", + "Version": "0.5.1", "Source": "Repository", "Repository": "CRAN", - "Hash": "a36c4a3eade472039a3ec8cb824e6dc4", "Requirements": [ + "R", "htmltools", "rlang" - ] + ], + "Hash": "1e22b8cabbad1eae951a75e9f8b52378" }, "fs": { "Package": "fs", - "Version": "1.5.2", + "Version": "1.6.3", "Source": "Repository", "Repository": "CRAN", - "Hash": "7c89603d81793f0d5486d91ab1fc6f1d", - "Requirements": [] + "Requirements": [ + "R", + "methods" + ], + "Hash": "47b5f30c720c23999b913a1a635cf0bb" }, "gert": { "Package": "gert", - "Version": "1.7.1", + "Version": "1.9.2", "Source": "Repository", "Repository": "CRAN", - "Hash": "92d17e7b0639cad43d44e75199d4aa64", "Requirements": [ "askpass", "credentials", @@ -348,205 +416,265 @@ "rstudioapi", "sys", "zip" - ] + ], + "Hash": "9122b3958e749badb5c939f498038b57" }, "ggfun": { "Package": "ggfun", - "Version": "0.0.7", + "Version": "0.1.4", "Source": "Repository", "Repository": "CRAN", - "Hash": "293dc88848ef6ca5266b0dbbac3ca934", "Requirements": [ + "R", + "cli", "ggplot2", - "rlang" - ] + "grid", + "rlang", + "utils" + ], + "Hash": "91780e07f1d631a1152835b4e25c66b9" }, "ggimage": { "Package": "ggimage", - "Version": "0.3.1", + "Version": "0.3.3", "Source": "Repository", "Repository": "CRAN", - "Hash": "a7919e11761293f25eeb1562d3e4342a", "Requirements": [ + "R", "ggfun", "ggplot2", "ggplotify", + "grid", "jsonlite", "magick", + "methods", "scales", - "tibble" - ] + "tibble", + "tools", + "utils", + "withr" + ], + "Hash": "18c57347f13a654ef8683a6676042624" }, "ggplot2": { "Package": "ggplot2", - "Version": "3.3.6", + "Version": "3.4.4", "Source": "Repository", "Repository": "CRAN", - "Hash": "0fb26d0674c82705c6b701d1a61e02ea", "Requirements": [ "MASS", - "digest", + "R", + "cli", "glue", + "grDevices", + "grid", "gtable", "isoband", + "lifecycle", "mgcv", "rlang", "scales", + "stats", "tibble", + "vctrs", "withr" - ] + ], + "Hash": "313d31eff2274ecf4c1d3581db7241f9" }, "ggplotify": { "Package": "ggplotify", - "Version": "0.1.0", + "Version": "0.1.2", "Source": "Repository", "Repository": "CRAN", - "Hash": "acbcedf783cdb8710168aa0edba42ac0", "Requirements": [ + "R", "ggplot2", + "grDevices", + "graphics", + "grid", "gridGraphics", "yulab.utils" - ] + ], + "Hash": "1547863db3b472cf7181973acf649f1a" }, "gh": { "Package": "gh", - "Version": "1.3.0", + "Version": "1.4.0", "Source": "Repository", "Repository": "CRAN", - "Hash": "38c2580abbda249bd6afeec00d14f531", "Requirements": [ + "R", "cli", "gitcreds", - "httr", + "httr2", "ini", - "jsonlite" - ] + "jsonlite", + "rlang" + ], + "Hash": "03533b1c875028233598f848fda44c4c" }, "gitcreds": { "Package": "gitcreds", - "Version": "0.1.1", + "Version": "0.1.2", "Source": "Repository", "Repository": "CRAN", - "Hash": "f3aefccc1cc50de6338146b62f115de8", - "Requirements": [] + "Requirements": [ + "R" + ], + "Hash": "ab08ac61f3e1be454ae21911eb8bc2fe" }, "glue": { "Package": "glue", - "Version": "1.6.2", + "Version": "1.7.0", "Source": "Repository", - "Repository": "CRAN", - "Hash": "4f2596dfb05dac67b9dc558e5c6fba2e", - "Requirements": [] + "Repository": "RSPM", + "Requirements": [ + "R", + "methods" + ], + "Hash": "e0b3a53876554bd45879e596cdb10a52" }, "gridGraphics": { "Package": "gridGraphics", "Version": "0.5-1", "Source": "Repository", "Repository": "CRAN", - "Hash": "5b79228594f02385d4df4979284879ae", - "Requirements": [] + "Requirements": [ + "grDevices", + "graphics", + "grid" + ], + "Hash": "5b79228594f02385d4df4979284879ae" }, "gtable": { "Package": "gtable", - "Version": "0.3.1", + "Version": "0.3.4", "Source": "Repository", "Repository": "CRAN", - "Hash": "36b4265fb818f6a342bed217549cd896", - "Requirements": [] + "Requirements": [ + "R", + "cli", + "glue", + "grid", + "lifecycle", + "rlang" + ], + "Hash": "b29cf3031f49b04ab9c852c912547eef" }, "hexSticker": { "Package": "hexSticker", "Version": "0.4.9", "Source": "Repository", "Repository": "CRAN", - "Hash": "c624f6eb9e15082a672b5e6277257567", "Requirements": [ + "R", "ggimage", "ggplot2", + "grDevices", "hexbin", "showtext", + "stats", "sysfonts" - ] + ], + "Hash": "c624f6eb9e15082a672b5e6277257567" }, "hexbin": { "Package": "hexbin", - "Version": "1.28.2", + "Version": "1.28.3", "Source": "Repository", "Repository": "CRAN", - "Hash": "76314b69dc54f8c14204063a2fd6d74a", "Requirements": [ - "lattice" - ] + "R", + "grDevices", + "graphics", + "grid", + "lattice", + "methods", + "stats", + "utils" + ], + "Hash": "124e384c01d8746f1c12f9dc1b80a161" }, "highr": { "Package": "highr", - "Version": "0.9", + "Version": "0.10", "Source": "Repository", "Repository": "CRAN", - "Hash": "8eb36c8125038e648e5d111c0d7b2ed4", "Requirements": [ + "R", "xfun" - ] + ], + "Hash": "06230136b2d2b9ba5805e1963fa6e890" }, "htmltools": { "Package": "htmltools", - "Version": "0.5.3", + "Version": "0.5.5", "Source": "Repository", "Repository": "CRAN", - "Hash": "6496090a9e00f8354b811d1a2d47b566", "Requirements": [ + "R", "base64enc", "digest", + "ellipsis", "fastmap", - "rlang" - ] + "grDevices", + "rlang", + "utils" + ], + "Hash": "ba0240784ad50a62165058a27459304a" }, "htmlwidgets": { "Package": "htmlwidgets", - "Version": "1.5.4", + "Version": "1.6.2", "Source": "Repository", "Repository": "CRAN", - "Hash": "76147821cd3fcd8c4b04e1ef0498e7fb", "Requirements": [ + "grDevices", "htmltools", "jsonlite", + "knitr", + "rmarkdown", "yaml" - ] + ], + "Hash": "a865aa85bcb2697f47505bfd70422471" }, "httpuv": { "Package": "httpuv", - "Version": "1.6.5", + "Version": "1.6.11", "Source": "Repository", "Repository": "CRAN", - "Hash": "97fe71f0a4a1c9890e6c2128afa04bc0", "Requirements": [ + "R", "R6", "Rcpp", "later", - "promises" - ] + "promises", + "utils" + ], + "Hash": "838602f54e32c1a0f8cc80708cefcefa" }, "httr": { "Package": "httr", - "Version": "1.4.4", + "Version": "1.4.7", "Source": "Repository", "Repository": "CRAN", - "Hash": "57557fac46471f0dbbf44705cc6a5c8c", "Requirements": [ + "R", "R6", "curl", "jsonlite", "mime", "openssl" - ] + ], + "Hash": "ac107251d9d9fd72f0ca8049988f1d7f" }, "httr2": { "Package": "httr2", - "Version": "0.2.1", + "Version": "0.2.3", "Source": "Repository", "Repository": "CRAN", - "Hash": "0d31d9ab6ed32a436c3e299be9cf508f", "Requirements": [ + "R", "R6", "cli", "curl", @@ -556,191 +684,225 @@ "rappdirs", "rlang", "withr" - ] + ], + "Hash": "193bb297368afbbb42dc85784a46b36e" }, "ini": { "Package": "ini", "Version": "0.3.1", "Source": "Repository", "Repository": "CRAN", - "Hash": "6154ec2223172bce8162d4153cda21f7", - "Requirements": [] + "Hash": "6154ec2223172bce8162d4153cda21f7" }, "isoband": { "Package": "isoband", - "Version": "0.2.5", + "Version": "0.2.7", "Source": "Repository", "Repository": "CRAN", - "Hash": "7ab57a6de7f48a8dc84910d1eca42883", - "Requirements": [] + "Requirements": [ + "grid", + "utils" + ], + "Hash": "0080607b4a1a7b28979aecef976d8bc2" }, "jquerylib": { "Package": "jquerylib", "Version": "0.1.4", "Source": "Repository", "Repository": "CRAN", - "Hash": "5aab57a3bd297eee1c1d862735972182", "Requirements": [ "htmltools" - ] + ], + "Hash": "5aab57a3bd297eee1c1d862735972182" }, "jsonlite": { "Package": "jsonlite", - "Version": "1.8.0", + "Version": "1.8.8", "Source": "Repository", - "Repository": "CRAN", - "Hash": "d07e729b27b372429d42d24d503613a0", - "Requirements": [] + "Repository": "RSPM", + "Requirements": [ + "methods" + ], + "Hash": "e1b9c55281c5adc4dd113652d9e26768" }, "knitr": { "Package": "knitr", - "Version": "1.40", + "Version": "1.43", "Source": "Repository", "Repository": "CRAN", - "Hash": "caea8b0f899a0b1738444b9bc47067e7", "Requirements": [ + "R", "evaluate", "highr", - "stringr", + "methods", + "tools", "xfun", "yaml" - ] + ], + "Hash": "9775eb076713f627c07ce41d8199d8f6" }, "labeling": { "Package": "labeling", - "Version": "0.4.2", + "Version": "0.4.3", "Source": "Repository", "Repository": "CRAN", - "Hash": "3d5108641f47470611a32d0bdf357a72", - "Requirements": [] + "Requirements": [ + "graphics", + "stats" + ], + "Hash": "b64ec208ac5bc1852b285f665d6368b3" }, "later": { "Package": "later", - "Version": "1.3.0", + "Version": "1.3.1", "Source": "Repository", "Repository": "CRAN", - "Hash": "7e7b457d7766bc47f2a5f21cc2984f8e", "Requirements": [ "Rcpp", "rlang" - ] + ], + "Hash": "40401c9cf2bc2259dfe83311c9384710" }, "lattice": { "Package": "lattice", - "Version": "0.20-45", + "Version": "0.22-5", "Source": "Repository", "Repository": "CRAN", - "Hash": "b64cdbb2b340437c4ee047a1f4c4377b", - "Requirements": [] + "Requirements": [ + "R", + "grDevices", + "graphics", + "grid", + "stats", + "utils" + ], + "Hash": "7c5e89f04e72d6611c77451f6331a091" }, "lifecycle": { "Package": "lifecycle", - "Version": "1.0.1", + "Version": "1.0.4", "Source": "Repository", - "Repository": "CRAN", - "Hash": "a6b6d352e3ed897373ab19d8395c98d0", + "Repository": "RSPM", "Requirements": [ + "R", + "cli", "glue", "rlang" - ] + ], + "Hash": "b8552d117e1b808b09a832f589b79035" }, "magick": { "Package": "magick", - "Version": "2.7.3", + "Version": "2.8.2", "Source": "Repository", "Repository": "CRAN", - "Hash": "56fbad418aa50939ed8c3028126af8d7", "Requirements": [ "Rcpp", "curl", "magrittr" - ] + ], + "Hash": "87da0066dd0d7b1a95c461abfbf10411" }, "magrittr": { "Package": "magrittr", "Version": "2.0.3", "Source": "Repository", "Repository": "CRAN", - "Hash": "7ce2733a9826b3aeb1775d56fd305472", - "Requirements": [] + "Requirements": [ + "R" + ], + "Hash": "7ce2733a9826b3aeb1775d56fd305472" }, "memoise": { "Package": "memoise", "Version": "2.0.1", "Source": "Repository", "Repository": "CRAN", - "Hash": "e2817ccf4a065c5d9d7f2cfbe7c1d78c", "Requirements": [ "cachem", "rlang" - ] + ], + "Hash": "e2817ccf4a065c5d9d7f2cfbe7c1d78c" }, "mgcv": { "Package": "mgcv", - "Version": "1.8-40", + "Version": "1.9-1", "Source": "Repository", "Repository": "CRAN", - "Hash": "c6b2fdb18cf68ab613bd564363e1ba0d", "Requirements": [ "Matrix", - "nlme" - ] + "R", + "graphics", + "methods", + "nlme", + "splines", + "stats", + "utils" + ], + "Hash": "110ee9d83b496279960e162ac97764ce" }, "mime": { "Package": "mime", "Version": "0.12", "Source": "Repository", "Repository": "CRAN", - "Hash": "18e9c28c1d3ca1560ce30658b22ce104", - "Requirements": [] + "Requirements": [ + "tools" + ], + "Hash": "18e9c28c1d3ca1560ce30658b22ce104" }, "miniUI": { "Package": "miniUI", "Version": "0.1.1.1", "Source": "Repository", "Repository": "CRAN", - "Hash": "fec5f52652d60615fdb3957b3d74324a", "Requirements": [ "htmltools", - "shiny" - ] + "shiny", + "utils" + ], + "Hash": "fec5f52652d60615fdb3957b3d74324a" }, "munsell": { "Package": "munsell", "Version": "0.5.0", "Source": "Repository", "Repository": "CRAN", - "Hash": "6dfe8bf774944bd5595785e3229d8771", "Requirements": [ - "colorspace" - ] + "colorspace", + "methods" + ], + "Hash": "6dfe8bf774944bd5595785e3229d8771" }, "nlme": { "Package": "nlme", - "Version": "3.1-159", + "Version": "3.1-164", "Source": "Repository", "Repository": "CRAN", - "Hash": "4a0b3a68f846cb999ff0e8e519524fbb", "Requirements": [ - "lattice" - ] + "R", + "graphics", + "lattice", + "stats", + "utils" + ], + "Hash": "a623a2239e642806158bc4dc3f51565d" }, "openssl": { "Package": "openssl", - "Version": "2.0.2", + "Version": "2.1.1", "Source": "Repository", - "Repository": "CRAN", - "Hash": "6d3bef2e305f55c705c674653c7d7d3d", + "Repository": "RSPM", "Requirements": [ "askpass" - ] + ], + "Hash": "2a0dc8c6adfb6f032e4d4af82d258ab5" }, "pillar": { "Package": "pillar", - "Version": "1.8.1", + "Version": "1.9.0", "Source": "Repository", "Repository": "CRAN", - "Hash": "f2316df30902c81729ae9de95ad5a608", "Requirements": [ "cli", "fansi", @@ -748,41 +910,46 @@ "lifecycle", "rlang", "utf8", + "utils", "vctrs" - ] + ], + "Hash": "15da5a8412f317beeee6175fbc76f4bb" }, "pkgbuild": { "Package": "pkgbuild", - "Version": "1.3.1", + "Version": "1.4.2", "Source": "Repository", "Repository": "CRAN", - "Hash": "66d2adfed274daf81ccfe77d974c3b9b", "Requirements": [ + "R", "R6", "callr", "cli", "crayon", "desc", "prettyunits", - "rprojroot", - "withr" - ] + "processx", + "rprojroot" + ], + "Hash": "beb25b32a957a22a5c301a9e441190b3" }, "pkgconfig": { "Package": "pkgconfig", "Version": "2.0.3", "Source": "Repository", "Repository": "CRAN", - "Hash": "01f28d4278f15c76cddbea05899c5d6f", - "Requirements": [] + "Requirements": [ + "utils" + ], + "Hash": "01f28d4278f15c76cddbea05899c5d6f" }, "pkgdown": { "Package": "pkgdown", - "Version": "2.0.6", + "Version": "2.0.7", "Source": "Repository", "Repository": "CRAN", - "Hash": "f958d0b2a5dabc5ffd414f062b1ffbe7", "Requirements": [ + "R", "bslib", "callr", "cli", @@ -803,121 +970,138 @@ "withr", "xml2", "yaml" - ] + ], + "Hash": "16fa15449c930bf3a7761d3c68f8abf9" }, "pkgload": { "Package": "pkgload", - "Version": "1.3.0", + "Version": "1.3.2", "Source": "Repository", "Repository": "CRAN", - "Hash": "4b20f937a363c78a5730265c1925f54a", "Requirements": [ + "R", "cli", "crayon", "desc", "fs", "glue", + "methods", "rlang", "rprojroot", + "utils", "withr" - ] + ], + "Hash": "6b0c222c5071efe0f3baf3dae9aa40e2" }, "praise": { "Package": "praise", "Version": "1.0.0", "Source": "Repository", "Repository": "CRAN", - "Hash": "a555924add98c99d2f411e37e7d25e9f", - "Requirements": [] + "Hash": "a555924add98c99d2f411e37e7d25e9f" }, "prettyunits": { "Package": "prettyunits", "Version": "1.1.1", "Source": "Repository", "Repository": "CRAN", - "Hash": "95ef9167b75dde9d2ccc3c7528393e7e", - "Requirements": [] + "Hash": "95ef9167b75dde9d2ccc3c7528393e7e" }, "processx": { "Package": "processx", - "Version": "3.7.0", + "Version": "3.8.2", "Source": "Repository", "Repository": "CRAN", - "Hash": "f91df0f5f31ffdf88bc0b624f5ebab0f", "Requirements": [ + "R", "R6", - "ps" - ] + "ps", + "utils" + ], + "Hash": "3efbd8ac1be0296a46c55387aeace0f3" }, "profvis": { "Package": "profvis", - "Version": "0.3.7", + "Version": "0.3.8", "Source": "Repository", "Repository": "CRAN", - "Hash": "e9d21e79848e02e524bea6f5bd53e7e4", "Requirements": [ + "R", "htmlwidgets", - "stringr" - ] + "purrr", + "rlang", + "stringr", + "vctrs" + ], + "Hash": "aa5a3864397ce6ae03458f98618395a1" }, "promises": { "Package": "promises", "Version": "1.2.0.1", "Source": "Repository", "Repository": "CRAN", - "Hash": "4ab2c43adb4d4699cf3690acd378d75d", "Requirements": [ "R6", "Rcpp", "later", "magrittr", - "rlang" - ] + "rlang", + "stats" + ], + "Hash": "4ab2c43adb4d4699cf3690acd378d75d" }, "ps": { "Package": "ps", - "Version": "1.7.1", + "Version": "1.7.5", "Source": "Repository", "Repository": "CRAN", - "Hash": "8b93531308c01ad0e56d9eadcc0c4fcd", - "Requirements": [] + "Requirements": [ + "R", + "utils" + ], + "Hash": "709d852d33178db54b17c722e5b1e594" }, "purrr": { "Package": "purrr", - "Version": "0.3.4", + "Version": "1.0.1", "Source": "Repository", "Repository": "CRAN", - "Hash": "97def703420c8ab10d8f0e6c72101e02", "Requirements": [ + "R", + "cli", + "lifecycle", "magrittr", - "rlang" - ] + "rlang", + "vctrs" + ], + "Hash": "d71c815267c640f17ddbf7f16144b4bb" }, "ragg": { "Package": "ragg", - "Version": "1.2.2", + "Version": "1.2.5", "Source": "Repository", "Repository": "CRAN", - "Hash": "14932bb6f2739c771ca4ceaba6b4248e", "Requirements": [ "systemfonts", "textshaping" - ] + ], + "Hash": "690bc058ea2b1b8a407d3cfe3dce3ef9" }, "rappdirs": { "Package": "rappdirs", "Version": "0.3.3", "Source": "Repository", "Repository": "CRAN", - "Hash": "5e3c5dc0b071b21fa128676560dbe94d", - "Requirements": [] + "Requirements": [ + "R" + ], + "Hash": "5e3c5dc0b071b21fa128676560dbe94d" }, "rcmdcheck": { "Package": "rcmdcheck", "Version": "1.4.0", "Source": "Repository", "Repository": "CRAN", - "Hash": "8f25ebe2ec38b1f2aef3b0d2ef76f6c4", "Requirements": [ "R6", "callr", @@ -929,121 +1113,143 @@ "prettyunits", "rprojroot", "sessioninfo", + "utils", "withr", "xopen" - ] + ], + "Hash": "8f25ebe2ec38b1f2aef3b0d2ef76f6c4" }, "rematch2": { "Package": "rematch2", "Version": "2.1.2", "Source": "Repository", "Repository": "CRAN", - "Hash": "76c9e04c712a05848ae7a23d2f170a40", "Requirements": [ "tibble" - ] + ], + "Hash": "76c9e04c712a05848ae7a23d2f170a40" }, "remotes": { "Package": "remotes", "Version": "2.4.2", "Source": "Repository", "Repository": "CRAN", - "Hash": "227045be9aee47e6dda9bb38ac870d67", - "Requirements": [] + "Requirements": [ + "R", + "methods", + "stats", + "tools", + "utils" + ], + "Hash": "227045be9aee47e6dda9bb38ac870d67" }, "renv": { "Package": "renv", - "Version": "0.15.5", + "Version": "0.17.3", "Source": "Repository", "Repository": "CRAN", - "Hash": "6a38294e7d12f5d8e656b08c5bd8ae34", - "Requirements": [] + "Requirements": [ + "utils" + ], + "Hash": "4543b8cd233ae25c6aba8548be9e747e" }, "rlang": { "Package": "rlang", - "Version": "1.0.5", + "Version": "1.1.3", "Source": "Repository", - "Repository": "CRAN", - "Hash": "971c3d698fc06dabdac6bc4bcda72dc4", - "Requirements": [] + "Repository": "RSPM", + "Requirements": [ + "R", + "utils" + ], + "Hash": "42548638fae05fd9a9b5f3f437fbbbe2" }, "rmarkdown": { "Package": "rmarkdown", - "Version": "2.16", + "Version": "2.23", "Source": "Repository", "Repository": "CRAN", - "Hash": "0f3eaa1547e2c6880d4de1c043ac6826", "Requirements": [ + "R", "bslib", "evaluate", + "fontawesome", "htmltools", "jquerylib", "jsonlite", "knitr", + "methods", "stringr", "tinytex", + "tools", + "utils", "xfun", "yaml" - ] + ], + "Hash": "79f14e53725f28900d936f692bfdd69f" }, "roxygen2": { "Package": "roxygen2", - "Version": "7.2.1", + "Version": "7.2.3", "Source": "Repository", "Repository": "CRAN", - "Hash": "da1f278262e563c835345872f2fef537", "Requirements": [ + "R", "R6", "brew", "cli", "commonmark", "cpp11", "desc", - "digest", "knitr", + "methods", "pkgload", "purrr", "rlang", "stringi", "stringr", + "utils", "withr", "xml2" - ] + ], + "Hash": "7b153c746193b143c14baa072bae4e27" }, "rprojroot": { "Package": "rprojroot", "Version": "2.0.3", "Source": "Repository", "Repository": "CRAN", - "Hash": "1de7ab598047a87bba48434ba35d497d", - "Requirements": [] + "Requirements": [ + "R" + ], + "Hash": "1de7ab598047a87bba48434ba35d497d" }, "rstudioapi": { "Package": "rstudioapi", "Version": "0.14", "Source": "Repository", "Repository": "CRAN", - "Hash": "690bd2acc42a9166ce34845884459320", - "Requirements": [] + "Hash": "690bd2acc42a9166ce34845884459320" }, "rversions": { "Package": "rversions", "Version": "2.1.2", "Source": "Repository", "Repository": "CRAN", - "Hash": "a9881dfed103e83f9de151dc17002cd1", "Requirements": [ "curl", + "utils", "xml2" - ] + ], + "Hash": "a9881dfed103e83f9de151dc17002cd1" }, "rvest": { "Package": "rvest", "Version": "1.0.3", "Source": "Repository", "Repository": "CRAN", - "Hash": "a4a5ac819a467808c60e36e92ddf195e", "Requirements": [ + "R", "cli", "glue", "httr", @@ -1054,67 +1260,76 @@ "tibble", "withr", "xml2" - ] + ], + "Hash": "a4a5ac819a467808c60e36e92ddf195e" }, "sass": { "Package": "sass", - "Version": "0.4.2", + "Version": "0.4.6", "Source": "Repository", "Repository": "CRAN", - "Hash": "1b191143d7d3444d504277843f3a95fe", "Requirements": [ "R6", "fs", "htmltools", "rappdirs", "rlang" - ] + ], + "Hash": "cc3ec7dd33982ef56570229b62d6388e" }, "scales": { "Package": "scales", - "Version": "1.2.1", + "Version": "1.3.0", "Source": "Repository", "Repository": "CRAN", - "Hash": "906cb23d2f1c5680b8ce439b44c6fa63", "Requirements": [ + "R", "R6", "RColorBrewer", + "cli", "farver", + "glue", "labeling", "lifecycle", "munsell", "rlang", "viridisLite" - ] + ], + "Hash": "c19df082ba346b0ffa6f833e92de34d1" }, "selectr": { "Package": "selectr", "Version": "0.4-2", "Source": "Repository", "Repository": "CRAN", - "Hash": "3838071b66e0c566d55cc26bd6e27bf4", "Requirements": [ + "R", "R6", + "methods", "stringr" - ] + ], + "Hash": "3838071b66e0c566d55cc26bd6e27bf4" }, "sessioninfo": { "Package": "sessioninfo", "Version": "1.2.2", "Source": "Repository", "Repository": "CRAN", - "Hash": "3f9796a8d0a0e8c6eb49a4b029359d1f", "Requirements": [ - "cli" - ] + "R", + "cli", + "tools", + "utils" + ], + "Hash": "3f9796a8d0a0e8c6eb49a4b029359d1f" }, "shiny": { "Package": "shiny", - "Version": "1.7.2", + "Version": "1.7.4.1", "Source": "Repository", "Repository": "CRAN", - "Hash": "4f7970a3edb0a153ac6b376785a1944a", "Requirements": [ + "R", "R6", "bslib", "cachem", @@ -1124,106 +1339,123 @@ "fastmap", "fontawesome", "glue", + "grDevices", "htmltools", "httpuv", "jsonlite", "later", "lifecycle", + "methods", "mime", "promises", "rlang", "sourcetools", + "tools", + "utils", "withr", "xtable" - ] + ], + "Hash": "f7f201522eedbc95f10ef323b100ff29" }, "showtext": { "Package": "showtext", - "Version": "0.9-5", + "Version": "0.9-6", "Source": "Repository", "Repository": "CRAN", - "Hash": "b588dee88e238bf811e27f12edee9433", "Requirements": [ + "grDevices", "showtextdb", "sysfonts" - ] + ], + "Hash": "c0fd332d248b195bbcb94a0dfda37b0d" }, "showtextdb": { "Package": "showtextdb", "Version": "3.0", "Source": "Repository", "Repository": "CRAN", - "Hash": "c12e756cf947e58b0f2c2a520521a5a8", "Requirements": [ - "sysfonts" - ] + "sysfonts", + "utils" + ], + "Hash": "c12e756cf947e58b0f2c2a520521a5a8" }, "sourcetools": { "Package": "sourcetools", - "Version": "0.1.7", + "Version": "0.1.7-1", "Source": "Repository", "Repository": "CRAN", - "Hash": "947e4e02a79effa5d512473e10f41797", - "Requirements": [] + "Requirements": [ + "R" + ], + "Hash": "5f5a7629f956619d519205ec475fe647" }, "stringi": { "Package": "stringi", - "Version": "1.7.8", + "Version": "1.8.3", "Source": "Repository", - "Repository": "CRAN", - "Hash": "a68b980681bcbc84c7a67003fa796bfb", - "Requirements": [] + "Repository": "RSPM", + "Requirements": [ + "R", + "stats", + "tools", + "utils" + ], + "Hash": "058aebddea264f4c99401515182e656a" }, "stringr": { "Package": "stringr", - "Version": "1.4.1", + "Version": "1.5.1", "Source": "Repository", - "Repository": "CRAN", - "Hash": "a66ad12140cd34d4f9dfcc19e84fc2a5", + "Repository": "RSPM", "Requirements": [ + "R", + "cli", "glue", + "lifecycle", "magrittr", - "stringi" - ] + "rlang", + "stringi", + "vctrs" + ], + "Hash": "960e2ae9e09656611e0b8214ad543207" }, "sys": { "Package": "sys", - "Version": "3.4", + "Version": "3.4.2", "Source": "Repository", "Repository": "CRAN", - "Hash": "b227d13e29222b4574486cfcbde077fa", - "Requirements": [] + "Hash": "3a1be13d68d47a8cd0bfd74739ca1555" }, "sysfonts": { "Package": "sysfonts", "Version": "0.8.8", "Source": "Repository", "Repository": "CRAN", - "Hash": "7f4dac41a3e348ae12832167e6beb875", - "Requirements": [] + "Hash": "7f4dac41a3e348ae12832167e6beb875" }, "systemfonts": { "Package": "systemfonts", "Version": "1.0.4", "Source": "Repository", "Repository": "CRAN", - "Hash": "90b28393209827327de889f49935140a", "Requirements": [ + "R", "cpp11" - ] + ], + "Hash": "90b28393209827327de889f49935140a" }, "testthat": { "Package": "testthat", - "Version": "3.1.4", + "Version": "3.1.10", "Source": "Repository", "Repository": "CRAN", - "Hash": "f76c2a02d0fdc24aa7a47ea34261a6e3", "Requirements": [ + "R", "R6", "brio", "callr", "cli", - "crayon", "desc", "digest", "ellipsis", @@ -1231,71 +1463,80 @@ "jsonlite", "lifecycle", "magrittr", + "methods", "pkgload", "praise", "processx", "ps", "rlang", + "utils", "waldo", "withr" - ] + ], + "Hash": "6f403dc49295610a3a67ea1a9ca64346" }, "textshaping": { "Package": "textshaping", "Version": "0.3.6", "Source": "Repository", "Repository": "CRAN", - "Hash": "1ab6223d3670fac7143202cb6a2d43d5", "Requirements": [ + "R", "cpp11", "systemfonts" - ] + ], + "Hash": "1ab6223d3670fac7143202cb6a2d43d5" }, "tibble": { "Package": "tibble", - "Version": "3.1.8", + "Version": "3.2.1", "Source": "Repository", "Repository": "CRAN", - "Hash": "56b6934ef0f8c68225949a8672fe1a8f", "Requirements": [ + "R", "fansi", "lifecycle", "magrittr", + "methods", "pillar", "pkgconfig", "rlang", + "utils", "vctrs" - ] + ], + "Hash": "a84e2cc86d07289b3b6f5069df7a004c" }, "tinytex": { "Package": "tinytex", - "Version": "0.41", + "Version": "0.45", "Source": "Repository", "Repository": "CRAN", - "Hash": "6edfe5df6431a724b4254c0591e34ab3", "Requirements": [ "xfun" - ] + ], + "Hash": "e4e357f28c2edff493936b6cb30c3d65" }, "urlchecker": { "Package": "urlchecker", "Version": "1.0.1", "Source": "Repository", "Repository": "CRAN", - "Hash": "409328b8e1253c8d729a7836fe7f7a16", "Requirements": [ + "R", "cli", "curl", + "tools", "xml2" - ] + ], + "Hash": "409328b8e1253c8d729a7836fe7f7a16" }, "usethis": { "Package": "usethis", - "Version": "2.1.6", + "Version": "2.2.0", "Source": "Repository", "Repository": "CRAN", - "Hash": "a67a22c201832b12c036cc059f1d137d", "Requirements": [ + "R", "cli", "clipr", "crayon", @@ -1312,128 +1553,161 @@ "rlang", "rprojroot", "rstudioapi", + "stats", + "utils", "whisker", "withr", "yaml" - ] + ], + "Hash": "a108160a30d25e9aca3444a130dd53d9" }, "utf8": { "Package": "utf8", - "Version": "1.2.2", + "Version": "1.2.4", "Source": "Repository", - "Repository": "CRAN", - "Hash": "c9c462b759a5cc844ae25b5942654d13", - "Requirements": [] + "Repository": "RSPM", + "Requirements": [ + "R" + ], + "Hash": "62b65c52671e6665f803ff02954446e9" }, "vctrs": { "Package": "vctrs", - "Version": "0.4.1", + "Version": "0.6.5", "Source": "Repository", - "Repository": "CRAN", - "Hash": "8b54f22e2a58c4f275479c92ce041a57", + "Repository": "RSPM", "Requirements": [ + "R", "cli", "glue", + "lifecycle", "rlang" - ] + ], + "Hash": "c03fa420630029418f7e6da3667aac4a" }, "viridisLite": { "Package": "viridisLite", - "Version": "0.4.1", + "Version": "0.4.2", "Source": "Repository", "Repository": "CRAN", - "Hash": "62f4b5da3e08d8e5bcba6cac15603f70", - "Requirements": [] + "Requirements": [ + "R" + ], + "Hash": "c826c7c4241b6fc89ff55aaea3fa7491" }, "waldo": { "Package": "waldo", - "Version": "0.4.0", + "Version": "0.5.1", "Source": "Repository", "Repository": "CRAN", - "Hash": "035fba89d0c86e2113120f93301b98ad", "Requirements": [ "cli", "diffobj", "fansi", "glue", + "methods", "rematch2", "rlang", "tibble" - ] + ], + "Hash": "2c993415154cdb94649d99ae138ff5e5" }, "whisker": { "Package": "whisker", - "Version": "0.4", + "Version": "0.4.1", "Source": "Repository", "Repository": "CRAN", - "Hash": "ca970b96d894e90397ed20637a0c1bbe", - "Requirements": [] + "Hash": "c6abfa47a46d281a7d5159d0a8891e88" }, "withr": { "Package": "withr", - "Version": "2.5.0", + "Version": "3.0.0", "Source": "Repository", - "Repository": "CRAN", - "Hash": "c0e49a9760983e81e55cdd9be92e7182", - "Requirements": [] + "Repository": "RSPM", + "Requirements": [ + "R", + "grDevices", + "graphics" + ], + "Hash": "d31b6c62c10dcf11ec530ca6b0dd5d35" }, "xfun": { "Package": "xfun", - "Version": "0.32", + "Version": "0.39", "Source": "Repository", "Repository": "CRAN", - "Hash": "0498af3034691dde715dcd86198efe75", - "Requirements": [] + "Requirements": [ + "stats", + "tools" + ], + "Hash": "8f56e9acb54fb525e66464d57ab58bcb" }, "xml2": { "Package": "xml2", - "Version": "1.3.3", + "Version": "1.3.6", "Source": "Repository", - "Repository": "CRAN", - "Hash": "40682ed6a969ea5abfd351eb67833adc", - "Requirements": [] + "Repository": "RSPM", + "Requirements": [ + "R", + "cli", + "methods", + "rlang" + ], + "Hash": "1d0336142f4cd25d8d23cd3ba7a8fb61" }, "xopen": { "Package": "xopen", "Version": "1.0.0", "Source": "Repository", "Repository": "CRAN", - "Hash": "6c85f015dee9cc7710ddd20f86881f58", "Requirements": [ + "R", "processx" - ] + ], + "Hash": "6c85f015dee9cc7710ddd20f86881f58" }, "xtable": { "Package": "xtable", "Version": "1.8-4", "Source": "Repository", "Repository": "CRAN", - "Hash": "b8acdf8af494d9ec19ccb2481a9b11c2", - "Requirements": [] + "Requirements": [ + "R", + "stats", + "utils" + ], + "Hash": "b8acdf8af494d9ec19ccb2481a9b11c2" }, "yaml": { "Package": "yaml", - "Version": "2.3.5", + "Version": "2.3.8", "Source": "Repository", - "Repository": "CRAN", - "Hash": "458bb38374d73bf83b1bb85e353da200", - "Requirements": [] + "Repository": "RSPM", + "Hash": "29240487a071f535f5e5d5a323b7afbd" }, "yulab.utils": { "Package": "yulab.utils", - "Version": "0.0.5", + "Version": "0.1.4", "Source": "Repository", "Repository": "CRAN", - "Hash": "5727ef3682ea54af05114ef993b99812", - "Requirements": [] + "Requirements": [ + "cli", + "digest", + "fs", + "memoise", + "rlang", + "stats", + "tools", + "utils" + ], + "Hash": "60ee2aaa179dc282e9fa7367bad76e89" }, "zip": { "Package": "zip", - "Version": "2.2.0", + "Version": "2.3.0", "Source": "Repository", "Repository": "CRAN", - "Hash": "c7eef2996ac270a18c2715c997a727c5", - "Requirements": [] + "Hash": "d98c94dacb7e0efcf83b0a133a705504" } } } diff --git a/renv/.gitignore b/renv/.gitignore index 275e4ca..0ec0cbb 100644 --- a/renv/.gitignore +++ b/renv/.gitignore @@ -3,4 +3,5 @@ local/ cellar/ lock/ python/ +sandbox/ staging/ diff --git a/renv/activate.R b/renv/activate.R index 72c0818..a8fdc32 100644 --- a/renv/activate.R +++ b/renv/activate.R @@ -2,7 +2,7 @@ local({ # the requested version of renv - version <- "0.15.5" + 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,28 +87,39 @@ 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)) return(repos) # if we're testing, re-use the test repositories - if (renv_bootstrap_tests_running()) - return(getOption("renv.tests.repos")) + if (renv_bootstrap_tests_running()) { + repos <- getOption("renv.tests.repos") + if (!is.null(repos)) + return(repos) + } # retrieve current repos 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") @@ -185,43 +200,80 @@ local({ if (fixup) mode <- "w+b" - utils::download.file( + args <- list( url = url, destfile = destfile, mode = mode, quiet = TRUE ) + if ("headers" %in% names(formals(utils::download.file))) + args$headers <- renv_bootstrap_download_custom_headers(url) + + do.call(utils::download.file, args) + + } + + renv_bootstrap_download_custom_headers <- function(url) { + + headers <- getOption("renv.download.headers") + if (is.null(headers)) + return(character()) + + if (!is.function(headers)) + stopf("'renv.download.headers' is not a function") + + headers <- headers(url) + if (length(headers) == 0L) + return(character()) + + if (is.list(headers)) + headers <- unlist(headers, recursive = FALSE, use.names = TRUE) + + ok <- + is.character(headers) && + is.character(names(headers)) && + all(nzchar(names(headers))) + + if (!ok) + stop("invocation of 'renv.download.headers' did not return a named character vector") + + headers + } renv_bootstrap_download_cran_latest <- function(version) { spec <- renv_bootstrap_download_cran_latest_find(version) + type <- spec$type + repos <- spec$repos message("* Downloading renv ", version, " ... ", appendLF = FALSE) - type <- spec$type - repos <- spec$repos + baseurl <- utils::contrib.url(repos = repos, type = type) + ext <- if (identical(type, "source")) + ".tar.gz" + else if (Sys.info()[["sysname"]] == "Windows") + ".zip" + else + ".tgz" + name <- sprintf("renv_%s%s", version, ext) + url <- paste(baseurl, name, sep = "/") - info <- tryCatch( - utils::download.packages( - pkgs = "renv", - destdir = tempdir(), - repos = repos, - type = type, - quiet = TRUE - ), + destfile <- file.path(tempdir(), name) + status <- tryCatch( + renv_bootstrap_download_impl(url, destfile), condition = identity ) - if (inherits(info, "condition")) { + if (inherits(status, "condition")) { message("FAILED") return(FALSE) } # report success and return message("OK (downloaded ", type, ")") - info[1, 2] + destfile } @@ -307,8 +359,7 @@ local({ return() # allow directories - info <- file.info(tarball, extra_cols = FALSE) - if (identical(info$isdir, TRUE)) { + if (dir.exists(tarball)) { name <- sprintf("renv_%s.tar.gz", version) tarball <- file.path(tarball, name) } @@ -622,8 +673,8 @@ local({ if (version == loadedversion) return(TRUE) - # assume four-component versions are from GitHub; three-component - # versions are from CRAN + # assume four-component versions are from GitHub; + # three-component versions are from CRAN components <- strsplit(loadedversion, "[.-]")[[1]] remote <- if (length(components) == 4L) paste("rstudio/renv", loadedversion, sep = "@") @@ -663,6 +714,12 @@ local({ # warn if the version of renv loaded does not match renv_bootstrap_validate_version(version) + # execute renv load hooks, if any + hooks <- getHook("renv::autoload") + for (hook in hooks) + if (is.function(hook)) + tryCatch(hook(), error = warning) + # load the project renv::load(project) @@ -678,7 +735,7 @@ local({ return(profile) # check for a profile file (nothing to do if it doesn't exist) - path <- renv_bootstrap_paths_renv("profile", profile = FALSE) + path <- renv_bootstrap_paths_renv("profile", profile = FALSE, project = project) if (!file.exists(path)) return(NULL) @@ -805,9 +862,41 @@ local({ renv_json_read <- function(file = NULL, text = NULL) { + jlerr <- NULL + + # if jsonlite is loaded, use that instead + if ("jsonlite" %in% loadedNamespaces()) { + + json <- catch(renv_json_read_jsonlite(file, text)) + if (!inherits(json, "error")) + return(json) + + jlerr <- json + + } + + # otherwise, fall back to the default JSON reader + json <- catch(renv_json_read_default(file, text)) + if (!inherits(json, "error")) + return(json) + + # report an error + if (!is.null(jlerr)) + stop(jlerr) + else + stop(json) + + } + + renv_json_read_jsonlite <- function(file = NULL, text = NULL) { text <- paste(text %||% read(file), collapse = "\n") + jsonlite::fromJSON(txt = text, simplifyVector = FALSE) + } + + renv_json_read_default <- function(file = NULL, text = NULL) { # find strings in the JSON + text <- paste(text %||% read(file), collapse = "\n") pattern <- '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]' locs <- gregexpr(pattern, text, perl = TRUE)[[1]] @@ -838,8 +927,9 @@ local({ # transform the JSON into something the R parser understands transformed <- replaced - transformed <- gsub("[[{]", "list(", transformed) - transformed <- gsub("[]}]", ")", transformed) + transformed <- gsub("{}", "`names<-`(list(), character())", transformed, fixed = TRUE) + transformed <- gsub("[[{]", "list(", transformed, perl = TRUE) + transformed <- gsub("[]}]", ")", transformed, perl = TRUE) transformed <- gsub(":", "=", transformed, fixed = TRUE) text <- paste(transformed, collapse = "\n") diff --git a/renv/settings.dcf b/renv/settings.dcf deleted file mode 100644 index 169d82f..0000000 --- a/renv/settings.dcf +++ /dev/null @@ -1,10 +0,0 @@ -bioconductor.version: -external.libraries: -ignored.packages: -package.dependency.fields: Imports, Depends, LinkingTo -r.version: -snapshot.type: implicit -use.cache: TRUE -vcs.ignore.cellar: TRUE -vcs.ignore.library: TRUE -vcs.ignore.local: TRUE diff --git a/renv/settings.json b/renv/settings.json new file mode 100644 index 0000000..1a06760 --- /dev/null +++ b/renv/settings.json @@ -0,0 +1,17 @@ +{ + "bioconductor.version": null, + "external.libraries": [], + "ignored.packages": [], + "package.dependency.fields": [ + "Imports", + "Depends", + "LinkingTo" + ], + "r.version": null, + "snapshot.type": "implicit", + "use.cache": true, + "vcs.ignore.cellar": true, + "vcs.ignore.library": true, + "vcs.ignore.local": true, + "vcs.manage.ignores": true +}