diff --git a/renv.lock b/renv.lock index d3d01e1..81fea56 100644 --- a/renv.lock +++ b/renv.lock @@ -1,6 +1,6 @@ { "R": { - "Version": "4.2.0", + "Version": "4.4.0", "Repositories": [ { "Name": "rpsm", @@ -11,39 +11,57 @@ "Packages": { "DBI": { "Package": "DBI", - "Version": "1.1.2", + "Version": "1.2.3", "Source": "Repository", - "Repository": "RSPM", - "Hash": "dcd1743af4336156873e3ce3c950b8b9", - "Requirements": [] + "Repository": "CRAN", + "Requirements": [ + "R", + "methods" + ], + "Hash": "065ae649b05f1ff66bb0c793107508f5" }, "MASS": { "Package": "MASS", - "Version": "7.3-56", + "Version": "7.3-61", "Source": "Repository", "Repository": "CRAN", - "Hash": "af0e1955cb80bb36b7988cc657db261e", - "Requirements": [] + "Requirements": [ + "R", + "grDevices", + "graphics", + "methods", + "stats", + "utils" + ], + "Hash": "0cafd6f0500e5deba33be22c46bf6055" }, "Matrix": { "Package": "Matrix", - "Version": "1.4-1", + "Version": "1.7-0", "Source": "Repository", "Repository": "CRAN", - "Hash": "699c47c606293bdfbc9fd78a93c9c8fe", "Requirements": [ - "lattice" - ] + "R", + "grDevices", + "graphics", + "grid", + "lattice", + "methods", + "stats", + "utils" + ], + "Hash": "1920b2f11133b12350024297d8a4ff4a" }, "NHSRdatasets": { "Package": "NHSRdatasets", "Version": "0.3.0", "Source": "Repository", - "Repository": "RSPM", - "Hash": "02c9417179975a83e37329f40c451591", + "Repository": "CRAN", "Requirements": [ + "R", "tibble" - ] + ], + "Hash": "02c9417179975a83e37329f40c451591" }, "NHSRtheme": { "Package": "NHSRtheme", @@ -51,440 +69,549 @@ "Source": "GitHub", "RemoteType": "github", "RemoteHost": "api.github.com", + "RemoteRepo": "NHSRtheme", "RemoteUsername": "nhs-r-community", - "RemoteRepo": "nhsrtheme", - "RemoteRef": "main", - "RemoteSha": "6d2c3c8245c84b680a9de831d44090e2b40032ad", - "Hash": "3a487a3260e26bfebf0351854c94a6ac", + "RemoteRef": "HEAD", + "RemoteSha": "48293555b209d40fc675a7d6a37aa51b06b4e12d", "Requirements": [ "dplyr", "ggplot2", "purrr", "scales", "xaringan" - ] + ], + "Hash": "8cae70100e0cf6e9829f5f6290daa657" }, "R6": { "Package": "R6", "Version": "2.5.1", "Source": "Repository", - "Repository": "RSPM", - "Hash": "470851b6d5d0ac559e9d01bb352b4021", - "Requirements": [] + "Repository": "CRAN", + "Requirements": [ + "R" + ], + "Hash": "470851b6d5d0ac559e9d01bb352b4021" }, "RColorBrewer": { "Package": "RColorBrewer", "Version": "1.1-3", "Source": "Repository", - "Repository": "RSPM", - "Hash": "45f0398006e83a5b10b72a90663d8d8c", - "Requirements": [] + "Repository": "CRAN", + "Requirements": [ + "R" + ], + "Hash": "45f0398006e83a5b10b72a90663d8d8c" }, "RSQLite": { "Package": "RSQLite", - "Version": "2.2.12", - "Source": "Repository", - "Repository": "RSPM", - "Hash": "4bfe20c70c3db354b60adf76e10fc7f6", + "Version": "2.3.7.9013", + "Source": "GitHub", + "RemoteType": "github", + "RemoteHost": "api.github.com", + "RemoteRepo": "RSQLite", + "RemoteUsername": "r-dbi", + "RemoteRef": "HEAD", + "RemoteSha": "fae813b078000a21595bfafcc87773c631d26738", "Requirements": [ "DBI", - "Rcpp", + "R", "bit64", "blob", + "cpp11", "memoise", + "methods", "pkgconfig", - "plogr" - ] + "plogr", + "rlang" + ], + "Hash": "feef9841c35252dd5f243221301751e1" }, "Rcpp": { "Package": "Rcpp", - "Version": "1.0.8.3", + "Version": "1.0.13", "Source": "Repository", - "Repository": "RSPM", - "Hash": "32e79b908fda56ee57fe518a8d37b864", - "Requirements": [] + "Repository": "CRAN", + "Requirements": [ + "methods", + "utils" + ], + "Hash": "f27411eb6d9c3dada5edd444b8416675" }, "askpass": { "Package": "askpass", - "Version": "1.1", + "Version": "1.2.0", "Source": "Repository", - "Repository": "RSPM", - "Hash": "e8a22846fff485f0be3770c2da758713", + "Repository": "CRAN", "Requirements": [ "sys" - ] - }, - "assertthat": { - "Package": "assertthat", - "Version": "0.2.1", - "Source": "Repository", - "Repository": "RSPM", - "Hash": "50c838a310445e954bc13f26f26a6ecf", - "Requirements": [] + ], + "Hash": "cad6cf7f1d5f6e906700b9d3e718c796" }, "backports": { "Package": "backports", - "Version": "1.4.1", + "Version": "1.5.0", "Source": "Repository", - "Repository": "RSPM", - "Hash": "c39fbec8a30d23e721980b8afb31984c", - "Requirements": [] + "Repository": "CRAN", + "Requirements": [ + "R" + ], + "Hash": "e1e1b9d75c37401117b636b7ae50827a" }, "base64enc": { "Package": "base64enc", "Version": "0.1-3", "Source": "Repository", - "Repository": "RSPM", - "Hash": "543776ae6848fde2f48ff3816d0628bc", - "Requirements": [] + "Repository": "CRAN", + "Requirements": [ + "R" + ], + "Hash": "543776ae6848fde2f48ff3816d0628bc" }, "bit": { "Package": "bit", - "Version": "4.0.4", + "Version": "4.0.5", "Source": "Repository", - "Repository": "RSPM", - "Hash": "f36715f14d94678eea9933af927bc15d", - "Requirements": [] + "Repository": "CRAN", + "Requirements": [ + "R" + ], + "Hash": "d242abec29412ce988848d0294b208fd" }, "bit64": { "Package": "bit64", "Version": "4.0.5", "Source": "Repository", - "Repository": "RSPM", - "Hash": "9fe98599ca456d6552421db0d6772d8f", + "Repository": "CRAN", "Requirements": [ - "bit" - ] + "R", + "bit", + "methods", + "stats", + "utils" + ], + "Hash": "9fe98599ca456d6552421db0d6772d8f" }, "blob": { "Package": "blob", - "Version": "1.2.3", + "Version": "1.2.4", "Source": "Repository", - "Repository": "RSPM", - "Hash": "10d231579bc9c06ab1c320618808d4ff", + "Repository": "CRAN", "Requirements": [ + "methods", "rlang", "vctrs" - ] + ], + "Hash": "40415719b5a479b87949f3aa0aee737c" }, "broom": { "Package": "broom", - "Version": "0.8.0", + "Version": "1.0.6", "Source": "Repository", - "Repository": "RSPM", - "Hash": "fe13cb670e14da57fd7a466578db8ce5", + "Repository": "CRAN", "Requirements": [ + "R", "backports", "dplyr", - "ellipsis", "generics", - "ggplot2", "glue", + "lifecycle", "purrr", "rlang", "stringr", "tibble", "tidyr" - ] + ], + "Hash": "a4652c36d1f8abfc3ddf4774f768c934" }, "bslib": { "Package": "bslib", - "Version": "0.3.1", + "Version": "0.8.0", "Source": "Repository", - "Repository": "RSPM", - "Hash": "56ae7e1987b340186a8a5a157c2ec358", + "Repository": "CRAN", "Requirements": [ + "R", + "base64enc", + "cachem", + "fastmap", + "grDevices", "htmltools", "jquerylib", "jsonlite", + "lifecycle", + "memoise", + "mime", "rlang", "sass" - ] + ], + "Hash": "b299c6741ca9746fb227debcb0f9fb6c" }, "cachem": { "Package": "cachem", - "Version": "1.0.6", + "Version": "1.1.0", "Source": "Repository", - "Repository": "RSPM", - "Hash": "648c5b3d71e6a37e3043617489a0a0e9", + "Repository": "CRAN", "Requirements": [ "fastmap", "rlang" - ] + ], + "Hash": "cd9a672193789068eb5a2aad65a0dedf" }, "callr": { "Package": "callr", - "Version": "3.7.0", + "Version": "3.7.6", "Source": "Repository", - "Repository": "RSPM", - "Hash": "461aa75a11ce2400245190ef5d3995df", + "Repository": "CRAN", "Requirements": [ + "R", "R6", - "processx" - ] + "processx", + "utils" + ], + "Hash": "d7e13f49c19103ece9e58ad2d83a7354" }, "cellranger": { "Package": "cellranger", "Version": "1.1.0", "Source": "Repository", - "Repository": "RSPM", - "Hash": "f61dbaec772ccd2e17705c1e872e9e7c", + "Repository": "CRAN", "Requirements": [ + "R", "rematch", "tibble" - ] + ], + "Hash": "f61dbaec772ccd2e17705c1e872e9e7c" }, "cli": { "Package": "cli", - "Version": "3.3.0", + "Version": "3.6.3", "Source": "Repository", - "Repository": "RSPM", - "Hash": "23abf173c2b783dcc43379ab9bba00ee", + "Repository": "CRAN", "Requirements": [ - "glue" - ] + "R", + "utils" + ], + "Hash": "b21916dd77a27642b447374a5d30ecf3" }, "clipr": { "Package": "clipr", "Version": "0.8.0", "Source": "Repository", - "Repository": "RSPM", - "Hash": "3f038e5ac7f41d4ac41ce658c85e3042", - "Requirements": [] + "Repository": "CRAN", + "Requirements": [ + "utils" + ], + "Hash": "3f038e5ac7f41d4ac41ce658c85e3042" }, "colorspace": { "Package": "colorspace", - "Version": "2.0-3", + "Version": "2.1-1", "Source": "Repository", - "Repository": "RSPM", - "Hash": "bb4341986bc8b914f0f0acf2e4a3f2f7", - "Requirements": [] + "Repository": "CRAN", + "Requirements": [ + "R", + "grDevices", + "graphics", + "methods", + "stats" + ], + "Hash": "d954cb1c57e8d8b756165d7ba18aa55a" + }, + "commonmark": { + "Package": "commonmark", + "Version": "1.9.1", + "Source": "Repository", + "Repository": "CRAN", + "Hash": "5d8225445acb167abf7797de48b2ee3c" + }, + "conflicted": { + "Package": "conflicted", + "Version": "1.2.0", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "cli", + "memoise", + "rlang" + ], + "Hash": "bb097fccb22d156624fd07cd2894ddb6" }, "cpp11": { "Package": "cpp11", - "Version": "0.4.2", + "Version": "0.5.0", "Source": "Repository", "Repository": "RSPM", - "Hash": "fa53ce256cd280f468c080a58ea5ba8c", - "Requirements": [] + "Requirements": [ + "R" + ], + "Hash": "91570bba75d0c9d3f1040c835cee8fba" }, "crayon": { "Package": "crayon", - "Version": "1.5.1", + "Version": "1.5.3", "Source": "Repository", - "Repository": "RSPM", - "Hash": "8dc45fd8a1ee067a92b85ef274e66d6a", - "Requirements": [] + "Repository": "CRAN", + "Requirements": [ + "grDevices", + "methods", + "utils" + ], + "Hash": "859d96e65ef198fd43e82b9628d593ef" }, "curl": { "Package": "curl", - "Version": "4.3.2", + "Version": "5.2.2", "Source": "Repository", "Repository": "RSPM", - "Hash": "022c42d49c28e95d69ca60446dbabf88", - "Requirements": [] + "Requirements": [ + "R" + ], + "Hash": "8f27335f2bcff4d6035edcc82d7d46de" }, "data.table": { "Package": "data.table", - "Version": "1.14.2", + "Version": "1.15.4", "Source": "Repository", - "Repository": "RSPM", - "Hash": "36b67b5adf57b292923f5659f5f0c853", - "Requirements": [] + "Repository": "CRAN", + "Requirements": [ + "R", + "methods" + ], + "Hash": "8ee9ac56ef633d0c7cab8b2ca87d683e" }, "dbplyr": { "Package": "dbplyr", - "Version": "2.1.1", + "Version": "2.5.0", "Source": "Repository", - "Repository": "RSPM", - "Hash": "1f37fa4ab2f5f7eded42f78b9a887182", + "Repository": "CRAN", "Requirements": [ "DBI", + "R", "R6", - "assertthat", "blob", + "cli", "dplyr", - "ellipsis", "glue", "lifecycle", "magrittr", + "methods", + "pillar", "purrr", "rlang", "tibble", + "tidyr", "tidyselect", + "utils", "vctrs", "withr" - ] + ], + "Hash": "39b2e002522bfd258039ee4e889e0fd1" }, "digest": { "Package": "digest", - "Version": "0.6.29", + "Version": "0.6.37", "Source": "Repository", "Repository": "RSPM", - "Hash": "cf6b206a045a684728c3267ef7596190", - "Requirements": [] + "Requirements": [ + "R", + "utils" + ], + "Hash": "33698c4b3127fc9f506654607fb73676" }, "dplyr": { "Package": "dplyr", - "Version": "1.0.9", + "Version": "1.1.4", "Source": "Repository", - "Repository": "RSPM", - "Hash": "f0bda1627a7f5d3f9a0b5add931596ac", + "Repository": "CRAN", "Requirements": [ + "R", "R6", + "cli", "generics", "glue", "lifecycle", "magrittr", + "methods", "pillar", "rlang", "tibble", "tidyselect", + "utils", "vctrs" - ] + ], + "Hash": "fedd9d00c2944ff00a0e2696ccf048ec" }, "dtplyr": { "Package": "dtplyr", - "Version": "1.2.1", + "Version": "1.3.1", "Source": "Repository", - "Repository": "RSPM", - "Hash": "f5d195cd5fcc0a77499d9da698ef2ea3", + "Repository": "CRAN", "Requirements": [ - "crayon", + "R", + "cli", "data.table", "dplyr", - "ellipsis", "glue", "lifecycle", "rlang", "tibble", "tidyselect", "vctrs" - ] - }, - "ellipsis": { - "Package": "ellipsis", - "Version": "0.3.2", - "Source": "Repository", - "Repository": "RSPM", - "Hash": "bb0eec2fe32e88d9e2836c2f73ea2077", - "Requirements": [ - "rlang" - ] + ], + "Hash": "54ed3ea01b11e81a86544faaecfef8e2" }, "evaluate": { "Package": "evaluate", - "Version": "0.15", + "Version": "0.24.0", "Source": "Repository", - "Repository": "RSPM", - "Hash": "699a7a93d08c962d9f8950b2d7a227f1", - "Requirements": [] + "Repository": "CRAN", + "Requirements": [ + "R", + "methods" + ], + "Hash": "a1066cbc05caee9a4bf6d90f194ff4da" }, "fansi": { "Package": "fansi", - "Version": "1.0.3", + "Version": "1.0.6", "Source": "Repository", - "Repository": "RSPM", - "Hash": "83a8afdbe71839506baa9f90eebad7ec", - "Requirements": [] + "Repository": "CRAN", + "Requirements": [ + "R", + "grDevices", + "utils" + ], + "Hash": "962174cf2aeb5b9eea581522286a911f" }, "farver": { "Package": "farver", - "Version": "2.1.0", + "Version": "2.1.2", "Source": "Repository", "Repository": "CRAN", - "Hash": "c98eb5133d9cb9e1622b8691487f11bb", - "Requirements": [] + "Hash": "680887028577f3fa2a81e410ed0d6e42" }, "fastmap": { "Package": "fastmap", - "Version": "1.1.0", + "Version": "1.2.0", + "Source": "Repository", + "Repository": "CRAN", + "Hash": "aa5e1cd11c2d15497494c5292d7ffcc8" + }, + "fontawesome": { + "Package": "fontawesome", + "Version": "0.5.2", "Source": "Repository", "Repository": "CRAN", - "Hash": "77bd60a6157420d4ffa93b27cf6a58b8", - "Requirements": [] + "Requirements": [ + "R", + "htmltools", + "rlang" + ], + "Hash": "c2efdd5f0bcd1ea861c2d4e2a883a67d" }, "forcats": { "Package": "forcats", - "Version": "0.5.1", + "Version": "1.0.0", "Source": "Repository", - "Repository": "RSPM", - "Hash": "81c3244cab67468aac4c60550832655d", + "Repository": "CRAN", "Requirements": [ - "ellipsis", + "R", + "cli", + "glue", + "lifecycle", "magrittr", "rlang", "tibble" - ] + ], + "Hash": "1a0a9a3d5083d0d573c4214576f1e690" }, "fs": { "Package": "fs", - "Version": "1.5.2", + "Version": "1.6.4", "Source": "Repository", - "Repository": "RSPM", - "Hash": "7c89603d81793f0d5486d91ab1fc6f1d", - "Requirements": [] + "Repository": "CRAN", + "Requirements": [ + "R", + "methods" + ], + "Hash": "15aeb8c27f5ea5161f9f6a641fafd93a" }, "gargle": { "Package": "gargle", - "Version": "1.2.0", + "Version": "1.5.2", "Source": "Repository", - "Repository": "RSPM", - "Hash": "9d234e6a87a6f8181792de6dc4a00e39", + "Repository": "CRAN", "Requirements": [ + "R", "cli", "fs", "glue", "httr", "jsonlite", + "lifecycle", + "openssl", "rappdirs", "rlang", - "rstudioapi", + "stats", + "utils", "withr" - ] + ], + "Hash": "fc0b272e5847c58cd5da9b20eedbd026" }, "generics": { "Package": "generics", - "Version": "0.1.2", + "Version": "0.1.3", "Source": "Repository", - "Repository": "RSPM", - "Hash": "177475892cf4a55865868527654a7741", - "Requirements": [] + "Repository": "CRAN", + "Requirements": [ + "R", + "methods" + ], + "Hash": "15e9634c0fcd294799e9b2e929ed1b86" }, "ggplot2": { "Package": "ggplot2", - "Version": "3.3.5", + "Version": "3.5.1", "Source": "Repository", - "Repository": "RSPM", - "Hash": "d7566c471c7b17e095dd023b9ef155ad", + "Repository": "CRAN", "Requirements": [ "MASS", - "digest", + "R", + "cli", "glue", + "grDevices", + "grid", "gtable", "isoband", + "lifecycle", "mgcv", "rlang", "scales", + "stats", "tibble", + "vctrs", "withr" - ] + ], + "Hash": "44c6a2f8202d5b7e878ea274b1092426" }, "glue": { "Package": "glue", - "Version": "1.6.2", + "Version": "1.7.0", "Source": "Repository", - "Repository": "RSPM", - "Hash": "4f2596dfb05dac67b9dc558e5c6fba2e", - "Requirements": [] + "Repository": "CRAN", + "Requirements": [ + "R", + "methods" + ], + "Hash": "e0b3a53876554bd45879e596cdb10a52" }, "googledrive": { "Package": "googledrive", - "Version": "2.0.0", + "Version": "2.1.1", "Source": "Repository", - "Repository": "RSPM", - "Hash": "c3a25adbbfbb03f12e6f88c5fb1f3024", + "Repository": "CRAN", "Requirements": [ + "R", "cli", "gargle", "glue", @@ -496,18 +623,20 @@ "purrr", "rlang", "tibble", + "utils", "uuid", "vctrs", "withr" - ] + ], + "Hash": "e99641edef03e2a5e87f0a0b1fcc97f4" }, "googlesheets4": { "Package": "googlesheets4", - "Version": "1.0.0", + "Version": "1.1.1", "Source": "Repository", - "Repository": "RSPM", - "Hash": "9a6564184dc4a81daea4f1d7ce357c6a", + "Repository": "CRAN", "Requirements": [ + "R", "cellranger", "cli", "curl", @@ -516,114 +645,125 @@ "googledrive", "httr", "ids", + "lifecycle", "magrittr", + "methods", "purrr", "rematch2", "rlang", "tibble", - "vctrs" - ] + "utils", + "vctrs", + "withr" + ], + "Hash": "d6db1667059d027da730decdc214b959" }, "gtable": { "Package": "gtable", - "Version": "0.3.0", + "Version": "0.3.5", "Source": "Repository", - "Repository": "RSPM", - "Hash": "ac5c6baf7822ce8732b343f14c072c4d", - "Requirements": [] + "Repository": "CRAN", + "Requirements": [ + "R", + "cli", + "glue", + "grid", + "lifecycle", + "rlang" + ], + "Hash": "e18861963cbc65a27736e02b3cd3c4a0" }, "haven": { "Package": "haven", - "Version": "2.5.0", + "Version": "2.5.4", "Source": "Repository", - "Repository": "RSPM", - "Hash": "e3058e4ac77f4fa686f68a1838d5b715", + "Repository": "CRAN", "Requirements": [ + "R", "cli", "cpp11", "forcats", "hms", "lifecycle", + "methods", "readr", "rlang", "tibble", "tidyselect", "vctrs" - ] - }, - "here": { - "Package": "here", - "Version": "1.0.1", - "Source": "Repository", - "Repository": "RSPM", - "Hash": "24b224366f9c2e7534d2344d10d59211", - "Requirements": [ - "rprojroot" - ] + ], + "Hash": "9171f898db9d9c4c1b2c745adc2c1ef1" }, "highr": { "Package": "highr", - "Version": "0.9", + "Version": "0.11", "Source": "Repository", - "Repository": "RSPM", - "Hash": "8eb36c8125038e648e5d111c0d7b2ed4", + "Repository": "CRAN", "Requirements": [ + "R", "xfun" - ] + ], + "Hash": "d65ba49117ca223614f71b60d85b8ab7" }, "hms": { "Package": "hms", - "Version": "1.1.1", + "Version": "1.1.3", "Source": "Repository", - "Repository": "RSPM", - "Hash": "5b8a2dd0fdbe2ab4f6081e6c7be6dfca", + "Repository": "CRAN", "Requirements": [ - "ellipsis", "lifecycle", + "methods", "pkgconfig", "rlang", "vctrs" - ] + ], + "Hash": "b59377caa7ed00fa41808342002138f9" }, "htmltools": { "Package": "htmltools", - "Version": "0.5.2", + "Version": "0.5.8.1", "Source": "Repository", - "Repository": "RSPM", - "Hash": "526c484233f42522278ab06fb185cb26", + "Repository": "CRAN", "Requirements": [ + "R", "base64enc", "digest", "fastmap", - "rlang" - ] + "grDevices", + "rlang", + "utils" + ], + "Hash": "81d371a9cc60640e74e4ab6ac46dcedc" }, "httpuv": { "Package": "httpuv", - "Version": "1.6.5", + "Version": "1.6.15", "Source": "Repository", - "Repository": "RSPM", - "Hash": "97fe71f0a4a1c9890e6c2128afa04bc0", + "Repository": "CRAN", "Requirements": [ + "R", "R6", "Rcpp", "later", - "promises" - ] + "promises", + "utils" + ], + "Hash": "d55aa087c47a63ead0f6fc10f8fa1ee0" }, "httr": { "Package": "httr", - "Version": "1.4.2", + "Version": "1.4.7", "Source": "Repository", - "Repository": "RSPM", - "Hash": "a525aba14184fec243f9eaec62fbed43", + "Repository": "CRAN", "Requirements": [ + "R", "R6", "curl", "jsonlite", "mime", "openssl" - ] + ], + "Hash": "ac107251d9d9fd72f0ca8049988f1d7f" }, "icons": { "Package": "icons", @@ -631,12 +771,12 @@ "Source": "GitHub", "RemoteType": "github", "RemoteHost": "api.github.com", - "RemoteUsername": "mitchelloharawild", "RemoteRepo": "icons", - "RemoteRef": "master", - "RemoteSha": "6e4dc378ac86c1d4f4ea167f408bed07b3df14fb", - "Hash": "73775362cd0dcad43ba00cfb9c89a928", + "RemoteUsername": "mitchelloharawild", + "RemoteRef": "HEAD", + "RemoteSha": "18ffa115f4053485900c4aed2ba7a67b07d9fbe9", "Requirements": [ + "R", "cli", "crayon", "glue", @@ -647,200 +787,247 @@ "rlang", "rstudioapi", "stringr", + "utils", "xml2" - ] + ], + "Hash": "a9d3e960f08bd58c486eab7c65366986" }, "ids": { "Package": "ids", "Version": "1.0.1", "Source": "Repository", "Repository": "RSPM", - "Hash": "99df65cfef20e525ed38c3d2577f7190", "Requirements": [ "openssl", "uuid" - ] + ], + "Hash": "99df65cfef20e525ed38c3d2577f7190" }, "isoband": { "Package": "isoband", - "Version": "0.2.5", + "Version": "0.2.7", "Source": "Repository", - "Repository": "RSPM", - "Hash": "7ab57a6de7f48a8dc84910d1eca42883", - "Requirements": [] + "Repository": "CRAN", + "Requirements": [ + "grid", + "utils" + ], + "Hash": "0080607b4a1a7b28979aecef976d8bc2" }, "jquerylib": { "Package": "jquerylib", "Version": "0.1.4", "Source": "Repository", "Repository": "RSPM", - "Hash": "5aab57a3bd297eee1c1d862735972182", "Requirements": [ "htmltools" - ] + ], + "Hash": "5aab57a3bd297eee1c1d862735972182" }, "jsonlite": { "Package": "jsonlite", - "Version": "1.8.0", + "Version": "1.8.8", "Source": "Repository", - "Repository": "RSPM", - "Hash": "d07e729b27b372429d42d24d503613a0", - "Requirements": [] + "Repository": "CRAN", + "Requirements": [ + "methods" + ], + "Hash": "e1b9c55281c5adc4dd113652d9e26768" }, "kableExtra": { "Package": "kableExtra", - "Version": "1.3.4", - "Source": "Repository", - "Repository": "RSPM", - "Hash": "49b625e6aabe4c5f091f5850aba8ff78", + "Version": "1.4.0.4", + "Source": "GitHub", + "RemoteType": "github", + "RemoteHost": "api.github.com", + "RemoteRepo": "kableExtra", + "RemoteUsername": "haozhu233", + "RemoteRef": "HEAD", + "RemoteSha": "cc2bd72e62291fd7af19b24e5128c50628d0d9ea", "Requirements": [ + "R", "digest", - "glue", + "grDevices", + "graphics", "htmltools", "knitr", "magrittr", "rmarkdown", "rstudioapi", - "rvest", "scales", + "stats", "stringr", "svglite", + "tools", "viridisLite", - "webshot", "xml2" - ] + ], + "Hash": "991488f05476e23b93a10cc127ffc383" }, "knitr": { "Package": "knitr", - "Version": "1.39", + "Version": "1.48", "Source": "Repository", - "Repository": "RSPM", - "Hash": "029ab7c4badd3cf8af69016b2ba27493", + "Repository": "CRAN", "Requirements": [ + "R", "evaluate", "highr", - "stringr", + "methods", + "tools", "xfun", "yaml" - ] + ], + "Hash": "acf380f300c721da9fde7df115a5f86f" }, "labeling": { "Package": "labeling", - "Version": "0.4.2", + "Version": "0.4.3", "Source": "Repository", - "Repository": "RSPM", - "Hash": "3d5108641f47470611a32d0bdf357a72", - "Requirements": [] + "Repository": "CRAN", + "Requirements": [ + "graphics", + "stats" + ], + "Hash": "b64ec208ac5bc1852b285f665d6368b3" }, "later": { "Package": "later", - "Version": "1.3.0", + "Version": "1.3.2", "Source": "Repository", - "Repository": "RSPM", - "Hash": "7e7b457d7766bc47f2a5f21cc2984f8e", + "Repository": "CRAN", "Requirements": [ "Rcpp", "rlang" - ] + ], + "Hash": "a3e051d405326b8b0012377434c62b37" }, "lattice": { "Package": "lattice", - "Version": "0.20-45", + "Version": "0.22-6", "Source": "Repository", "Repository": "CRAN", - "Hash": "b64cdbb2b340437c4ee047a1f4c4377b", - "Requirements": [] + "Requirements": [ + "R", + "grDevices", + "graphics", + "grid", + "stats", + "utils" + ], + "Hash": "cc5ac1ba4c238c7ca9fa6a87ca11a7e2" }, "lifecycle": { "Package": "lifecycle", - "Version": "1.0.1", + "Version": "1.0.4", "Source": "Repository", - "Repository": "RSPM", - "Hash": "a6b6d352e3ed897373ab19d8395c98d0", + "Repository": "CRAN", "Requirements": [ + "R", + "cli", "glue", "rlang" - ] + ], + "Hash": "b8552d117e1b808b09a832f589b79035" }, "lubridate": { "Package": "lubridate", - "Version": "1.8.0", + "Version": "1.9.3", "Source": "Repository", - "Repository": "RSPM", - "Hash": "2ff5eedb6ee38fb1b81205c73be1be5a", + "Repository": "CRAN", "Requirements": [ - "cpp11", - "generics" - ] + "R", + "generics", + "methods", + "timechange" + ], + "Hash": "680ad542fbcf801442c83a6ac5a2126c" }, "magick": { "Package": "magick", - "Version": "2.7.3", - "Source": "Repository", - "Repository": "RSPM", - "Hash": "56fbad418aa50939ed8c3028126af8d7", + "Version": "2.8.4.9000", + "Source": "GitHub", + "RemoteType": "github", + "RemoteHost": "api.github.com", + "RemoteRepo": "magick", + "RemoteUsername": "ropensci", + "RemoteRef": "HEAD", + "RemoteSha": "57d585447b148864828371b2cdf9e582bf22c59b", "Requirements": [ "Rcpp", "curl", "magrittr" - ] + ], + "Hash": "1f2f9db14cc8b2c0a4fcf20cfed5a186" }, "magrittr": { "Package": "magrittr", "Version": "2.0.3", "Source": "Repository", - "Repository": "RSPM", - "Hash": "7ce2733a9826b3aeb1775d56fd305472", - "Requirements": [] + "Repository": "CRAN", + "Requirements": [ + "R" + ], + "Hash": "7ce2733a9826b3aeb1775d56fd305472" }, "markdown": { "Package": "markdown", - "Version": "1.1", + "Version": "1.13", "Source": "Repository", - "Repository": "RSPM", - "Hash": "61e4a10781dd00d7d81dd06ca9b94e95", + "Repository": "CRAN", "Requirements": [ - "mime", + "R", + "commonmark", + "utils", "xfun" - ] + ], + "Hash": "074efab766a9d6360865ad39512f2a7e" }, "memoise": { "Package": "memoise", "Version": "2.0.1", "Source": "Repository", "Repository": "RSPM", - "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": "RSPM", - "Hash": "18e9c28c1d3ca1560ce30658b22ce104", - "Requirements": [] + "Repository": "CRAN", + "Requirements": [ + "tools" + ], + "Hash": "18e9c28c1d3ca1560ce30658b22ce104" }, "modelr": { "Package": "modelr", - "Version": "0.1.8", + "Version": "0.1.11", "Source": "Repository", - "Repository": "RSPM", - "Hash": "9fd59716311ee82cba83dc2826fc5577", + "Repository": "CRAN", "Requirements": [ + "R", "broom", "magrittr", "purrr", @@ -849,152 +1036,204 @@ "tidyr", "tidyselect", "vctrs" - ] + ], + "Hash": "4f50122dc256b1b6996a4703fecea821" }, "munsell": { "Package": "munsell", - "Version": "0.5.0", + "Version": "0.5.1", "Source": "Repository", - "Repository": "RSPM", - "Hash": "6dfe8bf774944bd5595785e3229d8771", + "Repository": "CRAN", "Requirements": [ - "colorspace" - ] + "colorspace", + "methods" + ], + "Hash": "4fd8900853b746af55b81fda99da7695" }, "nlme": { "Package": "nlme", - "Version": "3.1-157", + "Version": "3.1-165", "Source": "Repository", "Repository": "CRAN", - "Hash": "dbca60742be0c9eddc5205e5c7ca1f44", "Requirements": [ - "lattice" - ] + "R", + "graphics", + "lattice", + "stats", + "utils" + ], + "Hash": "2769a88be217841b1f33ed469675c3cc" + }, + "odbc": { + "Package": "odbc", + "Version": "1.5.0", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "DBI", + "R", + "Rcpp", + "bit64", + "blob", + "cli", + "hms", + "lifecycle", + "methods", + "rlang" + ], + "Hash": "0609d24c52744c675f8578622c33d5fa" }, "openssl": { "Package": "openssl", - "Version": "2.0.0", + "Version": "2.2.0", "Source": "Repository", - "Repository": "RSPM", - "Hash": "cf4329aac12c2c44089974559c18e446", + "Repository": "CRAN", "Requirements": [ "askpass" - ] + ], + "Hash": "2bcca3848e4734eb3b16103bc9aa4b8e" }, "pillar": { "Package": "pillar", - "Version": "1.7.0", + "Version": "1.9.0", "Source": "Repository", - "Repository": "RSPM", - "Hash": "51dfc97e1b7069e9f7e6f83f3589c22e", + "Repository": "CRAN", "Requirements": [ "cli", - "crayon", - "ellipsis", "fansi", "glue", "lifecycle", "rlang", "utf8", + "utils", "vctrs" - ] + ], + "Hash": "15da5a8412f317beeee6175fbc76f4bb" }, "pkgconfig": { "Package": "pkgconfig", "Version": "2.0.3", "Source": "Repository", - "Repository": "RSPM", - "Hash": "01f28d4278f15c76cddbea05899c5d6f", - "Requirements": [] + "Repository": "CRAN", + "Requirements": [ + "utils" + ], + "Hash": "01f28d4278f15c76cddbea05899c5d6f" }, "plogr": { "Package": "plogr", "Version": "0.2.0", "Source": "Repository", "Repository": "CRAN", - "Hash": "09eb987710984fc2905c7129c7d85e65", - "Requirements": [] + "Hash": "09eb987710984fc2905c7129c7d85e65" }, "prettyunits": { "Package": "prettyunits", - "Version": "1.1.1", + "Version": "1.2.0", "Source": "Repository", "Repository": "CRAN", - "Hash": "95ef9167b75dde9d2ccc3c7528393e7e", - "Requirements": [] + "Requirements": [ + "R" + ], + "Hash": "6b01fc98b1e86c4f705ce9dcfd2f57c7" }, "processx": { "Package": "processx", - "Version": "3.5.3", + "Version": "3.8.4", "Source": "Repository", - "Repository": "RSPM", - "Hash": "8bbae1a548d0d3fdf6647bdd9d35bf6d", + "Repository": "CRAN", "Requirements": [ + "R", "R6", - "ps" - ] + "ps", + "utils" + ], + "Hash": "0c90a7d71988856bad2a2a45dd871bb9" }, "progress": { "Package": "progress", - "Version": "1.2.2", + "Version": "1.2.3", "Source": "Repository", - "Repository": "RSPM", - "Hash": "14dc9f7a3c91ebb14ec5bb9208a07061", + "Repository": "CRAN", "Requirements": [ + "R", "R6", "crayon", "hms", "prettyunits" - ] + ], + "Hash": "f4625e061cb2865f111b47ff163a5ca6" }, "promises": { "Package": "promises", - "Version": "1.2.0.1", + "Version": "1.3.0", "Source": "Repository", - "Repository": "RSPM", - "Hash": "4ab2c43adb4d4699cf3690acd378d75d", + "Repository": "CRAN", "Requirements": [ "R6", "Rcpp", + "fastmap", "later", "magrittr", - "rlang" - ] + "rlang", + "stats" + ], + "Hash": "434cd5388a3979e74be5c219bcd6e77d" }, "ps": { "Package": "ps", - "Version": "1.7.0", + "Version": "1.7.7", "Source": "Repository", - "Repository": "RSPM", - "Hash": "eef74b13f32cae6bb0d495e53317c44c", - "Requirements": [] + "Repository": "CRAN", + "Requirements": [ + "R", + "utils" + ], + "Hash": "878b467580097e9c383acbb16adab57a" }, "purrr": { "Package": "purrr", - "Version": "0.3.4", + "Version": "1.0.2", "Source": "Repository", - "Repository": "RSPM", - "Hash": "97def703420c8ab10d8f0e6c72101e02", + "Repository": "CRAN", "Requirements": [ + "R", + "cli", + "lifecycle", "magrittr", - "rlang" - ] + "rlang", + "vctrs" + ], + "Hash": "1cba04a4e9414bdefc9dcaa99649a8dc" + }, + "ragg": { + "Package": "ragg", + "Version": "1.3.2", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "systemfonts", + "textshaping" + ], + "Hash": "e3087db406e079a8a2fd87f413918ed3" }, "rappdirs": { "Package": "rappdirs", "Version": "0.3.3", "Source": "Repository", - "Repository": "RSPM", - "Hash": "5e3c5dc0b071b21fa128676560dbe94d", - "Requirements": [] + "Repository": "CRAN", + "Requirements": [ + "R" + ], + "Hash": "5e3c5dc0b071b21fa128676560dbe94d" }, "readr": { "Package": "readr", - "Version": "2.1.2", + "Version": "2.1.5", "Source": "Repository", - "Repository": "RSPM", - "Hash": "9c59de1357dc209868b5feb5c9f0fe2f", + "Repository": "CRAN", "Requirements": [ + "R", "R6", "cli", "clipr", @@ -1002,120 +1241,129 @@ "crayon", "hms", "lifecycle", + "methods", "rlang", "tibble", "tzdb", + "utils", "vroom" - ] + ], + "Hash": "9de96463d2117f6ac49980577939dfb3" }, "readxl": { "Package": "readxl", - "Version": "1.4.0", + "Version": "1.4.3", "Source": "Repository", - "Repository": "RSPM", - "Hash": "170c35f745563bb307e963bde0197e4f", + "Repository": "CRAN", "Requirements": [ + "R", "cellranger", "cpp11", "progress", - "tibble" - ] + "tibble", + "utils" + ], + "Hash": "8cf9c239b96df1bbb133b74aef77ad0a" }, "rematch": { "Package": "rematch", - "Version": "1.0.1", + "Version": "2.0.0", "Source": "Repository", "Repository": "CRAN", - "Hash": "c66b930d20bb6d858cd18e1cebcfae5c", - "Requirements": [] + "Hash": "cbff1b666c6fa6d21202f07e2318d4f1" }, "rematch2": { "Package": "rematch2", "Version": "2.1.2", "Source": "Repository", "Repository": "RSPM", - "Hash": "76c9e04c712a05848ae7a23d2f170a40", "Requirements": [ "tibble" - ] + ], + "Hash": "76c9e04c712a05848ae7a23d2f170a40" }, "renv": { "Package": "renv", - "Version": "0.15.4", + "Version": "1.0.7", "Source": "Repository", - "Repository": "RSPM", - "Hash": "c1078316e1d4f70275fc1ea60c0bc431", - "Requirements": [] + "Repository": "CRAN", + "Requirements": [ + "utils" + ], + "Hash": "397b7b2a265bc5a7a06852524dabae20" }, "reprex": { "Package": "reprex", - "Version": "2.0.1", + "Version": "2.1.1", "Source": "Repository", - "Repository": "RSPM", - "Hash": "911d101becedc0fde495bd910984bdc8", + "Repository": "CRAN", "Requirements": [ + "R", "callr", "cli", "clipr", "fs", "glue", "knitr", + "lifecycle", "rlang", "rmarkdown", "rstudioapi", + "utils", "withr" - ] + ], + "Hash": "97b1d5361a24d9fb588db7afe3e5bcbf" }, "rlang": { "Package": "rlang", - "Version": "1.0.2", + "Version": "1.1.4", "Source": "Repository", - "Repository": "RSPM", - "Hash": "04884d9a75d778aca22c7154b8333ec9", - "Requirements": [] + "Repository": "CRAN", + "Requirements": [ + "R", + "utils" + ], + "Hash": "3eec01f8b1dee337674b2e34ab1f9bc1" }, "rmarkdown": { "Package": "rmarkdown", - "Version": "2.14", + "Version": "2.28", "Source": "Repository", "Repository": "RSPM", - "Hash": "31b60a882fabfabf6785b8599ffeb8ba", "Requirements": [ + "R", "bslib", "evaluate", + "fontawesome", "htmltools", "jquerylib", "jsonlite", "knitr", - "stringr", + "methods", "tinytex", + "tools", + "utils", "xfun", "yaml" - ] - }, - "rprojroot": { - "Package": "rprojroot", - "Version": "2.0.3", - "Source": "Repository", - "Repository": "RSPM", - "Hash": "1de7ab598047a87bba48434ba35d497d", - "Requirements": [] + ], + "Hash": "062470668513dcda416927085ee9bdc7" }, "rstudioapi": { "Package": "rstudioapi", - "Version": "0.13", + "Version": "0.16.0", "Source": "Repository", "Repository": "CRAN", - "Hash": "06c85365a03fdaf699966cc1d3cf53ea", - "Requirements": [] + "Hash": "96710351d642b70e8f02ddeb237c46a7" }, "rvest": { "Package": "rvest", - "Version": "1.0.2", + "Version": "1.0.4", "Source": "Repository", - "Repository": "RSPM", - "Hash": "bb099886deffecd6f9b298b7d4492943", + "Repository": "CRAN", "Requirements": [ + "R", + "cli", + "glue", "httr", "lifecycle", "magrittr", @@ -1123,173 +1371,212 @@ "selectr", "tibble", "xml2" - ] + ], + "Hash": "0bcf0c6f274e90ea314b812a6d19a519" }, "sass": { "Package": "sass", - "Version": "0.4.1", + "Version": "0.4.9", "Source": "Repository", - "Repository": "RSPM", - "Hash": "f37c0028d720bab3c513fd65d28c7234", + "Repository": "CRAN", "Requirements": [ "R6", "fs", "htmltools", "rappdirs", "rlang" - ] + ], + "Hash": "d53dbfddf695303ea4ad66f86e99b95d" }, "scales": { "Package": "scales", - "Version": "1.2.0", + "Version": "1.3.0", "Source": "Repository", - "Repository": "RSPM", - "Hash": "6e8750cdd13477aa440d453da93d5cac", + "Repository": "CRAN", "Requirements": [ + "R", "R6", "RColorBrewer", + "cli", "farver", + "glue", "labeling", "lifecycle", "munsell", "rlang", "viridisLite" - ] + ], + "Hash": "c19df082ba346b0ffa6f833e92de34d1" }, "selectr": { "Package": "selectr", "Version": "0.4-2", "Source": "Repository", - "Repository": "RSPM", - "Hash": "3838071b66e0c566d55cc26bd6e27bf4", + "Repository": "CRAN", "Requirements": [ + "R", "R6", + "methods", "stringr" - ] + ], + "Hash": "3838071b66e0c566d55cc26bd6e27bf4" }, "servr": { "Package": "servr", - "Version": "0.24", + "Version": "0.31", "Source": "Repository", - "Repository": "RSPM", - "Hash": "e2c3e268d654becf0d78a1ec13a05b46", + "Repository": "CRAN", "Requirements": [ + "R", "httpuv", "jsonlite", "mime", "xfun" - ] + ], + "Hash": "114c0484a22b8d3faa9bb2f1a7a71850" }, "stringi": { "Package": "stringi", - "Version": "1.7.6", + "Version": "1.8.4", "Source": "Repository", - "Repository": "RSPM", - "Hash": "bba431031d30789535745a9627ac9271", - "Requirements": [] + "Repository": "CRAN", + "Requirements": [ + "R", + "stats", + "tools", + "utils" + ], + "Hash": "39e1144fd75428983dc3f63aa53dfa91" }, "stringr": { "Package": "stringr", - "Version": "1.4.0", + "Version": "1.5.1", "Source": "Repository", - "Repository": "RSPM", - "Hash": "0759e6b6c0957edb1311028a49a35e76", + "Repository": "CRAN", "Requirements": [ + "R", + "cli", "glue", + "lifecycle", "magrittr", - "stringi" - ] + "rlang", + "stringi", + "vctrs" + ], + "Hash": "960e2ae9e09656611e0b8214ad543207" }, "svglite": { "Package": "svglite", - "Version": "2.1.0", + "Version": "2.1.3", "Source": "Repository", "Repository": "RSPM", - "Hash": "68dfdf211af6aa4e5f050f064f64d401", "Requirements": [ + "R", "cpp11", "systemfonts" - ] + ], + "Hash": "124a41fdfa23e8691cb744c762f10516" }, "sys": { "Package": "sys", - "Version": "3.4", + "Version": "3.4.2", "Source": "Repository", "Repository": "CRAN", - "Hash": "b227d13e29222b4574486cfcbde077fa", - "Requirements": [] + "Hash": "3a1be13d68d47a8cd0bfd74739ca1555" }, "systemfonts": { "Package": "systemfonts", - "Version": "1.0.4", + "Version": "1.1.0", "Source": "Repository", - "Repository": "RSPM", - "Hash": "90b28393209827327de889f49935140a", + "Repository": "CRAN", "Requirements": [ - "cpp11" - ] + "R", + "cpp11", + "lifecycle" + ], + "Hash": "213b6b8ed5afbf934843e6c3b090d418" + }, + "textshaping": { + "Package": "textshaping", + "Version": "0.4.0", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "cpp11", + "lifecycle", + "systemfonts" + ], + "Hash": "5142f8bc78ed3d819d26461b641627ce" }, "tibble": { "Package": "tibble", - "Version": "3.1.6", + "Version": "3.2.1", "Source": "Repository", - "Repository": "RSPM", - "Hash": "8a8f02d1934dfd6431c671361510dd0b", + "Repository": "CRAN", "Requirements": [ - "ellipsis", + "R", "fansi", "lifecycle", "magrittr", + "methods", "pillar", "pkgconfig", "rlang", + "utils", "vctrs" - ] + ], + "Hash": "a84e2cc86d07289b3b6f5069df7a004c" }, "tidyr": { "Package": "tidyr", - "Version": "1.2.0", + "Version": "1.3.1", "Source": "Repository", - "Repository": "RSPM", - "Hash": "d8b95b7fee945d7da6888cf7eb71a49c", + "Repository": "CRAN", "Requirements": [ + "R", + "cli", "cpp11", "dplyr", - "ellipsis", "glue", "lifecycle", "magrittr", "purrr", "rlang", + "stringr", "tibble", "tidyselect", + "utils", "vctrs" - ] + ], + "Hash": "915fb7ce036c22a6a33b5a8adb712eb1" }, "tidyselect": { "Package": "tidyselect", - "Version": "1.1.2", + "Version": "1.2.1", "Source": "Repository", - "Repository": "RSPM", - "Hash": "17f6da8cfd7002760a859915ce7eef8f", + "Repository": "CRAN", "Requirements": [ - "ellipsis", + "R", + "cli", "glue", - "purrr", + "lifecycle", "rlang", - "vctrs" - ] + "vctrs", + "withr" + ], + "Hash": "829f27b9c4919c16b593794a6344d6c0" }, "tidyverse": { "Package": "tidyverse", - "Version": "1.3.1", + "Version": "2.0.0", "Source": "Repository", - "Repository": "RSPM", - "Hash": "fc4c72b6ae9bb283416bd59a3303bbab", + "Repository": "CRAN", "Requirements": [ + "R", "broom", "cli", - "crayon", + "conflicted", "dbplyr", "dplyr", "dtplyr", @@ -1306,6 +1593,7 @@ "modelr", "pillar", "purrr", + "ragg", "readr", "readxl", "reprex", @@ -1316,71 +1604,92 @@ "tibble", "tidyr", "xml2" - ] + ], + "Hash": "c328568cd14ea89a83bd4ca7f54ae07e" + }, + "timechange": { + "Package": "timechange", + "Version": "0.3.0", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "cpp11" + ], + "Hash": "c5f3c201b931cd6474d17d8700ccb1c8" }, "tinytex": { "Package": "tinytex", - "Version": "0.38", + "Version": "0.52", "Source": "Repository", - "Repository": "RSPM", - "Hash": "759d047596ac173433985deddf313450", + "Repository": "CRAN", "Requirements": [ "xfun" - ] + ], + "Hash": "cfbad971a71f0e27cec22e544a08bc3b" }, "tzdb": { "Package": "tzdb", - "Version": "0.3.0", + "Version": "0.4.0", "Source": "Repository", - "Repository": "RSPM", - "Hash": "b2e1cbce7c903eaf23ec05c58e59fb5e", + "Repository": "CRAN", "Requirements": [ + "R", "cpp11" - ] + ], + "Hash": "f561504ec2897f4d46f0c7657e488ae1" }, "utf8": { "Package": "utf8", - "Version": "1.2.2", + "Version": "1.2.4", "Source": "Repository", - "Repository": "RSPM", - "Hash": "c9c462b759a5cc844ae25b5942654d13", - "Requirements": [] + "Repository": "CRAN", + "Requirements": [ + "R" + ], + "Hash": "62b65c52671e6665f803ff02954446e9" }, "uuid": { "Package": "uuid", - "Version": "1.1-0", + "Version": "1.2-1", "Source": "Repository", - "Repository": "RSPM", - "Hash": "f1cb46c157d080b729159d407be83496", - "Requirements": [] + "Repository": "CRAN", + "Requirements": [ + "R" + ], + "Hash": "34e965e62a41fcafb1ca60e9b142085b" }, "vctrs": { "Package": "vctrs", - "Version": "0.4.1", + "Version": "0.6.5", "Source": "Repository", - "Repository": "RSPM", - "Hash": "8b54f22e2a58c4f275479c92ce041a57", + "Repository": "CRAN", "Requirements": [ + "R", "cli", "glue", + "lifecycle", "rlang" - ] + ], + "Hash": "c03fa420630029418f7e6da3667aac4a" }, "viridisLite": { "Package": "viridisLite", - "Version": "0.4.0", + "Version": "0.4.2", "Source": "Repository", - "Repository": "RSPM", - "Hash": "55e157e2aa88161bdb0754218470d204", - "Requirements": [] + "Repository": "CRAN", + "Requirements": [ + "R" + ], + "Hash": "c826c7c4241b6fc89ff55aaea3fa7491" }, "vroom": { "Package": "vroom", - "Version": "1.5.7", + "Version": "1.6.5", "Source": "Repository", - "Repository": "RSPM", - "Hash": "976507b5a105bc3bdf6a5a5f29e0684f", + "Repository": "CRAN", "Requirements": [ + "R", "bit64", "cli", "cpp11", @@ -1388,90 +1697,91 @@ "glue", "hms", "lifecycle", + "methods", "progress", "rlang", + "stats", "tibble", "tidyselect", "tzdb", "vctrs", "withr" - ] - }, - "webshot": { - "Package": "webshot", - "Version": "0.5.3", - "Source": "Repository", - "Repository": "RSPM", - "Hash": "7261ab7f98e97c771217e6b87c085d6e", - "Requirements": [ - "callr", - "jsonlite", - "magrittr" - ] + ], + "Hash": "390f9315bc0025be03012054103d227c" }, "withr": { "Package": "withr", - "Version": "2.5.0", + "Version": "3.0.1", "Source": "Repository", - "Repository": "RSPM", - "Hash": "c0e49a9760983e81e55cdd9be92e7182", - "Requirements": [] + "Repository": "CRAN", + "Requirements": [ + "R", + "grDevices", + "graphics" + ], + "Hash": "07909200e8bbe90426fbfeb73e1e27aa" }, "xaringan": { "Package": "xaringan", - "Version": "0.24", + "Version": "0.30", "Source": "Repository", - "Repository": "RSPM", - "Hash": "714cfbdbc0775404c8df7894dfed0165", + "Repository": "CRAN", "Requirements": [ + "R", "htmltools", "knitr", "rmarkdown", "servr", "xfun" - ] + ], + "Hash": "40a1e30d3fb323f249a5e2fbec50c3b1" }, "xaringanExtra": { "Package": "xaringanExtra", - "Version": "0.5.5", - "Source": "GitHub", - "RemoteType": "github", - "RemoteHost": "api.github.com", - "RemoteUsername": "gadenbuie", - "RemoteRepo": "xaringanextra", - "RemoteRef": "main", - "RemoteSha": "ee5092d2d27bf4b813ea50ec4c264b331283face", - "Hash": "7814bea7239ac0898b0e2d85fa994e09", + "Version": "0.8.0", + "Source": "Repository", + "Repository": "rpsm", "Requirements": [ "htmltools", "jsonlite", "knitr", + "utils", "uuid" - ] + ], + "Hash": "e13b6d3cbb08e856fa73a565c074db40" }, "xfun": { "Package": "xfun", - "Version": "0.30", + "Version": "0.47", "Source": "Repository", "Repository": "RSPM", - "Hash": "e83f48136b041845e50a6658feffb197", - "Requirements": [] + "Requirements": [ + "R", + "grDevices", + "stats", + "tools" + ], + "Hash": "36ab21660e2d095fef0d83f689e0477c" }, "xml2": { "Package": "xml2", - "Version": "1.3.3", + "Version": "1.3.6", "Source": "Repository", - "Repository": "RSPM", - "Hash": "40682ed6a969ea5abfd351eb67833adc", - "Requirements": [] + "Repository": "CRAN", + "Requirements": [ + "R", + "cli", + "methods", + "rlang" + ], + "Hash": "1d0336142f4cd25d8d23cd3ba7a8fb61" }, "yaml": { "Package": "yaml", - "Version": "2.3.5", + "Version": "2.3.10", "Source": "Repository", - "Repository": "RSPM", - "Hash": "458bb38374d73bf83b1bb85e353da200", - "Requirements": [] + "Repository": "CRAN", + "Hash": "51dab85c6c98e50a18d7551e9d49f76c" } } } diff --git a/renv/.gitignore b/renv/.gitignore index cb06864..63b9ec4 100644 --- a/renv/.gitignore +++ b/renv/.gitignore @@ -1,3 +1,4 @@ +sandbox/ cellar/ library/ local/ diff --git a/renv/activate.R b/renv/activate.R index e961251..d13f993 100644 --- a/renv/activate.R +++ b/renv/activate.R @@ -2,10 +2,28 @@ local({ # the requested version of renv - version <- "0.15.4" + version <- "1.0.7" + attr(version, "sha") <- NULL # the project directory - project <- getwd() + project <- Sys.getenv("RENV_PROJECT") + if (!nzchar(project)) + project <- getwd() + + # use start-up diagnostics if enabled + diagnostics <- Sys.getenv("RENV_STARTUP_DIAGNOSTICS", unset = "FALSE") + if (diagnostics) { + start <- Sys.time() + profile <- tempfile("renv-startup-", fileext = ".Rprof") + utils::Rprof(profile) + on.exit({ + utils::Rprof(NULL) + elapsed <- signif(difftime(Sys.time(), start, units = "auto"), digits = 2L) + writeLines(sprintf("- renv took %s to run the autoloader.", format(elapsed))) + writeLines(sprintf("- Profile: %s", profile)) + print(utils::summaryRprof(profile)) + }, add = TRUE) + } # figure out whether the autoloader is enabled enabled <- local({ @@ -15,6 +33,14 @@ local({ if (!is.null(override)) return(override) + # if we're being run in a context where R_LIBS is already set, + # don't load -- presumably we're being run as a sub-process and + # the parent process has already set up library paths for us + rcmd <- Sys.getenv("R_CMD", unset = NA) + rlibs <- Sys.getenv("R_LIBS", unset = NA) + if (!is.na(rlibs) && !is.na(rcmd)) + return(FALSE) + # next, check environment variables # TODO: prefer using the configuration one in the future envvars <- c( @@ -34,9 +60,22 @@ local({ }) - if (!enabled) + # bail if we're not enabled + if (!enabled) { + + # if we're not enabled, we might still need to manually load + # the user profile here + profile <- Sys.getenv("R_PROFILE_USER", unset = "~/.Rprofile") + if (file.exists(profile)) { + cfg <- Sys.getenv("RENV_CONFIG_USER_PROFILE", unset = "TRUE") + if (tolower(cfg) %in% c("true", "t", "1")) + sys.source(profile, envir = globalenv()) + } + return(FALSE) + } + # avoid recursion if (identical(getOption("renv.autoloader.running"), TRUE)) { warning("ignoring recursive attempt to run renv autoloader") @@ -54,27 +93,96 @@ local({ # mask 'utils' packages, will come first on the search path library(utils, lib.loc = .Library) - # unload renv if it's already been laoded + # unload renv if it's already been loaded if ("renv" %in% loadedNamespaces()) unloadNamespace("renv") # load bootstrap tools `%||%` <- function(x, y) { - if (is.environment(x) || length(x)) x else y + if (is.null(x)) y else x + } + + catf <- function(fmt, ..., appendLF = TRUE) { + + quiet <- getOption("renv.bootstrap.quiet", default = FALSE) + if (quiet) + return(invisible()) + + msg <- sprintf(fmt, ...) + cat(msg, file = stdout(), sep = if (appendLF) "\n" else "") + + invisible(msg) + + } + + header <- function(label, + ..., + prefix = "#", + suffix = "-", + n = min(getOption("width"), 78)) + { + label <- sprintf(label, ...) + n <- max(n - nchar(label) - nchar(prefix) - 2L, 8L) + if (n <= 0) + return(paste(prefix, label)) + + tail <- paste(rep.int(suffix, n), collapse = "") + paste0(prefix, " ", label, " ", tail) + + } + + heredoc <- function(text, leave = 0) { + + # remove leading, trailing whitespace + trimmed <- gsub("^\\s*\\n|\\n\\s*$", "", text) + + # split into lines + lines <- strsplit(trimmed, "\n", fixed = TRUE)[[1L]] + + # compute common indent + indent <- regexpr("[^[:space:]]", lines) + common <- min(setdiff(indent, -1L)) - leave + paste(substring(lines, common), collapse = "\n") + + } + + startswith <- function(string, prefix) { + substring(string, 1, nchar(prefix)) == prefix } bootstrap <- function(version, library) { + friendly <- renv_bootstrap_version_friendly(version) + section <- header(sprintf("Bootstrapping renv %s", friendly)) + catf(section) + # attempt to download renv - tarball <- tryCatch(renv_bootstrap_download(version), error = identity) - if (inherits(tarball, "error")) - stop("failed to download renv ", version) + catf("- Downloading renv ... ", appendLF = FALSE) + withCallingHandlers( + tarball <- renv_bootstrap_download(version), + error = function(err) { + catf("FAILED") + stop("failed to download:\n", conditionMessage(err)) + } + ) + catf("OK") + on.exit(unlink(tarball), add = TRUE) # now attempt to install - status <- tryCatch(renv_bootstrap_install(version, tarball, library), error = identity) - if (inherits(status, "error")) - stop("failed to install renv ", version) + catf("- Installing renv ... ", appendLF = FALSE) + withCallingHandlers( + status <- renv_bootstrap_install(version, tarball, library), + error = function(err) { + catf("FAILED") + stop("failed to install:\n", conditionMessage(err)) + } + ) + catf("OK") + # add empty line to break up bootstrapping from normal output + catf("") + + return(invisible()) } renv_bootstrap_tests_running <- function() { @@ -83,28 +191,32 @@ 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")) - # 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") @@ -143,33 +255,34 @@ local({ renv_bootstrap_download <- function(version) { - # if the renv version number has 4 components, assume it must - # be retrieved via github - nv <- numeric_version(version) - components <- unclass(nv)[[1]] - - # if this appears to be a development version of 'renv', we'll - # try to restore from github - dev <- length(components) == 4L - - # begin collecting different methods for finding renv - methods <- c( - renv_bootstrap_download_tarball, - if (dev) - renv_bootstrap_download_github - else c( - renv_bootstrap_download_cran_latest, - renv_bootstrap_download_cran_archive + sha <- attr(version, "sha", exact = TRUE) + + methods <- if (!is.null(sha)) { + + # attempting to bootstrap a development version of renv + c( + function() renv_bootstrap_download_tarball(sha), + function() renv_bootstrap_download_github(sha) ) - ) + + } else { + + # attempting to bootstrap a release version of renv + c( + function() renv_bootstrap_download_tarball(version), + function() renv_bootstrap_download_cran_latest(version), + function() renv_bootstrap_download_cran_archive(version) + ) + + } for (method in methods) { - path <- tryCatch(method(version), error = identity) + path <- tryCatch(method(), error = identity) if (is.character(path) && file.exists(path)) return(path) } - stop("failed to download renv ", version) + stop("All download methods failed") } @@ -185,43 +298,75 @@ 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_cran_latest <- function(version) { + renv_bootstrap_download_custom_headers <- function(url) { - spec <- renv_bootstrap_download_cran_latest_find(version) + 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()) - message("* Downloading renv ", version, " ... ", appendLF = FALSE) + 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 - info <- tryCatch( - utils::download.packages( - pkgs = "renv", - destdir = tempdir(), - repos = repos, - type = type, - quiet = TRUE - ), + 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 = "/") + + destfile <- file.path(tempdir(), name) + status <- tryCatch( + renv_bootstrap_download_impl(url, destfile), condition = identity ) - if (inherits(info, "condition")) { - message("FAILED") + if (inherits(status, "condition")) return(FALSE) - } # report success and return - message("OK (downloaded ", type, ")") - info[1, 2] + destfile } @@ -277,8 +422,6 @@ local({ urls <- file.path(repos, "src/contrib/Archive/renv", name) destfile <- file.path(tempdir(), name) - message("* Downloading renv ", version, " ... ", appendLF = FALSE) - for (url in urls) { status <- tryCatch( @@ -286,14 +429,11 @@ local({ condition = identity ) - if (identical(status, 0L)) { - message("OK") + if (identical(status, 0L)) return(destfile) - } } - message("FAILED") return(FALSE) } @@ -307,20 +447,25 @@ 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) } # bail if it doesn't exist - if (!file.exists(tarball)) + if (!file.exists(tarball)) { + + # let the user know we weren't able to honour their request + fmt <- "- RENV_BOOTSTRAP_TARBALL is set (%s) but does not exist." + msg <- sprintf(fmt, tarball) + warning(msg) + + # bail return() - fmt <- "* Bootstrapping with tarball at path '%s'." - msg <- sprintf(fmt, tarball) - message(msg) + } + catf("- Using local tarball '%s'.", tarball) tarball } @@ -347,8 +492,6 @@ local({ on.exit(do.call(base::options, saved), add = TRUE) } - message("* Downloading renv ", version, " from GitHub ... ", appendLF = FALSE) - url <- file.path("https://api.github.com/repos/rstudio/renv/tarball", version) name <- sprintf("renv_%s.tar.gz", version) destfile <- file.path(tempdir(), name) @@ -358,26 +501,105 @@ local({ condition = identity ) - if (!identical(status, 0L)) { - message("FAILED") + if (!identical(status, 0L)) return(FALSE) - } - message("OK") + renv_bootstrap_download_augment(destfile) + return(destfile) } + # Add Sha to DESCRIPTION. This is stop gap until #890, after which we + # can use renv::install() to fully capture metadata. + renv_bootstrap_download_augment <- function(destfile) { + sha <- renv_bootstrap_git_extract_sha1_tar(destfile) + if (is.null(sha)) { + return() + } + + # Untar + tempdir <- tempfile("renv-github-") + on.exit(unlink(tempdir, recursive = TRUE), add = TRUE) + untar(destfile, exdir = tempdir) + pkgdir <- dir(tempdir, full.names = TRUE)[[1]] + + # Modify description + desc_path <- file.path(pkgdir, "DESCRIPTION") + desc_lines <- readLines(desc_path) + remotes_fields <- c( + "RemoteType: github", + "RemoteHost: api.github.com", + "RemoteRepo: renv", + "RemoteUsername: rstudio", + "RemotePkgRef: rstudio/renv", + paste("RemoteRef: ", sha), + paste("RemoteSha: ", sha) + ) + writeLines(c(desc_lines[desc_lines != ""], remotes_fields), con = desc_path) + + # Re-tar + local({ + old <- setwd(tempdir) + on.exit(setwd(old), add = TRUE) + + tar(destfile, compression = "gzip") + }) + invisible() + } + + # Extract the commit hash from a git archive. Git archives include the SHA1 + # hash as the comment field of the tarball pax extended header + # (see https://www.kernel.org/pub/software/scm/git/docs/git-archive.html) + # For GitHub archives this should be the first header after the default one + # (512 byte) header. + renv_bootstrap_git_extract_sha1_tar <- function(bundle) { + + # open the bundle for reading + # We use gzcon for everything because (from ?gzcon) + # > Reading from a connection which does not supply a 'gzip' magic + # > header is equivalent to reading from the original connection + conn <- gzcon(file(bundle, open = "rb", raw = TRUE)) + on.exit(close(conn)) + + # The default pax header is 512 bytes long and the first pax extended header + # with the comment should be 51 bytes long + # `52 comment=` (11 chars) + 40 byte SHA1 hash + len <- 0x200 + 0x33 + res <- rawToChar(readBin(conn, "raw", n = len)[0x201:len]) + + if (grepl("^52 comment=", res)) { + sub("52 comment=", "", res) + } else { + NULL + } + } + renv_bootstrap_install <- function(version, tarball, library) { # attempt to install it into project library - message("* Installing renv ", version, " ... ", appendLF = FALSE) dir.create(library, showWarnings = FALSE, recursive = TRUE) + output <- renv_bootstrap_install_impl(library, tarball) + + # check for successful install + status <- attr(output, "status") + if (is.null(status) || identical(status, 0L)) + return(status) + + # an error occurred; report it + header <- "installation of renv failed" + lines <- paste(rep.int("=", nchar(header)), collapse = "") + text <- paste(c(header, lines, output), collapse = "\n") + stop(text) + + } + + renv_bootstrap_install_impl <- function(library, tarball) { # invoke using system2 so we can capture and report output bin <- R.home("bin") exe <- if (Sys.info()[["sysname"]] == "Windows") "R.exe" else "R" - r <- file.path(bin, exe) + R <- file.path(bin, exe) args <- c( "--vanilla", "CMD", "INSTALL", "--no-multiarch", @@ -385,19 +607,7 @@ local({ shQuote(path.expand(tarball)) ) - output <- system2(r, args, stdout = TRUE, stderr = TRUE) - message("Done!") - - # check for successful install - status <- attr(output, "status") - if (is.numeric(status) && !identical(status, 0L)) { - header <- "Error installing renv:" - lines <- paste(rep.int("=", nchar(header)), collapse = "") - text <- c(header, lines, output) - writeLines(text, con = stderr()) - } - - status + system2(R, args, stdout = TRUE, stderr = TRUE) } @@ -438,6 +648,9 @@ local({ # if the user has requested an automatic prefix, generate it auto <- Sys.getenv("RENV_PATHS_PREFIX_AUTO", unset = NA) + if (is.na(auto) && getRversion() >= "4.4.0") + auto <- "TRUE" + if (auto %in% c("TRUE", "True", "true", "1")) return(renv_bootstrap_platform_prefix_auto()) @@ -607,34 +820,61 @@ local({ } - renv_bootstrap_validate_version <- function(version) { + renv_bootstrap_validate_version <- function(version, description = NULL) { - loadedversion <- utils::packageDescription("renv", fields = "Version") - if (version == loadedversion) + # resolve description file + # + # avoid passing lib.loc to `packageDescription()` below, since R will + # use the loaded version of the package by default anyhow. note that + # this function should only be called after 'renv' is loaded + # https://github.com/rstudio/renv/issues/1625 + description <- description %||% packageDescription("renv") + + # check whether requested version 'version' matches loaded version of renv + sha <- attr(version, "sha", exact = TRUE) + valid <- if (!is.null(sha)) + renv_bootstrap_validate_version_dev(sha, description) + else + renv_bootstrap_validate_version_release(version, description) + + if (valid) return(TRUE) - # 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 = "@") + # the loaded version of renv doesn't match the requested version; + # give the user instructions on how to proceed + dev <- identical(description[["RemoteType"]], "github") + remote <- if (dev) + paste("rstudio/renv", description[["RemoteSha"]], sep = "@") else - paste("renv", loadedversion, sep = "@") + paste("renv", description[["Version"]], sep = "@") - fmt <- paste( - "renv %1$s was loaded from project library, but this project is configured to use renv %2$s.", - "Use `renv::record(\"%3$s\")` to record renv %1$s in the lockfile.", - "Use `renv::restore(packages = \"renv\")` to install renv %2$s into the project library.", - sep = "\n" + # display both loaded version + sha if available + friendly <- renv_bootstrap_version_friendly( + version = description[["Version"]], + sha = if (dev) description[["RemoteSha"]] ) - msg <- sprintf(fmt, loadedversion, version, remote) - warning(msg, call. = FALSE) + fmt <- heredoc(" + renv %1$s was loaded from project library, but this project is configured to use renv %2$s. + - Use `renv::record(\"%3$s\")` to record renv %1$s in the lockfile. + - Use `renv::restore(packages = \"renv\")` to install renv %2$s into the project library. + ") + catf(fmt, friendly, renv_bootstrap_version_friendly(version), remote) FALSE } + renv_bootstrap_validate_version_dev <- function(version, description) { + expected <- description[["RemoteSha"]] + is.character(expected) && startswith(expected, version) + } + + renv_bootstrap_validate_version_release <- function(version, description) { + expected <- description[["Version"]] + is.character(expected) && identical(expected, version) + } + renv_bootstrap_hash_text <- function(text) { hashfile <- tempfile("renv-hash-") @@ -654,6 +894,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 = warnify) + # load the project renv::load(project) @@ -669,7 +915,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) @@ -793,14 +1039,80 @@ local({ } + renv_bootstrap_version_friendly <- function(version, shafmt = NULL, sha = NULL) { + sha <- sha %||% attr(version, "sha", exact = TRUE) + parts <- c(version, sprintf(shafmt %||% " [sha: %s]", substring(sha, 1L, 7L))) + paste(parts, collapse = "") + } + + renv_bootstrap_exec <- function(project, libpath, version) { + if (!renv_bootstrap_load(project, libpath, version)) + renv_bootstrap_run(version, libpath) + } + + renv_bootstrap_run <- function(version, libpath) { + + # perform bootstrap + bootstrap(version, libpath) + + # exit early if we're just testing bootstrap + if (!is.na(Sys.getenv("RENV_BOOTSTRAP_INSTALL_ONLY", unset = NA))) + return(TRUE) + + # try again to load + if (requireNamespace("renv", lib.loc = libpath, quietly = TRUE)) { + return(renv::load(project = getwd())) + } + + # failed to download or load renv; warn the user + msg <- c( + "Failed to find an renv installation: the project will not be loaded.", + "Use `renv::activate()` to re-initialize the project." + ) + + warning(paste(msg, collapse = "\n"), call. = FALSE) + + } renv_json_read <- function(file = NULL, text = NULL) { - text <- paste(text %||% read(file), collapse = "\n") + jlerr <- NULL + + # if jsonlite is loaded, use that instead + if ("jsonlite" %in% loadedNamespaces()) { + + json <- tryCatch(renv_json_read_jsonlite(file, text), error = identity) + if (!inherits(json, "error")) + return(json) + + jlerr <- json + + } + + # otherwise, fall back to the default JSON reader + json <- tryCatch(renv_json_read_default(file, text), error = identity) + 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 %||% readLines(file, warn = FALSE), 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 %||% readLines(file, warn = FALSE), collapse = "\n") pattern <- '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]' - locs <- gregexpr(pattern, text)[[1]] + locs <- gregexpr(pattern, text, perl = TRUE)[[1]] # if any are found, replace them with placeholders replaced <- text @@ -829,8 +1141,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") @@ -845,14 +1158,14 @@ local({ map <- as.list(map) # remap strings in object - remapped <- renv_json_remap(json, map) + remapped <- renv_json_read_remap(json, map) # evaluate eval(remapped, envir = baseenv()) } - renv_json_remap <- function(json, map) { + renv_json_read_remap <- function(json, map) { # fix names if (!is.null(names(json))) { @@ -879,7 +1192,7 @@ local({ # recurse if (is.recursive(json)) { for (i in seq_along(json)) { - json[i] <- list(renv_json_remap(json[[i]], map)) + json[i] <- list(renv_json_read_remap(json[[i]], map)) } } @@ -899,35 +1212,9 @@ local({ # construct full libpath libpath <- file.path(root, prefix) - # attempt to load - if (renv_bootstrap_load(project, libpath, version)) - return(TRUE) - - # load failed; inform user we're about to bootstrap - prefix <- paste("# Bootstrapping renv", version) - postfix <- paste(rep.int("-", 77L - nchar(prefix)), collapse = "") - header <- paste(prefix, postfix) - message(header) - - # perform bootstrap - bootstrap(version, libpath) - - # exit early if we're just testing bootstrap - if (!is.na(Sys.getenv("RENV_BOOTSTRAP_INSTALL_ONLY", unset = NA))) - return(TRUE) - - # try again to load - if (requireNamespace("renv", lib.loc = libpath, quietly = TRUE)) { - message("* Successfully installed and loaded renv ", version, ".") - return(renv::load()) - } - - # failed to download or load renv; warn the user - msg <- c( - "Failed to find an renv installation: the project will not be loaded.", - "Use `renv::activate()` to re-initialize the project." - ) + # run bootstrap code + renv_bootstrap_exec(project, libpath, version) - warning(paste(msg, collapse = "\n"), call. = FALSE) + invisible() }) diff --git a/renv/settings.json b/renv/settings.json new file mode 100644 index 0000000..2472d63 --- /dev/null +++ b/renv/settings.json @@ -0,0 +1,19 @@ +{ + "bioconductor.version": [], + "external.libraries": [], + "ignored.packages": [], + "package.dependency.fields": [ + "Imports", + "Depends", + "LinkingTo" + ], + "ppm.enabled": null, + "ppm.ignored.urls": [], + "r.version": [], + "snapshot.type": "implicit", + "use.cache": true, + "vcs.ignore.cellar": true, + "vcs.ignore.library": true, + "vcs.ignore.local": true, + "vcs.manage.ignores": true +}