diff --git a/DESCRIPTION b/DESCRIPTION index 3854e22..472ea1a 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: diades.atlas Title: The Diades Atlas Shiny App -Version: 0.3.2 +Version: 0.3.3 Authors@R: c( person("Sébastien", "Rochette", , "sebastien@thinkr.fr", role = c("cre", "aut"), comment = c(ORCID = "0000-0002-1565-9313")), @@ -71,4 +71,4 @@ Remotes: thinkr-open/w3css Encoding: UTF-8 LazyData: true -RoxygenNote: 7.2.3 +RoxygenNote: 7.3.2 diff --git a/NEWS.md b/NEWS.md index bc2e950..3a18325 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,9 @@ +# diades.atlas 0.3.3 + +* Upgrade R version in renv.lock +* Upgrade R package version +* Fix bad request in page 1 + # diades.atlas 0.3.2 * Upgrade R version in renv.lock diff --git a/R/mod_a_first_fct_map.R b/R/mod_a_first_fct_map.R index 1cf8d30..c0fd722 100644 --- a/R/mod_a_first_fct_map.R +++ b/R/mod_a_first_fct_map.R @@ -119,7 +119,7 @@ tm_catchmment <- function(dataContinent) { tm_shape(dataContinent) + tm_polygons( "abundance_interpretation", - title = "Status in river catchments (1951-2010)" %>% with_i18("status_in_river_catchments") %>% as.character(), + title = "Status in river catchments" %>% with_i18("status_in_river_catchments") %>% as.character(), # "Status in river catchments (1951-2010)", palette = c("#FEE0D2", "#FCBBA1", "#A50F15", "#67000D"), n = 4, diff --git a/R/mod_c_third_fct_query_and_plot.R b/R/mod_c_third_fct_query_and_plot.R index 3f51107..78c7175 100644 --- a/R/mod_c_third_fct_query_and_plot.R +++ b/R/mod_c_third_fct_query_and_plot.R @@ -50,7 +50,9 @@ get_bv_geoms <- function(bv_ids, get_con(session), query = sprintf( "select basin_id, verysimplified_geom from basin_outlet where basin_id IN %s", - dbplyr::translate_sql(!!bv_ids) + dbplyr::translate_sql( + con = get_con(session), + !!bv_ids) ) ) basin <- tbl(get_con(session), "basin") %>% diff --git a/data-raw/bd-page3-climate-change.Rmd b/data-raw/bd-page3-climate-change.Rmd index 77c9be1..10d0e50 100644 --- a/data-raw/bd-page3-climate-change.Rmd +++ b/data-raw/bd-page3-climate-change.Rmd @@ -3,8 +3,10 @@ title: "bd-page3-climate-change" output: rmarkdown::html_vignette vignette: > %\VignetteIndexEntry{bd-page3-climate-change} - %\VignetteEngine{knitr::rmarkdown} %\VignetteEncoding{UTF-8} + %\VignetteEngine{knitr::rmarkdown} +editor_options: + chunk_output_type: console --- ```{r, include = FALSE} @@ -73,7 +75,7 @@ datasets <- generate_datasets( ) ) -species_id <- datasets$species_list[datasets$species_list[["latin_name"]] == "alosa-fallax", "species_id"] +species_id <- datasets$species_list[datasets$species_list[["latin_name"]] == "Alosa fallax", "species_id"] scenario <- "rcp85" date <- c(1970, 2010) @@ -106,7 +108,9 @@ get_bv_geoms <- function(bv_ids, get_con(session), query = sprintf( "select basin_id, verysimplified_geom, ccm_name from basin_outlet where basin_id IN %s", - dbplyr::translate_sql(!!bv_ids) + dbplyr::translate_sql( + con = get_con(session), + !!bv_ids) ) ) basin <- tbl(get_con(session), "basin") %>% diff --git a/renv.lock b/renv.lock index 4efa730..b51dbbb 100644 --- a/renv.lock +++ b/renv.lock @@ -1,6 +1,6 @@ { "R": { - "Version": "4.3.0", + "Version": "4.4.1", "Repositories": [ { "Name": "RSPM", @@ -15,98 +15,48 @@ "Packages": { "DBI": { "Package": "DBI", - "Version": "1.1.3", + "Version": "1.2.3", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "DBI", - "RemoteRef": "DBI", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.1.3", + "Repository": "CRAN", "Requirements": [ "R", "methods" ], - "Hash": "b2866e62bab9378c3cc9476a1954226b" + "Hash": "065ae649b05f1ff66bb0c793107508f5" }, "DT": { "Package": "DT", - "Version": "0.27", + "Version": "0.33", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "crosstalk", "htmltools", "htmlwidgets", + "httpuv", "jquerylib", "jsonlite", "magrittr", "promises" ], - "Hash": "3444e6ed78763f9f13aaa39f2481eb34" - }, - "DiagrammeR": { - "Package": "DiagrammeR", - "Version": "1.0.9", - "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "DiagrammeR", - "RemoteRef": "DiagrammeR", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.0.9", - "Requirements": [ - "R", - "RColorBrewer", - "downloader", - "dplyr", - "glue", - "htmltools", - "htmlwidgets", - "igraph", - "influenceR", - "magrittr", - "purrr", - "readr", - "rlang", - "rstudioapi", - "scales", - "stringr", - "tibble", - "tidyr", - "viridis", - "visNetwork" - ], - "Hash": "cc43d8972a07f65e651c2861626003da" - }, - "DiagrammeRsvg": { - "Package": "DiagrammeRsvg", - "Version": "0.1", - "Source": "Repository", - "Repository": "RSPM", - "Requirements": [ - "V8" - ], - "Hash": "21e1cb313a641634215226782a49e5a1" + "Hash": "64ff3427f559ce3f2597a4fe13255cb6" }, "KernSmooth": { "Package": "KernSmooth", - "Version": "2.23-20", + "Version": "2.23-24", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "stats" ], - "Hash": "8dcfa99b14c296bc9f1fd64d52fd3ce7" + "Hash": "9f33a1ee37bbe8919eb2ec4b9f2473a5" }, "MASS": { "Package": "MASS", - "Version": "7.3-59", + "Version": "7.3-61", "Source": "Repository", - "Repository": "RSPM", + "Repository": "CRAN", "Requirements": [ "R", "grDevices", @@ -115,21 +65,16 @@ "stats", "utils" ], - "Hash": "26570ae748e78cb2b0f56019dd2ba354" + "Hash": "0cafd6f0500e5deba33be22c46bf6055" }, "Matrix": { "Package": "Matrix", - "Version": "1.5-4", + "Version": "1.7-0", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "Matrix", - "RemoteRef": "Matrix", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.5-4", + "Repository": "CRAN", "Requirements": [ "R", + "grDevices", "graphics", "grid", "lattice", @@ -137,7 +82,18 @@ "stats", "utils" ], - "Hash": "e779c7d9f35cc364438578f334cffee2" + "Hash": "1920b2f11133b12350024297d8a4ff4a" + }, + "PKI": { + "Package": "PKI", + "Version": "0.1-14", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "base64enc" + ], + "Hash": "f5b9c6b2f62f1fa3dd53fd1ddccbb241" }, "R6": { "Package": "R6", @@ -153,13 +109,7 @@ "Package": "RColorBrewer", "Version": "1.1-3", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "RColorBrewer", - "RemoteRef": "RColorBrewer", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.1-3", + "Repository": "CRAN", "Requirements": [ "R" ], @@ -167,80 +117,86 @@ }, "RPostgres": { "Package": "RPostgres", - "Version": "1.4.5", + "Version": "1.4.7", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "RPostgres", - "RemoteRef": "RPostgres", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.4.5", + "Repository": "CRAN", "Requirements": [ "DBI", "R", - "Rcpp", "bit64", "blob", + "cpp11", "hms", "lubridate", "methods", "plogr", "withr" ], - "Hash": "310ecf7e20c4a927bcfd5e625f70eb4c" + "Hash": "beb7e18bf3f9e096f716a52a77ec793c" + }, + "RSpectra": { + "Package": "RSpectra", + "Version": "0.16-2", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "Matrix", + "R", + "Rcpp", + "RcppEigen" + ], + "Hash": "5ffd7a70479497271e57cd0cc2465b3b" }, "Rcpp": { "Package": "Rcpp", - "Version": "1.0.10", + "Version": "1.0.13", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "Rcpp", - "RemoteRef": "Rcpp", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.0.10", + "Repository": "CRAN", "Requirements": [ "methods", "utils" ], - "Hash": "e749cae40fa9ef469b6050959517453c" + "Hash": "f27411eb6d9c3dada5edd444b8416675" }, - "V8": { - "Package": "V8", - "Version": "4.3.0", + "RcppEigen": { + "Package": "RcppEigen", + "Version": "0.3.4.0.2", "Source": "Repository", - "Repository": "RSPM", + "Repository": "CRAN", "Requirements": [ + "R", "Rcpp", - "curl", - "jsonlite", + "stats", "utils" ], - "Hash": "d1fa8fae6a47e88bb46d5152312bd8bd" + "Hash": "4ac8e423216b8b70cb9653d1b3f71eb9" + }, + "RcppTOML": { + "Package": "RcppTOML", + "Version": "0.2.2", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "Rcpp" + ], + "Hash": "c232938949fcd8126034419cc529333a" }, "XML": { "Package": "XML", - "Version": "3.99-0.14", + "Version": "3.99-0.17", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "XML", - "RemoteRef": "XML", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "3.99-0.14", + "Repository": "CRAN", "Requirements": [ "R", "methods", "utils" ], - "Hash": "e5c8af79df616c135b21eaeb1dc6bc5c" + "Hash": "bc2a8a1139d8d4bd9c46086708945124" }, "abind": { "Package": "abind", - "Version": "1.4-5", + "Version": "1.4-8", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -248,29 +204,28 @@ "methods", "utils" ], - "Hash": "4f57884290cc75ab22f4af9e9d4ca862" + "Hash": "2288423bb0f20a457800d7fc47f6aa54" }, "askpass": { "Package": "askpass", - "Version": "1.1", + "Version": "1.2.0", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "sys" ], - "Hash": "e8a22846fff485f0be3770c2da758713" + "Hash": "cad6cf7f1d5f6e906700b9d3e718c796" }, "attachment": { "Package": "attachment", - "Version": "0.3.1.9003", + "Version": "0.4.2.9002", "Source": "GitHub", "RemoteType": "github", "RemoteHost": "api.github.com", "RemoteRepo": "attachment", "RemoteUsername": "ThinkR-open", "RemotePkgRef": "ThinkR-open/attachment", - "RemoteRef": "HEAD", - "RemoteSha": "ed1d3bcfe74d6c62188a8962afb9b118593d5e56", + "RemoteSha": "fcf96ceb14b6733ef2351e0c01fcb5719f5835a3", "Requirements": [ "R", "cli", @@ -286,7 +241,7 @@ "withr", "yaml" ], - "Hash": "3678553105d8e6fb34d47208f58e856d" + "Hash": "099d2c0625ec354e0e4e72f77751f24d" }, "attempt": { "Package": "attempt", @@ -298,6 +253,16 @@ ], "Hash": "d7421bb5dfeb2676b9e4a5a60c2fcfd2" }, + "backports": { + "Package": "backports", + "Version": "1.5.0", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R" + ], + "Hash": "e1e1b9d75c37401117b636b7ae50827a" + }, "bank": { "Package": "bank", "Version": "0.0.0.9002", @@ -306,7 +271,6 @@ "RemoteHost": "api.github.com", "RemoteRepo": "bank", "RemoteUsername": "thinkr-open", - "RemoteRef": "HEAD", "RemoteSha": "c8ba84aaa0b6cc6f009344dbb4c99f0985ebb444", "Requirements": [ "R6", @@ -327,23 +291,17 @@ }, "bit": { "Package": "bit", - "Version": "4.0.5", + "Version": "4.5.0", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "bit", - "RemoteRef": "bit", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "4.0.5", + "Repository": "CRAN", "Requirements": [ "R" ], - "Hash": "d242abec29412ce988848d0294b208fd" + "Hash": "5dc7b2677d65d0e874fc4aaf0e879987" }, "bit64": { "Package": "bit64", - "Version": "4.0.5", + "Version": "4.5.2", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -353,19 +311,13 @@ "stats", "utils" ], - "Hash": "9fe98599ca456d6552421db0d6772d8f" + "Hash": "e84984bf5f12a18628d9a02322128dfd" }, "blob": { "Package": "blob", "Version": "1.2.4", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "blob", - "RemoteRef": "blob", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.2.4", + "Repository": "CRAN", "Requirements": [ "methods", "rlang", @@ -375,15 +327,9 @@ }, "bookdown": { "Package": "bookdown", - "Version": "0.33", + "Version": "0.40", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "bookdown", - "RemoteRef": "bookdown", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "0.33", + "Repository": "CRAN", "Requirements": [ "R", "htmltools", @@ -394,99 +340,147 @@ "xfun", "yaml" ], - "Hash": "948ba48e07aa772d3e5564ce8c0a7896" + "Hash": "896a79478a50c78fb035a37148638f4e" }, "brew": { "Package": "brew", - "Version": "1.0-8", + "Version": "1.0-10", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "brew", - "RemoteRef": "brew", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.0-8", - "Hash": "d69a786e85775b126bddbee185ae6084" + "Repository": "CRAN", + "Hash": "8f4a384e19dccd8c65356dc096847b76" }, "brio": { "Package": "brio", - "Version": "1.1.3", + "Version": "1.1.5", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "brio", - "RemoteRef": "brio", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.1.3", - "Hash": "976cf154dfb043c012d87cddd8bca363" + "Repository": "CRAN", + "Requirements": [ + "R" + ], + "Hash": "c1ee497a6d999947c2c224ae46799b1a" + }, + "broom": { + "Package": "broom", + "Version": "1.0.7", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "backports", + "dplyr", + "generics", + "glue", + "lifecycle", + "purrr", + "rlang", + "stringr", + "tibble", + "tidyr" + ], + "Hash": "8fcc818f3b9887aebaf206f141437cc9" }, "bslib": { "Package": "bslib", - "Version": "0.4.2", + "Version": "0.8.0", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "bslib", - "RemoteRef": "bslib", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "0.4.2", + "Repository": "CRAN", "Requirements": [ "R", "base64enc", "cachem", + "fastmap", "grDevices", "htmltools", "jquerylib", "jsonlite", + "lifecycle", "memoise", "mime", "rlang", "sass" ], - "Hash": "a7fbf03946ad741129dc81098722fca1" + "Hash": "b299c6741ca9746fb227debcb0f9fb6c" }, "cachem": { "Package": "cachem", - "Version": "1.0.7", + "Version": "1.1.0", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "cachem", - "RemoteRef": "cachem", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.0.7", + "Repository": "CRAN", "Requirements": [ "fastmap", "rlang" ], - "Hash": "cda74447c42f529de601fe4d4050daef" + "Hash": "cd9a672193789068eb5a2aad65a0dedf" }, "callr": { "Package": "callr", - "Version": "3.7.3", + "Version": "3.7.6", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "callr", - "RemoteRef": "callr", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "3.7.3", + "Repository": "CRAN", "Requirements": [ "R", "R6", "processx", "utils" ], - "Hash": "9b2191ede20fa29828139b9900922e51" + "Hash": "d7e13f49c19103ece9e58ad2d83a7354" + }, + "cellranger": { + "Package": "cellranger", + "Version": "1.1.0", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "rematch", + "tibble" + ], + "Hash": "f61dbaec772ccd2e17705c1e872e9e7c" + }, + "chameleon": { + "Package": "chameleon", + "Version": "0.2-3", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "clue", + "ggplot2", + "grDevices", + "stats", + "umap" + ], + "Hash": "de988536ab73ad4f5f932b05d86e2d68" + }, + "checkhelper": { + "Package": "checkhelper", + "Version": "0.1.1", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "cli", + "desc", + "devtools", + "dplyr", + "glue", + "lifecycle", + "magrittr", + "pkgbuild", + "purrr", + "rcmdcheck", + "roxygen2", + "stringr", + "tools", + "utils", + "whisker", + "withr" + ], + "Hash": "bdb40696995a3f8dc4ad0e7897194d99" }, "class": { "Package": "class", - "Version": "7.3-21", + "Version": "7.3-22", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -495,19 +489,13 @@ "stats", "utils" ], - "Hash": "8ae0d4328e2eb3a582dfd5391a3663b7" + "Hash": "f91f6b29f38b8c280f2b9477787d4bb2" }, "classInt": { "Package": "classInt", - "Version": "0.4-9", + "Version": "0.4-10", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "classInt", - "RemoteRef": "classInt", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "0.4-9", + "Repository": "CRAN", "Requirements": [ "KernSmooth", "R", @@ -517,62 +505,72 @@ "graphics", "stats" ], - "Hash": "bee651a42a89633eccb36dca9d9ab413" + "Hash": "f5a40793b1ae463a7ffb3902a95bf864" }, "cli": { "Package": "cli", - "Version": "3.6.1", + "Version": "3.6.3", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "cli", - "RemoteRef": "cli", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "3.6.1", + "Repository": "CRAN", "Requirements": [ "R", "utils" ], - "Hash": "89e6d8219950eac806ae0c489052048a" + "Hash": "b21916dd77a27642b447374a5d30ecf3" }, "clipr": { "Package": "clipr", "Version": "0.8.0", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "clipr", - "RemoteRef": "clipr", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "0.8.0", + "Repository": "CRAN", "Requirements": [ "utils" ], "Hash": "3f038e5ac7f41d4ac41ce658c85e3042" }, + "clue": { + "Package": "clue", + "Version": "0.3-65", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "cluster", + "graphics", + "methods", + "stats" + ], + "Hash": "d6b53853800595408a776900bcc0c23f" + }, + "cluster": { + "Package": "cluster", + "Version": "2.1.6", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "grDevices", + "graphics", + "stats", + "utils" + ], + "Hash": "0aaa05204035dc43ea0004b9c76611dd" + }, "codetools": { "Package": "codetools", - "Version": "0.2-18", + "Version": "0.2-20", "Source": "Repository", - "Repository": "RSPM", + "Repository": "CRAN", "Requirements": [ "R" ], - "Hash": "019388fc48e48b3da0d3a76ff94608a8" + "Hash": "61e097f35917d342622f21cdc79c256e" }, "colorspace": { "Package": "colorspace", - "Version": "2.1-0", + "Version": "2.1-1", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "colorspace", - "RemoteRef": "colorspace", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "2.1-0", + "Repository": "CRAN", "Requirements": [ "R", "grDevices", @@ -580,42 +578,43 @@ "methods", "stats" ], - "Hash": "f20c47fd52fae58b4e377c37bb8c335b" + "Hash": "d954cb1c57e8d8b756165d7ba18aa55a" }, "commonmark": { "Package": "commonmark", - "Version": "1.9.0", + "Version": "1.9.1", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "commonmark", - "RemoteRef": "commonmark", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.9.0", - "Hash": "d691c61bff84bd63c383874d2d0c3307" + "Repository": "CRAN", + "Hash": "5d8225445acb167abf7797de48b2ee3c" }, "config": { "Package": "config", - "Version": "0.3.1", + "Version": "0.3.2", "Source": "Repository", - "Repository": "RSPM", + "Repository": "CRAN", "Requirements": [ "yaml" ], - "Hash": "31d77b09f63550cee9ecb5a08bf76e8f" + "Hash": "8b7222e9d9eb5178eea545c0c4d33fc2" + }, + "conflicted": { + "Package": "conflicted", + "Version": "1.2.0", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "cli", + "memoise", + "rlang" + ], + "Hash": "bb097fccb22d156624fd07cd2894ddb6" }, "covr": { "Package": "covr", - "Version": "3.6.2", + "Version": "3.6.4", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "covr", - "RemoteRef": "covr", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "3.6.2", + "Repository": "CRAN", "Requirements": [ "R", "crayon", @@ -629,50 +628,59 @@ "withr", "yaml" ], - "Hash": "a0d8f9a55add5311d48227b6f7f38e34" + "Hash": "0cbf0435830e767ba9b292b313592362" + }, + "covrpage": { + "Package": "covrpage", + "Version": "0.2", + "Source": "GitHub", + "RemoteType": "github", + "RemoteHost": "api.github.com", + "RemoteRepo": "covrpage", + "RemoteUsername": "yonicd", + "RemoteSha": "bafeb195d1999b8c3a48186e26f59cafcdfa3670", + "Requirements": [ + "R", + "covr", + "curl", + "git2r", + "remotes", + "rmarkdown", + "stats", + "testthat", + "utils", + "whisker", + "withr" + ], + "Hash": "163a20ecce2c3936f2039a5ab8b496ee" }, "cpp11": { "Package": "cpp11", - "Version": "0.4.3", + "Version": "0.5.0", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "cpp11", - "RemoteRef": "cpp11", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "0.4.3", - "Hash": "ed588261931ee3be2c700d22e94a29ab" + "Repository": "CRAN", + "Requirements": [ + "R" + ], + "Hash": "91570bba75d0c9d3f1040c835cee8fba" }, "crayon": { "Package": "crayon", - "Version": "1.5.2", + "Version": "1.5.3", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "crayon", - "RemoteRef": "crayon", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.5.2", + "Repository": "CRAN", "Requirements": [ "grDevices", "methods", "utils" ], - "Hash": "e8a1e41acf02548751f45c718d55aa6a" + "Hash": "859d96e65ef198fd43e82b9628d593ef" }, "credentials": { "Package": "credentials", - "Version": "1.3.2", + "Version": "2.0.1", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "credentials", - "RemoteRef": "credentials", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.3.2", + "Repository": "CRAN", "Requirements": [ "askpass", "curl", @@ -680,65 +688,47 @@ "openssl", "sys" ], - "Hash": "93762d0a34d78e6a025efdbfb5c6bb41" + "Hash": "c7844b32098dcbd1c59cbd8dddb4ecc6" }, "crosstalk": { "Package": "crosstalk", - "Version": "1.2.0", + "Version": "1.2.1", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "crosstalk", - "RemoteRef": "crosstalk", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.2.0", + "Repository": "CRAN", "Requirements": [ "R6", "htmltools", "jsonlite", "lazyeval" ], - "Hash": "6aa54f69598c32177e920eb3402e8293" + "Hash": "ab12c7b080a57475248a30f4db6298c0" }, "curl": { "Package": "curl", - "Version": "5.0.0", + "Version": "5.2.3", "Source": "Repository", - "Repository": "RSPM", + "Repository": "CRAN", "Requirements": [ "R" ], - "Hash": "e4f97056611e8e6b8b852d13b7400cf1" + "Hash": "d91263322a58af798f6cf3b13fd56dde" }, "data.table": { "Package": "data.table", - "Version": "1.14.8", + "Version": "1.16.0", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "data.table", - "RemoteRef": "data.table", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.14.8", + "Repository": "CRAN", "Requirements": [ "R", "methods" ], - "Hash": "b4c06e554f33344e044ccd7fdca750a9" + "Hash": "fb24e05d4a91d8b1c7ff8e284bde834a" }, "dbplyr": { "Package": "dbplyr", - "Version": "2.3.2", + "Version": "2.5.0", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "dbplyr", - "RemoteRef": "dbplyr", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "2.3.2", + "Repository": "CRAN", "Requirements": [ "DBI", "R", @@ -760,27 +750,20 @@ "vctrs", "withr" ], - "Hash": "d24305b92db333726aed162a2c23a147" + "Hash": "39b2e002522bfd258039ee4e889e0fd1" }, "desc": { "Package": "desc", - "Version": "1.4.2", + "Version": "1.4.3", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "desc", - "RemoteRef": "desc", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.4.2", + "Repository": "CRAN", "Requirements": [ "R", "R6", "cli", - "rprojroot", "utils" ], - "Hash": "6b9602c7ebbe87101a9c8edb6e8b6d21" + "Hash": "99b79fcbd6c4d1ce087f5c5c758b384f" }, "devtools": { "Package": "devtools", @@ -816,17 +799,64 @@ ], "Hash": "ea5bc8b4a6a01e4f12d98b58329930bb" }, - "dichromat": { - "Package": "dichromat", - "Version": "2.0-0.1", + "diades.atlas": { + "Package": "diades.atlas", + "Version": "0.3.2", + "Source": "GitHub", + "RemoteType": "github", + "RemoteHost": "api.github.com", + "RemoteRepo": "diades.atlas", + "RemoteUsername": "inrae", + "RemoteSha": "1347b0abebf958a984fcf143270407fdca13520c", + "Requirements": [ + "DBI", + "DT", + "Matrix", + "R", + "RPostgres", + "bank", + "cachem", + "cli", + "commonmark", + "config", + "data.table", + "dbplyr", + "desc", + "dplyr", + "ggplot2", + "glue", + "golem", + "jsonlite", + "leaflet", + "magrittr", + "maps", + "memoise", + "methods", + "mongolite", + "patchwork", + "pkgload", + "promises", + "purrr", + "sf", + "shinipsum", + "shiny", + "shinythemes", + "stats", + "tibble", + "tidyr", + "tmap", + "tools", + "utils", + "w3css", + "whereami" + ], + "Hash": "18bd53d14a52011fd2cef5eda8e3f5d8" + }, + "dichromat": { + "Package": "dichromat", + "Version": "2.0-0.1", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "dichromat", - "RemoteRef": "dichromat", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "2.0-0.1", + "Repository": "CRAN", "Requirements": [ "R", "stats" @@ -837,13 +867,7 @@ "Package": "diffobj", "Version": "0.3.5", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "diffobj", - "RemoteRef": "diffobj", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "0.3.5", + "Repository": "CRAN", "Requirements": [ "R", "crayon", @@ -856,36 +880,30 @@ }, "digest": { "Package": "digest", - "Version": "0.6.31", + "Version": "0.6.37", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "digest", - "RemoteRef": "digest", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "0.6.31", + "Repository": "CRAN", "Requirements": [ "R", "utils" ], - "Hash": "8b708f296afd9ae69f450f9640be8990" + "Hash": "33698c4b3127fc9f506654607fb73676" }, "dotCall64": { "Package": "dotCall64", - "Version": "1.0-2", + "Version": "1.1-1", "Source": "Repository", - "Repository": "RSPM", + "Repository": "CRAN", "Requirements": [ "R" ], - "Hash": "6aa9e277302190b6c618af042d904bdf" + "Hash": "80f374ef8500fcdc5d84a0345b837227" }, "downlit": { "Package": "downlit", - "Version": "0.4.2", + "Version": "0.4.4", "Source": "Repository", - "Repository": "RSPM", + "Repository": "CRAN", "Requirements": [ "R", "brio", @@ -899,30 +917,13 @@ "withr", "yaml" ], - "Hash": "79bf3f66590752ffbba20f8d2da94c7c" - }, - "downloader": { - "Package": "downloader", - "Version": "0.4", - "Source": "Repository", - "Repository": "RSPM", - "Requirements": [ - "digest", - "utils" - ], - "Hash": "f4f2a915e0dedbdf016a83b63477349f" + "Hash": "45a6a596bf0108ee1ff16a040a2df897" }, "dplyr": { "Package": "dplyr", - "Version": "1.1.2", + "Version": "1.1.4", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "dplyr", - "RemoteRef": "dplyr", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.1.2", + "Repository": "CRAN", "Requirements": [ "R", "R6", @@ -939,7 +940,26 @@ "utils", "vctrs" ], - "Hash": "dea6970ff715ca541c387de363ff405e" + "Hash": "fedd9d00c2944ff00a0e2696ccf048ec" + }, + "dtplyr": { + "Package": "dtplyr", + "Version": "1.3.1", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "cli", + "data.table", + "dplyr", + "glue", + "lifecycle", + "rlang", + "tibble", + "tidyselect", + "vctrs" + ], + "Hash": "54ed3ea01b11e81a86544faaecfef8e2" }, "dygraphs": { "Package": "dygraphs", @@ -958,15 +978,9 @@ }, "e1071": { "Package": "e1071", - "Version": "1.7-13", + "Version": "1.7-16", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "e1071", - "RemoteRef": "e1071", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.7-13", + "Repository": "CRAN", "Requirements": [ "class", "grDevices", @@ -976,7 +990,7 @@ "stats", "utils" ], - "Hash": "1046cb48d06cb40c2900d8878f03a0fe" + "Hash": "27a09ca40266a1066d62ef5402dd51d6" }, "ellipsis": { "Package": "ellipsis", @@ -991,150 +1005,98 @@ }, "evaluate": { "Package": "evaluate", - "Version": "0.20", + "Version": "1.0.0", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "evaluate", - "RemoteRef": "evaluate", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "0.20", + "Repository": "CRAN", "Requirements": [ - "R", - "methods" + "R" ], - "Hash": "4b68aa51edd89a0e044a66e75ae3cc6c" + "Hash": "6b567375113ceb7d9f800de4dd42218e" }, "fansi": { "Package": "fansi", - "Version": "1.0.4", + "Version": "1.0.6", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "fansi", - "RemoteRef": "fansi", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.0.4", + "Repository": "CRAN", "Requirements": [ "R", "grDevices", "utils" ], - "Hash": "1d9e7ad3c8312a192dea7d3db0274fde" + "Hash": "962174cf2aeb5b9eea581522286a911f" }, "farver": { "Package": "farver", - "Version": "2.1.1", + "Version": "2.1.2", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "farver", - "RemoteRef": "farver", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "2.1.1", - "Hash": "8106d78941f34855c440ddb946b8f7a5" + "Repository": "CRAN", + "Hash": "680887028577f3fa2a81e410ed0d6e42" }, "fastmap": { "Package": "fastmap", - "Version": "1.1.1", + "Version": "1.2.0", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "fastmap", - "RemoteRef": "fastmap", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.1.1", - "Hash": "f7736a18de97dea803bde0a2daaafb27" + "Repository": "CRAN", + "Hash": "aa5e1cd11c2d15497494c5292d7ffcc8" }, "fields": { "Package": "fields", - "Version": "14.1", + "Version": "16.3", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "fields", - "RemoteRef": "fields", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "14.1", + "Repository": "CRAN", "Requirements": [ "R", "maps", "methods", "spam", - "viridis" + "viridisLite" ], - "Hash": "75f08bec9520d29ff8c3b37276eb3da7" + "Hash": "2900d13ae2ee1dcf9f9cce088103667c" }, "fontawesome": { "Package": "fontawesome", - "Version": "0.5.1", + "Version": "0.5.2", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "fontawesome", - "RemoteRef": "fontawesome", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "0.5.1", + "Repository": "CRAN", "Requirements": [ "R", "htmltools", "rlang" ], - "Hash": "1e22b8cabbad1eae951a75e9f8b52378" + "Hash": "c2efdd5f0bcd1ea861c2d4e2a883a67d" }, - "foreign": { - "Package": "foreign", - "Version": "0.8-84", + "forcats": { + "Package": "forcats", + "Version": "1.0.0", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "foreign", - "RemoteRef": "foreign", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "0.8-84", + "Repository": "CRAN", "Requirements": [ "R", - "methods", - "stats", - "utils" + "cli", + "glue", + "lifecycle", + "magrittr", + "rlang", + "tibble" ], - "Hash": "467ec0ca895d4e61a22cfbac9bccddf8" + "Hash": "1a0a9a3d5083d0d573c4214576f1e690" }, "fs": { "Package": "fs", - "Version": "1.6.2", + "Version": "1.6.4", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "fs", - "RemoteRef": "fs", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.6.2", + "Repository": "CRAN", "Requirements": [ "R", "methods" ], - "Hash": "94af08e0aa9675a16fadbb3aaaa90d2a" + "Hash": "15aeb8c27f5ea5161f9f6a641fafd93a" }, "future": { "Package": "future", - "Version": "1.32.0", + "Version": "1.34.0", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "future", - "RemoteRef": "future", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.32.0", + "Repository": "CRAN", "Requirements": [ "digest", "globals", @@ -1143,36 +1105,62 @@ "parallelly", "utils" ], - "Hash": "c68517cf2f78be4ea86e140b8598a4ca" + "Hash": "475771e3edb711591476be387c9a8c2e" + }, + "gargle": { + "Package": "gargle", + "Version": "1.5.2", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "cli", + "fs", + "glue", + "httr", + "jsonlite", + "lifecycle", + "openssl", + "rappdirs", + "rlang", + "stats", + "utils", + "withr" + ], + "Hash": "fc0b272e5847c58cd5da9b20eedbd026" }, "generics": { "Package": "generics", "Version": "0.1.3", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "generics", - "RemoteRef": "generics", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "0.1.3", + "Repository": "CRAN", "Requirements": [ "R", "methods" ], "Hash": "15e9634c0fcd294799e9b2e929ed1b86" }, + "geojson": { + "Package": "geojson", + "Version": "0.3.5", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "jqr", + "jsonlite", + "lazyeval", + "magrittr", + "methods", + "protolite", + "sp" + ], + "Hash": "efc8d020709d1e1f9628a8d5362d193b" + }, "geojsonsf": { "Package": "geojsonsf", "Version": "2.0.3", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "geojsonsf", - "RemoteRef": "geojsonsf", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "2.0.3", + "Repository": "CRAN", "Requirements": [ "R", "Rcpp", @@ -1185,31 +1173,19 @@ }, "geometries": { "Package": "geometries", - "Version": "0.2.2", + "Version": "0.2.4", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "geometries", - "RemoteRef": "geometries", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "0.2.2", + "Repository": "CRAN", "Requirements": [ "Rcpp" ], - "Hash": "09604531daa57d9c3884b7a15488bab9" + "Hash": "a722b946e99fd7a006ab1239c0d1b2bc" }, "gert": { "Package": "gert", - "Version": "1.9.2", + "Version": "2.1.2", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "gert", - "RemoteRef": "gert", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.9.2", + "Repository": "CRAN", "Requirements": [ "askpass", "credentials", @@ -1218,19 +1194,13 @@ "sys", "zip" ], - "Hash": "9122b3958e749badb5c939f498038b57" + "Hash": "347d104ed332650b737f509a703c9c7f" }, "ggplot2": { "Package": "ggplot2", - "Version": "3.4.2", + "Version": "3.5.1", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "ggplot2", - "RemoteRef": "ggplot2", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "3.4.2", + "Repository": "CRAN", "Requirements": [ "MASS", "R", @@ -1249,41 +1219,47 @@ "vctrs", "withr" ], - "Hash": "3a147ee02e85a8941aad9909f1b43b7b" + "Hash": "44c6a2f8202d5b7e878ea274b1092426" }, "gh": { "Package": "gh", - "Version": "1.4.0", + "Version": "1.4.1", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "gh", - "RemoteRef": "gh", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.4.0", + "Repository": "CRAN", "Requirements": [ "R", "cli", "gitcreds", + "glue", "httr2", "ini", "jsonlite", + "lifecycle", "rlang" ], - "Hash": "03533b1c875028233598f848fda44c4c" + "Hash": "fbbbc48eba7a6626a08bb365e44b563b" + }, + "git2r": { + "Package": "git2r", + "Version": "0.33.0.9000", + "Source": "GitHub", + "RemoteType": "github", + "RemoteHost": "api.github.com", + "RemoteRepo": "git2r", + "RemoteUsername": "ropensci", + "RemoteSha": "cc07d5407e3e17aa3e4f97803039cb7abbabcffd", + "Requirements": [ + "R", + "graphics", + "utils" + ], + "Hash": "0da33f428d0d5bf598b0f0dc6af09499" }, "gitcreds": { "Package": "gitcreds", "Version": "0.1.2", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "gitcreds", - "RemoteRef": "gitcreds", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "0.1.2", + "Repository": "CRAN", "Requirements": [ "R" ], @@ -1291,37 +1267,31 @@ }, "globals": { "Package": "globals", - "Version": "0.16.2", + "Version": "0.16.3", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "globals", - "RemoteRef": "globals", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "0.16.2", + "Repository": "CRAN", "Requirements": [ "R", "codetools" ], - "Hash": "baa9585ab4ce47a9f4618e671778cc6f" + "Hash": "2580567908cafd4f187c1e5a91e98b7f" }, "glue": { "Package": "glue", - "Version": "1.6.2", + "Version": "1.8.0", "Source": "Repository", - "Repository": "RSPM", + "Repository": "CRAN", "Requirements": [ "R", "methods" ], - "Hash": "4f2596dfb05dac67b9dc558e5c6fba2e" + "Hash": "5899f1eaa825580172bb56c08266f37c" }, "golem": { "Package": "golem", - "Version": "0.4.0", + "Version": "0.5.1", "Source": "Repository", - "Repository": "RSPM", + "Repository": "CRAN", "Requirements": [ "R", "attempt", @@ -1333,33 +1303,66 @@ "utils", "yaml" ], - "Hash": "4275a95781526a472cff3e39f957c8be" + "Hash": "11be24963e2f220c403eafd01e2259d5" }, - "gridExtra": { - "Package": "gridExtra", - "Version": "2.3", + "googledrive": { + "Package": "googledrive", + "Version": "2.1.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ - "grDevices", - "graphics", - "grid", - "gtable", - "utils" + "R", + "cli", + "gargle", + "glue", + "httr", + "jsonlite", + "lifecycle", + "magrittr", + "pillar", + "purrr", + "rlang", + "tibble", + "utils", + "uuid", + "vctrs", + "withr" ], - "Hash": "7d7f283939f563670a697165b2cf5560" + "Hash": "e99641edef03e2a5e87f0a0b1fcc97f4" + }, + "googlesheets4": { + "Package": "googlesheets4", + "Version": "1.1.1", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "cellranger", + "cli", + "curl", + "gargle", + "glue", + "googledrive", + "httr", + "ids", + "lifecycle", + "magrittr", + "methods", + "purrr", + "rematch2", + "rlang", + "tibble", + "utils", + "vctrs", + "withr" + ], + "Hash": "d6db1667059d027da730decdc214b959" }, "gtable": { "Package": "gtable", - "Version": "0.3.3", + "Version": "0.3.5", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "gtable", - "RemoteRef": "gtable", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "0.3.3", + "Repository": "CRAN", "Requirements": [ "R", "cli", @@ -1368,7 +1371,28 @@ "lifecycle", "rlang" ], - "Hash": "b44addadb528a0d227794121c00572a0" + "Hash": "e18861963cbc65a27736e02b3cd3c4a0" + }, + "haven": { + "Package": "haven", + "Version": "2.5.4", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "cli", + "cpp11", + "forcats", + "hms", + "lifecycle", + "methods", + "readr", + "rlang", + "tibble", + "tidyselect", + "vctrs" + ], + "Hash": "9171f898db9d9c4c1b2c745adc2c1ef1" }, "here": { "Package": "here", @@ -1382,32 +1406,20 @@ }, "highr": { "Package": "highr", - "Version": "0.10", + "Version": "0.11", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "highr", - "RemoteRef": "highr", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "0.10", + "Repository": "CRAN", "Requirements": [ "R", "xfun" ], - "Hash": "06230136b2d2b9ba5805e1963fa6e890" + "Hash": "d65ba49117ca223614f71b60d85b8ab7" }, "hms": { "Package": "hms", "Version": "1.1.3", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "hms", - "RemoteRef": "hms", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.1.3", + "Repository": "CRAN", "Requirements": [ "lifecycle", "methods", @@ -1419,30 +1431,23 @@ }, "htmltools": { "Package": "htmltools", - "Version": "0.5.5", + "Version": "0.5.8.1", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "htmltools", - "RemoteRef": "htmltools", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "0.5.5", + "Repository": "CRAN", "Requirements": [ "R", "base64enc", "digest", - "ellipsis", "fastmap", "grDevices", "rlang", "utils" ], - "Hash": "ba0240784ad50a62165058a27459304a" + "Hash": "81d371a9cc60640e74e4ab6ac46dcedc" }, "htmlwidgets": { "Package": "htmlwidgets", - "Version": "1.6.2", + "Version": "1.6.4", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -1453,19 +1458,13 @@ "rmarkdown", "yaml" ], - "Hash": "a865aa85bcb2697f47505bfd70422471" + "Hash": "04291cc45198225444a397606810ac37" }, "httpuv": { "Package": "httpuv", - "Version": "1.6.9", + "Version": "1.6.15", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "httpuv", - "RemoteRef": "httpuv", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.6.9", + "Repository": "CRAN", "Requirements": [ "R", "R6", @@ -1474,19 +1473,13 @@ "promises", "utils" ], - "Hash": "1046aa31a57eae8b357267a56a0b6d8b" + "Hash": "d55aa087c47a63ead0f6fc10f8fa1ee0" }, "httr": { "Package": "httr", - "Version": "1.4.5", + "Version": "1.4.7", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "httr", - "RemoteRef": "httr", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.4.5", + "Repository": "CRAN", "Requirements": [ "R", "R6", @@ -1495,78 +1488,39 @@ "mime", "openssl" ], - "Hash": "f6844033201269bec3ca0097bc6c97b3" + "Hash": "ac107251d9d9fd72f0ca8049988f1d7f" }, "httr2": { "Package": "httr2", - "Version": "0.2.2", + "Version": "1.0.5", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "httr2", - "RemoteRef": "httr2", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "0.2.2", + "Repository": "CRAN", "Requirements": [ "R", "R6", "cli", "curl", "glue", + "lifecycle", "magrittr", "openssl", "rappdirs", "rlang", + "vctrs", "withr" ], - "Hash": "5c09fe33064978ede54de42309c8b532" - }, - "igraph": { - "Package": "igraph", - "Version": "1.4.2", - "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "igraph", - "RemoteRef": "igraph", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.4.2", - "Requirements": [ - "Matrix", - "R", - "cpp11", - "grDevices", - "graphics", - "magrittr", - "methods", - "pkgconfig", - "rlang", - "stats", - "utils" - ], - "Hash": "3e476b375c746d899fd53a7281d78191" + "Hash": "d84e4c33206aaace37714901ac2b00c3" }, - "influenceR": { - "Package": "influenceR", - "Version": "0.1.0.1", + "ids": { + "Package": "ids", + "Version": "1.0.1", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "influenceR", - "RemoteRef": "influenceR", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "0.1.0.1", + "Repository": "CRAN", "Requirements": [ - "Matrix", - "R", - "igraph", - "methods", - "utils" + "openssl", + "uuid" ], - "Hash": "04a569c515130c758eff1939499d7cc5" + "Hash": "99df65cfef20e525ed38c3d2577f7190" }, "ini": { "Package": "ini", @@ -1579,19 +1533,25 @@ "Package": "isoband", "Version": "0.2.7", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "isoband", - "RemoteRef": "isoband", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "0.2.7", + "Repository": "CRAN", "Requirements": [ "grid", "utils" ], "Hash": "0080607b4a1a7b28979aecef976d8bc2" }, + "jqr": { + "Package": "jqr", + "Version": "1.3.4", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "lazyeval", + "magrittr" + ], + "Hash": "c3015098f2611e1131c27950c3835da2" + }, "jquerylib": { "Package": "jquerylib", "Version": "0.1.4", @@ -1606,13 +1566,7 @@ "Package": "jsonify", "Version": "1.2.2", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "jsonify", - "RemoteRef": "jsonify", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.2.2", + "Repository": "CRAN", "Requirements": [ "R", "Rcpp", @@ -1622,31 +1576,19 @@ }, "jsonlite": { "Package": "jsonlite", - "Version": "1.8.4", + "Version": "1.8.9", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "jsonlite", - "RemoteRef": "jsonlite", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.8.4", + "Repository": "CRAN", "Requirements": [ "methods" ], - "Hash": "a4269a09a9b865579b2635c77e572374" + "Hash": "4e993b65c2c3ffbffce7bb3e2c6f832b" }, "knitr": { "Package": "knitr", - "Version": "1.42", + "Version": "1.48", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "knitr", - "RemoteRef": "knitr", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.42", + "Repository": "CRAN", "Requirements": [ "R", "evaluate", @@ -1656,41 +1598,35 @@ "xfun", "yaml" ], - "Hash": "8329a9bcc82943c8069104d4be3ee22d" + "Hash": "acf380f300c721da9fde7df115a5f86f" }, "labeling": { "Package": "labeling", - "Version": "0.4.2", + "Version": "0.4.3", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "graphics", "stats" ], - "Hash": "3d5108641f47470611a32d0bdf357a72" + "Hash": "b64ec208ac5bc1852b285f665d6368b3" }, "later": { "Package": "later", - "Version": "1.3.0", + "Version": "1.3.2", "Source": "Repository", - "Repository": "RSPM", + "Repository": "CRAN", "Requirements": [ "Rcpp", "rlang" ], - "Hash": "7e7b457d7766bc47f2a5f21cc2984f8e" + "Hash": "a3e051d405326b8b0012377434c62b37" }, "lattice": { "Package": "lattice", - "Version": "0.21-8", + "Version": "0.22-6", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "lattice", - "RemoteRef": "lattice", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "0.21-8", + "Repository": "CRAN", "Requirements": [ "R", "grDevices", @@ -1699,7 +1635,7 @@ "stats", "utils" ], - "Hash": "0b8a6d63c8770f02a8b5635f3c431e6b" + "Hash": "cc5ac1ba4c238c7ca9fa6a87ca11a7e2" }, "lazyeval": { "Package": "lazyeval", @@ -1713,15 +1649,9 @@ }, "leafem": { "Package": "leafem", - "Version": "0.2.0", + "Version": "0.2.3", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "leafem", - "RemoteRef": "leafem", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "0.2.0", + "Repository": "CRAN", "Requirements": [ "R", "base64enc", @@ -1734,48 +1664,43 @@ "raster", "sf" ], - "Hash": "db6e565a81ce81f137660467644e6fcd" + "Hash": "6b43f986a9a0c1c1810b2deec71bfdf2" }, "leaflet": { "Package": "leaflet", - "Version": "2.1.2", + "Version": "2.2.2", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "leaflet", - "RemoteRef": "leaflet", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "2.1.2", + "Repository": "CRAN", "Requirements": [ "R", "RColorBrewer", - "base64enc", "crosstalk", "htmltools", "htmlwidgets", + "jquerylib", "leaflet.providers", "magrittr", - "markdown", "methods", "png", "raster", "scales", "sp", "stats", - "viridis" + "viridisLite", + "xfun" ], - "Hash": "ac2c7f21c2a6d2579eed8aaae4c42610" + "Hash": "ca012d4a706e21ce217ba15f22d402b2" }, "leaflet.providers": { "Package": "leaflet.providers", - "Version": "1.9.0", + "Version": "2.0.0", "Source": "Repository", - "Repository": "RSPM", + "Repository": "CRAN", "Requirements": [ - "R" + "R", + "htmltools" ], - "Hash": "d3082a7beac4a1aeb96100ff06265d7e" + "Hash": "c0b81ad9d5d932772f7a457ac398cf36" }, "leafsync": { "Package": "leafsync", @@ -1793,61 +1718,43 @@ }, "lifecycle": { "Package": "lifecycle", - "Version": "1.0.3", + "Version": "1.0.4", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "lifecycle", - "RemoteRef": "lifecycle", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.0.3", + "Repository": "CRAN", "Requirements": [ "R", "cli", "glue", "rlang" ], - "Hash": "001cecbeac1cff9301bdc3775ee46a86" + "Hash": "b8552d117e1b808b09a832f589b79035" }, "listenv": { "Package": "listenv", - "Version": "0.9.0", + "Version": "0.9.1", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "listenv", - "RemoteRef": "listenv", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "0.9.0", + "Repository": "CRAN", "Requirements": [ "R" ], - "Hash": "4fbd3679ec8ee169ba28d4b1ea7d0e8f" + "Hash": "e2fca3e12e4db979dccc6e519b10a7ee" }, "lubridate": { "Package": "lubridate", - "Version": "1.9.2", + "Version": "1.9.3", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "lubridate", - "RemoteRef": "lubridate", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.9.2", + "Repository": "CRAN", "Requirements": [ "R", "generics", "methods", "timechange" ], - "Hash": "e25f18436e3efd42c7c590a1c4c15390" + "Hash": "680ad542fbcf801442c83a6ac5a2126c" }, "lwgeom": { "Package": "lwgeom", - "Version": "0.2-11", + "Version": "0.2-14", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -1856,19 +1763,13 @@ "sf", "units" ], - "Hash": "14cf492ea07bf498fb34c80563ba593b" + "Hash": "f1fb7cc9fc60f3b039201174268aaad9" }, "magrittr": { "Package": "magrittr", "Version": "2.0.3", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "magrittr", - "RemoteRef": "magrittr", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "2.0.3", + "Repository": "CRAN", "Requirements": [ "R" ], @@ -1876,64 +1777,15 @@ }, "maps": { "Package": "maps", - "Version": "3.4.1", + "Version": "3.4.2", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "maps", - "RemoteRef": "maps", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "3.4.1", + "Repository": "CRAN", "Requirements": [ "R", "graphics", "utils" ], - "Hash": "644a88fb036ab50cee0b715394eefa1a" - }, - "maptools": { - "Package": "maptools", - "Version": "1.1-6", - "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "maptools", - "RemoteRef": "maptools", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.1-6", - "Requirements": [ - "R", - "foreign", - "grDevices", - "grid", - "lattice", - "methods", - "sp", - "stats", - "utils" - ], - "Hash": "cd65b7fe71f03fca368a1e93db5ed91b" - }, - "markdown": { - "Package": "markdown", - "Version": "1.6", - "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "markdown", - "RemoteRef": "markdown", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.6", - "Requirements": [ - "R", - "commonmark", - "utils", - "xfun" - ], - "Hash": "c0e8495f796d73f2d2e1a8c6964d67e8" + "Hash": "5f7886e53a3b39d4a110c7bd7fce9164" }, "memoise": { "Package": "memoise", @@ -1948,7 +1800,7 @@ }, "mgcv": { "Package": "mgcv", - "Version": "1.8-42", + "Version": "1.9-1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -1961,19 +1813,13 @@ "stats", "utils" ], - "Hash": "3460beba7ccc8946249ba35327ba902a" + "Hash": "110ee9d83b496279960e162ac97764ce" }, "mime": { "Package": "mime", "Version": "0.12", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "mime", - "RemoteRef": "mime", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "0.12", + "Repository": "CRAN", "Requirements": [ "tools" ], @@ -1991,32 +1837,50 @@ ], "Hash": "fec5f52652d60615fdb3957b3d74324a" }, + "modelr": { + "Package": "modelr", + "Version": "0.1.11", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "broom", + "magrittr", + "purrr", + "rlang", + "tibble", + "tidyr", + "tidyselect", + "vctrs" + ], + "Hash": "4f50122dc256b1b6996a4703fecea821" + }, "mongolite": { "Package": "mongolite", - "Version": "2.7.2", + "Version": "2.8.0", "Source": "Repository", - "Repository": "RSPM", + "Repository": "CRAN", "Requirements": [ "jsonlite", "mime", "openssl" ], - "Hash": "f94de81c37b01032a9b54cd8dee7b9ee" + "Hash": "b25506e512fa8d7c5a5d57846964c40c" }, "munsell": { "Package": "munsell", - "Version": "0.5.0", + "Version": "0.5.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "colorspace", "methods" ], - "Hash": "6dfe8bf774944bd5595785e3229d8771" + "Hash": "4fd8900853b746af55b81fda99da7695" }, "nlme": { "Package": "nlme", - "Version": "3.1-162", + "Version": "3.1-166", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -2026,75 +1890,66 @@ "stats", "utils" ], - "Hash": "0984ce8da8da9ead8643c5cbbb60f83e" + "Hash": "ccbb8846be320b627e6aa2b4616a2ded" }, "openssl": { "Package": "openssl", - "Version": "2.0.6", + "Version": "2.2.2", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "openssl", - "RemoteRef": "openssl", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "2.0.6", + "Repository": "CRAN", "Requirements": [ "askpass" ], - "Hash": "0f7cd2962e3044bb940cca4f4b5cecbe" + "Hash": "d413e0fef796c9401a4419485f709ca1" + }, + "packrat": { + "Package": "packrat", + "Version": "0.9.2", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "tools", + "utils" + ], + "Hash": "55ddd2d4a1959535f18393478b0c14a6" }, "parallelly": { "Package": "parallelly", - "Version": "1.35.0", + "Version": "1.38.0", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "parallelly", - "RemoteRef": "parallelly", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.35.0", + "Repository": "CRAN", "Requirements": [ "parallel", "tools", "utils" ], - "Hash": "1cf5a54cfc5dcb0b84037acfd93cbca7" + "Hash": "6e8b139c1904f5e9e14c69db64453bbe" }, "patchwork": { "Package": "patchwork", - "Version": "1.1.2", + "Version": "1.3.0", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "patchwork", - "RemoteRef": "patchwork", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.1.2", + "Repository": "CRAN", "Requirements": [ + "cli", + "farver", "ggplot2", "grDevices", "graphics", "grid", "gtable", + "rlang", "stats", "utils" ], - "Hash": "63b611e9d909a9ed057639d9c3b77152" + "Hash": "e23fb9ecb1258207bcb763d78d513439" }, "pillar": { "Package": "pillar", "Version": "1.9.0", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "pillar", - "RemoteRef": "pillar", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.9.0", + "Repository": "CRAN", "Requirements": [ "cli", "fansi", @@ -2109,28 +1964,18 @@ }, "pkgbuild": { "Package": "pkgbuild", - "Version": "1.4.0", + "Version": "1.4.4", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "pkgbuild", - "RemoteRef": "pkgbuild", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.4.0", + "Repository": "CRAN", "Requirements": [ "R", "R6", "callr", "cli", - "crayon", "desc", - "prettyunits", - "processx", - "rprojroot", - "withr" + "processx" ], - "Hash": "d6c3008d79653a0f267703288230105e" + "Hash": "a29e8e134a460a01e0ca67a4763c595b" }, "pkgconfig": { "Package": "pkgconfig", @@ -2144,9 +1989,9 @@ }, "pkgdown": { "Package": "pkgdown", - "Version": "2.0.7", + "Version": "2.1.1", "Source": "Repository", - "Repository": "RSPM", + "Repository": "CRAN", "Requirements": [ "R", "bslib", @@ -2155,11 +2000,11 @@ "desc", "digest", "downlit", + "fontawesome", "fs", - "httr", + "httr2", "jsonlite", - "magrittr", - "memoise", + "openssl", "purrr", "ragg", "rlang", @@ -2170,27 +2015,29 @@ "xml2", "yaml" ], - "Hash": "16fa15449c930bf3a7761d3c68f8abf9" + "Hash": "df2912d5873422b55a13002510f02c9f" }, "pkgload": { "Package": "pkgload", - "Version": "1.3.2", + "Version": "1.4.0", "Source": "Repository", - "Repository": "RSPM", + "Repository": "CRAN", "Requirements": [ "R", "cli", - "crayon", "desc", "fs", "glue", + "lifecycle", "methods", + "pkgbuild", + "processx", "rlang", "rprojroot", "utils", "withr" ], - "Hash": "6b0c222c5071efe0f3baf3dae9aa40e2" + "Hash": "2ec30ffbeec83da57655b850cf2d3e0e" }, "plogr": { "Package": "plogr", @@ -2201,15 +2048,9 @@ }, "plotly": { "Package": "plotly", - "Version": "4.10.1", + "Version": "4.10.4", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "plotly", - "RemoteRef": "plotly", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "4.10.1", + "Repository": "CRAN", "Requirements": [ "R", "RColorBrewer", @@ -2235,19 +2076,13 @@ "vctrs", "viridisLite" ], - "Hash": "3781cf6971c6467fa842a63725bbee9e" + "Hash": "a1ac5c03ad5ad12b9d1597e00e23c3dd" }, "png": { "Package": "png", "Version": "0.1-8", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "png", - "RemoteRef": "png", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "0.1-8", + "Repository": "CRAN", "Requirements": [ "R" ], @@ -2262,87 +2097,86 @@ }, "prettyunits": { "Package": "prettyunits", - "Version": "1.1.1", + "Version": "1.2.0", "Source": "Repository", "Repository": "CRAN", - "Hash": "95ef9167b75dde9d2ccc3c7528393e7e" + "Requirements": [ + "R" + ], + "Hash": "6b01fc98b1e86c4f705ce9dcfd2f57c7" }, "processx": { "Package": "processx", - "Version": "3.8.1", + "Version": "3.8.4", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "processx", - "RemoteRef": "processx", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "3.8.1", + "Repository": "CRAN", "Requirements": [ "R", "R6", "ps", "utils" ], - "Hash": "d75b4059d781336efba24021915902b4" + "Hash": "0c90a7d71988856bad2a2a45dd871bb9" }, "profvis": { "Package": "profvis", - "Version": "0.3.7", + "Version": "0.4.0", "Source": "Repository", - "Repository": "RSPM", + "Repository": "CRAN", "Requirements": [ "R", "htmlwidgets", - "stringr" + "rlang", + "vctrs" ], - "Hash": "e9d21e79848e02e524bea6f5bd53e7e4" + "Hash": "bffa126bf92987e677c12cfb5651fc1d" }, "progress": { "Package": "progress", - "Version": "1.2.2", + "Version": "1.2.3", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "progress", - "RemoteRef": "progress", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.2.2", + "Repository": "CRAN", "Requirements": [ + "R", "R6", "crayon", "hms", "prettyunits" ], - "Hash": "14dc9f7a3c91ebb14ec5bb9208a07061" + "Hash": "f4625e061cb2865f111b47ff163a5ca6" }, "promises": { "Package": "promises", - "Version": "1.2.0.1", + "Version": "1.3.0", "Source": "Repository", - "Repository": "RSPM", + "Repository": "CRAN", "Requirements": [ "R6", "Rcpp", + "fastmap", "later", "magrittr", "rlang", "stats" ], - "Hash": "4ab2c43adb4d4699cf3690acd378d75d" + "Hash": "434cd5388a3979e74be5c219bcd6e77d" + }, + "protolite": { + "Package": "protolite", + "Version": "2.3.0", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "Rcpp", + "jsonlite" + ], + "Hash": "2bb247d5ab4f9c74c4f28c653c851555" }, "proxy": { "Package": "proxy", "Version": "0.4-27", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "proxy", - "RemoteRef": "proxy", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "0.4-27", + "Repository": "CRAN", "Requirements": [ "R", "stats", @@ -2352,32 +2186,20 @@ }, "ps": { "Package": "ps", - "Version": "1.7.5", + "Version": "1.8.0", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "ps", - "RemoteRef": "ps", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.7.5", + "Repository": "CRAN", "Requirements": [ "R", "utils" ], - "Hash": "709d852d33178db54b17c722e5b1e594" + "Hash": "4b9c8485b0c7eecdf0a9ba5132a45576" }, "purrr": { "Package": "purrr", - "Version": "1.0.1", + "Version": "1.0.2", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "purrr", - "RemoteRef": "purrr", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.0.1", + "Repository": "CRAN", "Requirements": [ "R", "cli", @@ -2386,24 +2208,18 @@ "rlang", "vctrs" ], - "Hash": "d71c815267c640f17ddbf7f16144b4bb" + "Hash": "1cba04a4e9414bdefc9dcaa99649a8dc" }, "ragg": { "Package": "ragg", - "Version": "1.2.5", + "Version": "1.3.3", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "ragg", - "RemoteRef": "ragg", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.2.5", + "Repository": "CRAN", "Requirements": [ "systemfonts", "textshaping" ], - "Hash": "690bc058ea2b1b8a407d3cfe3dce3ef9" + "Hash": "0595fe5e47357111f29ad19101c7d271" }, "rapidjsonr": { "Package": "rapidjsonr", @@ -2424,15 +2240,9 @@ }, "raster": { "Package": "raster", - "Version": "3.6-20", + "Version": "3.6-26", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "raster", - "RemoteRef": "raster", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "3.6-20", + "Repository": "CRAN", "Requirements": [ "R", "Rcpp", @@ -2440,7 +2250,7 @@ "sp", "terra" ], - "Hash": "ebebd9f0f203a129eb2da96470191b82" + "Hash": "7d6eda494f34a644420ac1bfd2a8023a" }, "rcmdcheck": { "Package": "rcmdcheck", @@ -2466,15 +2276,9 @@ }, "readr": { "Package": "readr", - "Version": "2.1.4", + "Version": "2.1.5", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "readr", - "RemoteRef": "readr", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "2.1.4", + "Repository": "CRAN", "Requirements": [ "R", "R6", @@ -2491,7 +2295,29 @@ "utils", "vroom" ], - "Hash": "b5047343b3825f37ad9d3b5d89aa1078" + "Hash": "9de96463d2117f6ac49980577939dfb3" + }, + "readxl": { + "Package": "readxl", + "Version": "1.4.3", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "cellranger", + "cpp11", + "progress", + "tibble", + "utils" + ], + "Hash": "8cf9c239b96df1bbb133b74aef77ad0a" + }, + "rematch": { + "Package": "rematch", + "Version": "2.0.0", + "Source": "Repository", + "Repository": "CRAN", + "Hash": "cbff1b666c6fa6d21202f07e2318d4f1" }, "rematch2": { "Package": "rematch2", @@ -2505,15 +2331,9 @@ }, "remotes": { "Package": "remotes", - "Version": "2.4.2", + "Version": "2.5.0", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "remotes", - "RemoteRef": "remotes", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "2.4.2", + "Repository": "CRAN", "Requirements": [ "R", "methods", @@ -2521,54 +2341,112 @@ "tools", "utils" ], - "Hash": "227045be9aee47e6dda9bb38ac870d67" + "Hash": "3ee025083e66f18db6cf27b56e23e141" }, "renv": { "Package": "renv", - "Version": "0.17.3", + "Version": "1.0.9", "Source": "Repository", - "Repository": "RSPM", + "Repository": "CRAN", "Requirements": [ "utils" ], - "Hash": "4543b8cd233ae25c6aba8548be9e747e" + "Hash": "ef233f0e9064fc88c898b340c9add5c2" + }, + "reprex": { + "Package": "reprex", + "Version": "2.1.1", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "callr", + "cli", + "clipr", + "fs", + "glue", + "knitr", + "lifecycle", + "rlang", + "rmarkdown", + "rstudioapi", + "utils", + "withr" + ], + "Hash": "97b1d5361a24d9fb588db7afe3e5bcbf" + }, + "reticulate": { + "Package": "reticulate", + "Version": "1.39.0", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "Matrix", + "R", + "Rcpp", + "RcppTOML", + "graphics", + "here", + "jsonlite", + "methods", + "png", + "rappdirs", + "rlang", + "utils", + "withr" + ], + "Hash": "e1a5d04397edc1580c5e0ed1dbdccf76" }, "rex": { "Package": "rex", "Version": "1.2.1", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "rex", - "RemoteRef": "rex", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.2.1", + "Repository": "CRAN", "Requirements": [ "lazyeval" ], "Hash": "ae34cd56890607370665bee5bd17812f" }, + "rhub": { + "Package": "rhub", + "Version": "2.0.0", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "R6", + "callr", + "cli", + "curl", + "desc", + "gert", + "gitcreds", + "glue", + "jsonlite", + "pkgbuild", + "processx", + "rappdirs", + "rematch", + "rprojroot", + "utils", + "whoami" + ], + "Hash": "403efdc0d221efb38e2eccdfdc5f4b25" + }, "rlang": { "Package": "rlang", - "Version": "1.1.1", + "Version": "1.1.4", "Source": "Repository", "Repository": "CRAN", - "RemoteType": "standard", - "RemotePkgRef": "rlang", - "RemoteRef": "rlang", - "RemoteRepos": "https://cran.rstudio.com", - "RemotePkgPlatform": "source", - "RemoteSha": "1.1.1", "Requirements": [ "R", "utils" ], - "Hash": "a85c767b55f0bf9b7ad16c6d7baee5bb" + "Hash": "3eec01f8b1dee337674b2e34ab1f9bc1" }, "rmarkdown": { "Package": "rmarkdown", - "Version": "2.21", + "Version": "2.28", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -2581,26 +2459,19 @@ "jsonlite", "knitr", "methods", - "stringr", "tinytex", "tools", "utils", "xfun", "yaml" ], - "Hash": "493df4ae51e2e984952ea4d5c75786a3" + "Hash": "062470668513dcda416927085ee9bdc7" }, "roxygen2": { "Package": "roxygen2", - "Version": "7.2.3", + "Version": "7.3.2", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "roxygen2", - "RemoteRef": "roxygen2", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "7.2.3", + "Repository": "CRAN", "Requirements": [ "R", "R6", @@ -2620,48 +2491,53 @@ "withr", "xml2" ], - "Hash": "7b153c746193b143c14baa072bae4e27" + "Hash": "6ee25f9054a70f44d615300ed531ba8d" }, "rprojroot": { "Package": "rprojroot", - "Version": "2.0.3", + "Version": "2.0.4", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "rprojroot", - "RemoteRef": "rprojroot", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "2.0.3", + "Repository": "CRAN", "Requirements": [ "R" ], - "Hash": "1de7ab598047a87bba48434ba35d497d" + "Hash": "4c8415e0ec1e29f3f4f6fc108bef0144" + }, + "rsconnect": { + "Package": "rsconnect", + "Version": "1.3.1", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "PKI", + "R", + "cli", + "curl", + "digest", + "jsonlite", + "lifecycle", + "openssl", + "packrat", + "renv", + "rlang", + "rstudioapi", + "tools", + "yaml" + ], + "Hash": "90dc9ac04cec50f25657b077d4aaca57" }, "rstudioapi": { "Package": "rstudioapi", - "Version": "0.14", + "Version": "0.16.0", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "rstudioapi", - "RemoteRef": "rstudioapi", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "0.14", - "Hash": "690bd2acc42a9166ce34845884459320" + "Repository": "CRAN", + "Hash": "96710351d642b70e8f02ddeb237c46a7" }, "rversions": { "Package": "rversions", "Version": "2.1.2", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "rversions", - "RemoteRef": "rversions", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "2.1.2", + "Repository": "CRAN", "Requirements": [ "curl", "utils", @@ -2669,19 +2545,39 @@ ], "Hash": "a9881dfed103e83f9de151dc17002cd1" }, + "rvest": { + "Package": "rvest", + "Version": "1.0.4", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "cli", + "glue", + "httr", + "lifecycle", + "magrittr", + "rlang", + "selectr", + "tibble", + "xml2" + ], + "Hash": "0bcf0c6f274e90ea314b812a6d19a519" + }, "rworldmap": { "Package": "rworldmap", - "Version": "1.3-6", + "Version": "1.3-8", "Source": "Repository", - "Repository": "RSPM", + "Repository": "CRAN", "Requirements": [ "R", "fields", - "maptools", "methods", - "sp" + "raster", + "sp", + "terra" ], - "Hash": "b34f146159f7c6c4331caff2062cd5e9" + "Hash": "764b6b1e9c3108357fb51da00b8d92d7" }, "rworldxtra": { "Package": "rworldxtra", @@ -2696,33 +2592,21 @@ }, "s2": { "Package": "s2", - "Version": "1.1.3", + "Version": "1.1.7", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "s2", - "RemoteRef": "s2", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "source", - "RemoteSha": "1.1.3", + "Repository": "CRAN", "Requirements": [ "R", "Rcpp", "wk" ], - "Hash": "e162ffd6ff4bde5264584be359a06f88" + "Hash": "3c8013cdd7f1d20de5762e3f97e5e274" }, "sass": { "Package": "sass", - "Version": "0.4.5", + "Version": "0.4.9", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "sass", - "RemoteRef": "sass", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "0.4.5", + "Repository": "CRAN", "Requirements": [ "R6", "fs", @@ -2730,31 +2614,40 @@ "rappdirs", "rlang" ], - "Hash": "2bb4371a4c80115518261866eab6ab11" + "Hash": "d53dbfddf695303ea4ad66f86e99b95d" }, "scales": { "Package": "scales", - "Version": "1.2.1", + "Version": "1.3.0", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "scales", - "RemoteRef": "scales", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.2.1", + "Repository": "CRAN", "Requirements": [ "R", "R6", "RColorBrewer", + "cli", "farver", + "glue", "labeling", "lifecycle", "munsell", "rlang", "viridisLite" ], - "Hash": "906cb23d2f1c5680b8ce439b44c6fa63" + "Hash": "c19df082ba346b0ffa6f833e92de34d1" + }, + "selectr": { + "Package": "selectr", + "Version": "0.4-2", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "R6", + "methods", + "stringr" + ], + "Hash": "3838071b66e0c566d55cc26bd6e27bf4" }, "sessioninfo": { "Package": "sessioninfo", @@ -2771,15 +2664,9 @@ }, "sf": { "Package": "sf", - "Version": "1.0-12", + "Version": "1.0-17", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "sf", - "RemoteRef": "sf", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.0-12", + "Repository": "CRAN", "Requirements": [ "DBI", "R", @@ -2796,31 +2683,25 @@ "units", "utils" ], - "Hash": "5b41b4f0bd22b38661d82205a87deb4b" + "Hash": "453a7d0263eae87a7831242a74fe9b60" }, "sfheaders": { "Package": "sfheaders", - "Version": "0.4.2", + "Version": "0.4.4", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "sfheaders", - "RemoteRef": "sfheaders", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "0.4.2", + "Repository": "CRAN", "Requirements": [ "R", "Rcpp", "geometries" ], - "Hash": "0b835f43939178a3cac6712fbe8cc2e8" + "Hash": "d63e904c63deda45f3f9149c7dcf8703" }, "shinipsum": { "Package": "shinipsum", - "Version": "0.1.0", + "Version": "0.1.1", "Source": "Repository", - "Repository": "RSPM", + "Repository": "CRAN", "Requirements": [ "DT", "R", @@ -2833,19 +2714,13 @@ "stats", "utils" ], - "Hash": "4633f0a15643313c0ac706b884cb97bd" + "Hash": "68331de856d4936cbc655e4ddba53cb1" }, "shiny": { "Package": "shiny", - "Version": "1.7.4", + "Version": "1.9.1", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "shiny", - "RemoteRef": "shiny", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.7.4", + "Repository": "CRAN", "Requirements": [ "R", "R6", @@ -2853,7 +2728,6 @@ "cachem", "commonmark", "crayon", - "ellipsis", "fastmap", "fontawesome", "glue", @@ -2873,7 +2747,7 @@ "withr", "xtable" ], - "Hash": "c2eae3d8c670fa9dfa35a12066f4a1d5" + "Hash": "6a293995a66e12c48d13aa1f957d09c7" }, "shinythemes": { "Package": "shinythemes", @@ -2890,13 +2764,7 @@ "Package": "sourcetools", "Version": "0.1.7-1", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "sourcetools", - "RemoteRef": "sourcetools", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "0.1.7-1", + "Repository": "CRAN", "Requirements": [ "R" ], @@ -2904,9 +2772,9 @@ }, "sp": { "Package": "sp", - "Version": "1.6-0", + "Version": "2.1-4", "Source": "Repository", - "Repository": "RSPM", + "Repository": "CRAN", "Requirements": [ "R", "grDevices", @@ -2917,81 +2785,57 @@ "stats", "utils" ], - "Hash": "6674e075a078d9c3bde8ba800367347c" + "Hash": "75940133cca2e339afce15a586f85b11" }, "spam": { "Package": "spam", - "Version": "2.9-1", + "Version": "2.10-0", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "spam", - "RemoteRef": "spam", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "2.9-1", + "Repository": "CRAN", "Requirements": [ "R", + "Rcpp", "dotCall64", "grid", "methods" ], - "Hash": "2024a309411ff865488552f108c68333" + "Hash": "ffe1f9e95a4375530747b268f82b5086" }, "stars": { "Package": "stars", - "Version": "0.6-1", + "Version": "0.6-6", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "stars", - "RemoteRef": "stars", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "0.6-1", + "Repository": "CRAN", "Requirements": [ "R", "abind", "classInt", - "lwgeom", "methods", "parallel", "rlang", "sf", "units" ], - "Hash": "4dbde0da28637e13910e898960f2a993" + "Hash": "379c270cf22c8394682d3acd5c62a3ef" }, "stringi": { "Package": "stringi", - "Version": "1.7.12", + "Version": "1.8.4", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "stringi", - "RemoteRef": "stringi", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.7.12", + "Repository": "CRAN", "Requirements": [ "R", "stats", "tools", "utils" ], - "Hash": "ca8bd84263c77310739d2cf64d84d7c9" + "Hash": "39e1144fd75428983dc3f63aa53dfa91" }, "stringr": { "Package": "stringr", - "Version": "1.5.0", + "Version": "1.5.1", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "stringr", - "RemoteRef": "stringr", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.5.0", + "Repository": "CRAN", "Requirements": [ "R", "cli", @@ -3002,61 +2846,44 @@ "stringi", "vctrs" ], - "Hash": "671a4d384ae9d32fc47a14e98bfa3dc8" + "Hash": "960e2ae9e09656611e0b8214ad543207" }, "sys": { "Package": "sys", - "Version": "3.4.1", + "Version": "3.4.2", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "sys", - "RemoteRef": "sys", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "3.4.1", - "Hash": "34c16f1ef796057bfa06d3f4ff818a5d" + "Repository": "CRAN", + "Hash": "3a1be13d68d47a8cd0bfd74739ca1555" }, "systemfonts": { "Package": "systemfonts", - "Version": "1.0.4", + "Version": "1.1.0", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "systemfonts", - "RemoteRef": "systemfonts", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.0.4", + "Repository": "CRAN", "Requirements": [ "R", - "cpp11" + "cpp11", + "lifecycle" ], - "Hash": "90b28393209827327de889f49935140a" + "Hash": "213b6b8ed5afbf934843e6c3b090d418" }, "terra": { "Package": "terra", - "Version": "1.7-29", + "Version": "1.7-78", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "terra", - "RemoteRef": "terra", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.7-29", + "Repository": "CRAN", "Requirements": [ "R", "Rcpp", "methods" ], - "Hash": "89c24bf35c961e047df79dde2eb69224" + "Hash": "8f020def0792119cb98bd8f696dab22d" }, "testthat": { "Package": "testthat", - "Version": "3.1.7", + "Version": "3.2.1.1", "Source": "Repository", - "Repository": "RSPM", + "Repository": "CRAN", "Requirements": [ "R", "R6", @@ -3065,7 +2892,6 @@ "cli", "desc", "digest", - "ellipsis", "evaluate", "jsonlite", "lifecycle", @@ -3080,37 +2906,26 @@ "waldo", "withr" ], - "Hash": "7eb5fd202a61d2fb78af5869b6c08998" + "Hash": "3f6e7e5e2220856ff865e4834766bf2b" }, "textshaping": { "Package": "textshaping", - "Version": "0.3.6", + "Version": "0.4.0", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "textshaping", - "RemoteRef": "textshaping", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "0.3.6", + "Repository": "CRAN", "Requirements": [ "R", "cpp11", + "lifecycle", "systemfonts" ], - "Hash": "1ab6223d3670fac7143202cb6a2d43d5" + "Hash": "5142f8bc78ed3d819d26461b641627ce" }, "tibble": { "Package": "tibble", "Version": "3.2.1", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "tibble", - "RemoteRef": "tibble", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "3.2.1", + "Repository": "CRAN", "Requirements": [ "R", "fansi", @@ -3127,15 +2942,9 @@ }, "tidyr": { "Package": "tidyr", - "Version": "1.3.0", + "Version": "1.3.1", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "tidyr", - "RemoteRef": "tidyr", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.3.0", + "Repository": "CRAN", "Requirements": [ "R", "cli", @@ -3152,19 +2961,13 @@ "utils", "vctrs" ], - "Hash": "e47debdc7ce599b070c8e78e8ac0cfcf" + "Hash": "915fb7ce036c22a6a33b5a8adb712eb1" }, "tidyselect": { "Package": "tidyselect", - "Version": "1.2.0", + "Version": "1.2.1", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "tidyselect", - "RemoteRef": "tidyselect", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.2.0", + "Repository": "CRAN", "Requirements": [ "R", "cli", @@ -3174,44 +2977,72 @@ "vctrs", "withr" ], - "Hash": "79540e5fcd9e0435af547d885f184fd5" + "Hash": "829f27b9c4919c16b593794a6344d6c0" + }, + "tidyverse": { + "Package": "tidyverse", + "Version": "2.0.0", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "R", + "broom", + "cli", + "conflicted", + "dbplyr", + "dplyr", + "dtplyr", + "forcats", + "ggplot2", + "googledrive", + "googlesheets4", + "haven", + "hms", + "httr", + "jsonlite", + "lubridate", + "magrittr", + "modelr", + "pillar", + "purrr", + "ragg", + "readr", + "readxl", + "reprex", + "rlang", + "rstudioapi", + "rvest", + "stringr", + "tibble", + "tidyr", + "xml2" + ], + "Hash": "c328568cd14ea89a83bd4ca7f54ae07e" }, "timechange": { "Package": "timechange", - "Version": "0.2.0", + "Version": "0.3.0", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "timechange", - "RemoteRef": "timechange", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "0.2.0", + "Repository": "CRAN", "Requirements": [ "R", "cpp11" ], - "Hash": "8548b44f79a35ba1791308b61e6012d7" + "Hash": "c5f3c201b931cd6474d17d8700ccb1c8" }, "tinytex": { "Package": "tinytex", - "Version": "0.45", + "Version": "0.53", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "tinytex", - "RemoteRef": "tinytex", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "0.45", + "Repository": "CRAN", "Requirements": [ "xfun" ], - "Hash": "e4e357f28c2edff493936b6cb30c3d65" + "Hash": "9db859e8aabbb474293dde3097839420" }, "tmap": { "Package": "tmap", - "Version": "3.3-3", + "Version": "3.3-4", "Source": "Repository", "Repository": "CRAN", "Requirements": [ @@ -3236,7 +3067,7 @@ "viridisLite", "widgetframe" ], - "Hash": "7c1c0624e51105988b579d77289cea7b" + "Hash": "c65363bc002492caf754352499ce2386" }, "tmaptools": { "Package": "tmaptools", @@ -3262,37 +3093,42 @@ }, "tzdb": { "Package": "tzdb", - "Version": "0.3.0", + "Version": "0.4.0", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "tzdb", - "RemoteRef": "tzdb", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "0.3.0", + "Repository": "CRAN", "Requirements": [ "R", "cpp11" ], - "Hash": "b2e1cbce7c903eaf23ec05c58e59fb5e" + "Hash": "f561504ec2897f4d46f0c7657e488ae1" + }, + "umap": { + "Package": "umap", + "Version": "0.2.10.0", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "Matrix", + "R", + "RSpectra", + "Rcpp", + "methods", + "openssl", + "reticulate", + "stats" + ], + "Hash": "249dae2d91909b98bc93086d82cd7c7f" }, "units": { "Package": "units", - "Version": "0.8-2", + "Version": "0.8-5", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "units", - "RemoteRef": "units", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "source", - "RemoteSha": "0.8-2", + "Repository": "CRAN", "Requirements": [ "R", "Rcpp" ], - "Hash": "422376fe53419adcde4710d43acbcdd0" + "Hash": "119d19da480e873f72241ff6962ffd83" }, "urlchecker": { "Package": "urlchecker", @@ -3310,9 +3146,9 @@ }, "usethis": { "Package": "usethis", - "Version": "2.1.6", + "Version": "3.0.0", "Source": "Repository", - "Repository": "RSPM", + "Repository": "CRAN", "Requirements": [ "R", "cli", @@ -3337,35 +3173,33 @@ "withr", "yaml" ], - "Hash": "a67a22c201832b12c036cc059f1d137d" + "Hash": "b2fbf93c2127bedd2cbe9b799530d5d2" }, "utf8": { "Package": "utf8", - "Version": "1.2.3", + "Version": "1.2.4", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "utf8", - "RemoteRef": "utf8", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.2.3", + "Repository": "CRAN", + "Requirements": [ + "R" + ], + "Hash": "62b65c52671e6665f803ff02954446e9" + }, + "uuid": { + "Package": "uuid", + "Version": "1.2-1", + "Source": "Repository", + "Repository": "CRAN", "Requirements": [ "R" ], - "Hash": "1fe17157424bb09c48a8b3b550c753bc" + "Hash": "34e965e62a41fcafb1ca60e9b142085b" }, "vctrs": { "Package": "vctrs", - "Version": "0.6.2", + "Version": "0.6.5", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "vctrs", - "RemoteRef": "vctrs", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "0.6.2", + "Repository": "CRAN", "Requirements": [ "R", "cli", @@ -3373,79 +3207,23 @@ "lifecycle", "rlang" ], - "Hash": "a745bda7aff4734c17294bb41d4e4607" - }, - "viridis": { - "Package": "viridis", - "Version": "0.6.2", - "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "viridis", - "RemoteRef": "viridis", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "0.6.2", - "Requirements": [ - "R", - "ggplot2", - "gridExtra", - "stats", - "viridisLite" - ], - "Hash": "ee96aee95a7a563e5496f8991e9fde4b" + "Hash": "c03fa420630029418f7e6da3667aac4a" }, "viridisLite": { "Package": "viridisLite", - "Version": "0.4.1", + "Version": "0.4.2", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "viridisLite", - "RemoteRef": "viridisLite", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "0.4.1", + "Repository": "CRAN", "Requirements": [ "R" ], - "Hash": "62f4b5da3e08d8e5bcba6cac15603f70" - }, - "visNetwork": { - "Package": "visNetwork", - "Version": "2.1.2", - "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "visNetwork", - "RemoteRef": "visNetwork", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "2.1.2", - "Requirements": [ - "R", - "grDevices", - "htmltools", - "htmlwidgets", - "jsonlite", - "magrittr", - "methods", - "stats", - "utils" - ], - "Hash": "3e48b097e8d9a91ecced2ed4817a678d" + "Hash": "c826c7c4241b6fc89ff55aaea3fa7491" }, "vroom": { "Package": "vroom", - "Version": "1.6.3", + "Version": "1.6.5", "Source": "Repository", "Repository": "CRAN", - "RemoteType": "standard", - "RemotePkgRef": "vroom", - "RemoteRef": "vroom", - "RemoteRepos": "https://cran.rstudio.com", - "RemotePkgPlatform": "source", - "RemoteSha": "1.6.3", "Requirements": [ "R", "bit64", @@ -3465,7 +3243,7 @@ "vctrs", "withr" ], - "Hash": "8318e64ffb3a70e652494017ec455561" + "Hash": "390f9315bc0025be03012054103d227c" }, "w3css": { "Package": "w3css", @@ -3473,46 +3251,39 @@ "Source": "GitHub", "RemoteType": "github", "RemoteHost": "api.github.com", - "RemoteUsername": "thinkr-open", "RemoteRepo": "w3css", - "RemoteRef": "master", - "RemoteSha": "566700b0075f13cda9d9aa5fca3cfc9c658f297b", + "RemoteUsername": "thinkr-open", + "RemoteSha": "aae9624b622039f30161683770e8b064798845d7", "Requirements": [ "R", "attempt", "htmltools", "shiny" ], - "Hash": "d57fe693675fc37db31efbf0b3a2c72e" + "Hash": "b4da3c96199e45bb78e7cff5b3aea357" }, "waldo": { "Package": "waldo", - "Version": "0.4.0", + "Version": "0.5.3", "Source": "Repository", - "Repository": "RSPM", + "Repository": "CRAN", "Requirements": [ + "R", "cli", "diffobj", - "fansi", "glue", "methods", "rematch2", "rlang", "tibble" ], - "Hash": "035fba89d0c86e2113120f93301b98ad" + "Hash": "16aa934a49658677d8041df9017329b9" }, "whereami": { "Package": "whereami", "Version": "0.2.0", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "whereami", - "RemoteRef": "whereami", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "0.2.0", + "Repository": "CRAN", "Requirements": [ "R", "cli", @@ -3529,15 +3300,21 @@ "Package": "whisker", "Version": "0.4.1", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "whisker", - "RemoteRef": "whisker", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "0.4.1", + "Repository": "CRAN", "Hash": "c6abfa47a46d281a7d5159d0a8891e88" }, + "whoami": { + "Package": "whoami", + "Version": "1.3.0", + "Source": "Repository", + "Repository": "CRAN", + "Requirements": [ + "httr", + "jsonlite", + "utils" + ], + "Hash": "ef0f4d9b8f2cc2ebeccae1d725b8a023" + }, "widgetframe": { "Package": "widgetframe", "Version": "0.3.1", @@ -3556,83 +3333,62 @@ }, "withr": { "Package": "withr", - "Version": "2.5.0", + "Version": "3.0.1", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "withr", - "RemoteRef": "withr", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "2.5.0", + "Repository": "CRAN", "Requirements": [ "R", "grDevices", - "graphics", - "stats" + "graphics" ], - "Hash": "c0e49a9760983e81e55cdd9be92e7182" + "Hash": "07909200e8bbe90426fbfeb73e1e27aa" }, "wk": { "Package": "wk", - "Version": "0.7.2", + "Version": "0.9.3", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "wk", - "RemoteRef": "wk", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "0.7.2", + "Repository": "CRAN", "Requirements": [ "R" ], - "Hash": "d090e79291f852c4da96b036500d449f" + "Hash": "9ca478d7cb1450b42dcb8af2ea5681cc" }, "xfun": { "Package": "xfun", - "Version": "0.39", + "Version": "0.48", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "xfun", - "RemoteRef": "xfun", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "0.39", + "Repository": "CRAN", "Requirements": [ + "R", + "grDevices", "stats", "tools" ], - "Hash": "8f56e9acb54fb525e66464d57ab58bcb" + "Hash": "89e455b87c84e227eb7f60a1b4e5fe1f" }, "xml2": { "Package": "xml2", - "Version": "1.3.4", + "Version": "1.3.6", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "xml2", - "RemoteRef": "xml2", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "source", - "RemoteSha": "1.3.4", + "Repository": "CRAN", "Requirements": [ "R", - "methods" + "cli", + "methods", + "rlang" ], - "Hash": "7dc765ac9b909487326a7d471fdd3821" + "Hash": "1d0336142f4cd25d8d23cd3ba7a8fb61" }, "xopen": { "Package": "xopen", - "Version": "1.0.0", + "Version": "1.0.1", "Source": "Repository", "Repository": "CRAN", "Requirements": [ "R", "processx" ], - "Hash": "6c85f015dee9cc7710ddd20f86881f58" + "Hash": "423df1e86d5533fcb73c6b02b4923b49" }, "xtable": { "Package": "xtable", @@ -3648,59 +3404,35 @@ }, "xts": { "Package": "xts", - "Version": "0.13.1", + "Version": "0.14.0", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "xts", - "RemoteRef": "xts", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "0.13.1", + "Repository": "CRAN", "Requirements": [ "R", "methods", "zoo" ], - "Hash": "b8aa1235fd8b0ff10756150b792dc60f" + "Hash": "288bc0fd02bb4e1489f37831d8803b2b" }, "yaml": { "Package": "yaml", - "Version": "2.3.7", + "Version": "2.3.10", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "yaml", - "RemoteRef": "yaml", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "2.3.7", - "Hash": "0d0056cc5383fbc240ccd0cb584bf436" + "Repository": "CRAN", + "Hash": "51dab85c6c98e50a18d7551e9d49f76c" }, "zip": { "Package": "zip", - "Version": "2.3.0", + "Version": "2.3.1", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "zip", - "RemoteRef": "zip", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "2.3.0", - "Hash": "d98c94dacb7e0efcf83b0a133a705504" + "Repository": "CRAN", + "Hash": "fcc4bd8e6da2d2011eb64a5e5cc685ab" }, "zoo": { "Package": "zoo", "Version": "1.8-12", "Source": "Repository", - "Repository": "RSPM", - "RemoteType": "standard", - "RemotePkgRef": "zoo", - "RemoteRef": "zoo", - "RemoteRepos": "https://packagemanager.rstudio.com/all/__linux__/focal/latest", - "RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-20.04", - "RemoteSha": "1.8-12", + "Repository": "CRAN", "Requirements": [ "R", "grDevices", diff --git a/renv/activate.R b/renv/activate.R index a8fdc32..c360bf2 100644 --- a/renv/activate.R +++ b/renv/activate.R @@ -2,10 +2,28 @@ local({ # the requested version of renv - version <- "0.17.3" + version <- "1.0.9" + 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") @@ -59,26 +98,154 @@ local({ unloadNamespace("renv") # load bootstrap tools - `%||%` <- function(x, y) { - if (is.environment(x) || length(x)) x else y + ansify <- function(text) { + if (renv_ansify_enabled()) + renv_ansify_enhanced(text) + else + renv_ansify_default(text) + } + + renv_ansify_enabled <- function() { + + override <- Sys.getenv("RENV_ANSIFY_ENABLED", unset = NA) + if (!is.na(override)) + return(as.logical(override)) + + pane <- Sys.getenv("RSTUDIO_CHILD_PROCESS_PANE", unset = NA) + if (identical(pane, "build")) + return(FALSE) + + testthat <- Sys.getenv("TESTTHAT", unset = "false") + if (tolower(testthat) %in% "true") + return(FALSE) + + iderun <- Sys.getenv("R_CLI_HAS_HYPERLINK_IDE_RUN", unset = "false") + if (tolower(iderun) %in% "false") + return(FALSE) + + TRUE + + } + + renv_ansify_default <- function(text) { + text + } + + renv_ansify_enhanced <- function(text) { + + # R help links + pattern <- "`\\?(renv::(?:[^`])+)`" + replacement <- "`\033]8;;ide:help:\\1\a?\\1\033]8;;\a`" + text <- gsub(pattern, replacement, text, perl = TRUE) + + # runnable code + pattern <- "`(renv::(?:[^`])+)`" + replacement <- "`\033]8;;ide:run:\\1\a\\1\033]8;;\a`" + text <- gsub(pattern, replacement, text, perl = TRUE) + + # return ansified text + text + + } + + renv_ansify_init <- function() { + + envir <- renv_envir_self() + if (renv_ansify_enabled()) + assign("ansify", renv_ansify_enhanced, envir = envir) + else + assign("ansify", renv_ansify_default, envir = envir) + } - `%??%` <- function(x, y) { + `%||%` <- function(x, 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 + text <- paste(substring(lines, common), collapse = "\n") + + # substitute in ANSI links for executable renv code + ansify(text) + + } + + 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() { @@ -108,13 +275,6 @@ local({ if (!inherits(repos, "error") && length(repos)) return(repos) - # if we're testing, re-use the test repositories - if (renv_bootstrap_tests_running()) { - repos <- getOption("renv.tests.repos") - if (!is.null(repos)) - return(repos) - } - # retrieve current repos repos <- getOption("repos") @@ -158,33 +318,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") } @@ -208,7 +369,11 @@ local({ ) if ("headers" %in% names(formals(utils::download.file))) - args$headers <- renv_bootstrap_download_custom_headers(url) + { + headers <- renv_bootstrap_download_custom_headers(url) + if (length(headers) && is.character(headers)) + args$headers <- headers + } do.call(utils::download.file, args) @@ -248,8 +413,6 @@ local({ type <- spec$type repos <- spec$repos - message("* Downloading renv ", version, " ... ", appendLF = FALSE) - baseurl <- utils::contrib.url(repos = repos, type = type) ext <- if (identical(type, "source")) ".tar.gz" @@ -266,13 +429,10 @@ local({ condition = identity ) - if (inherits(status, "condition")) { - message("FAILED") + if (inherits(status, "condition")) return(FALSE) - } # report success and return - message("OK (downloaded ", type, ")") destfile } @@ -292,10 +452,22 @@ local({ for (type in types) { for (repos in renv_bootstrap_repos()) { + # build arguments for utils::available.packages() call + args <- list(type = type, repos = repos) + + # add custom headers if available -- note that + # utils::available.packages() will pass this to download.file() + if ("headers" %in% names(formals(utils::download.file))) + { + headers <- renv_bootstrap_download_custom_headers(url) + if (length(headers) && is.character(headers)) + args$headers <- headers + } + # retrieve package database db <- tryCatch( as.data.frame( - utils::available.packages(type = type, repos = repos), + do.call(utils::available.packages, args), stringsAsFactors = FALSE ), error = identity @@ -329,8 +501,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( @@ -338,14 +508,11 @@ local({ condition = identity ) - if (identical(status, 0L)) { - message("OK") + if (identical(status, 0L)) return(destfile) - } } - message("FAILED") return(FALSE) } @@ -368,7 +535,7 @@ local({ 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." + fmt <- "- RENV_BOOTSTRAP_TARBALL is set (%s) but does not exist." msg <- sprintf(fmt, tarball) warning(msg) @@ -377,14 +544,19 @@ local({ } - fmt <- "* Bootstrapping with tarball at path '%s'." - msg <- sprintf(fmt, tarball) - message(msg) - + catf("- Using local tarball '%s'.", tarball) tarball } + renv_bootstrap_github_token <- function() { + for (envvar in c("GITHUB_TOKEN", "GITHUB_PAT", "GH_TOKEN")) { + envval <- Sys.getenv(envvar, unset = NA) + if (!is.na(envval)) + return(envval) + } + } + renv_bootstrap_download_github <- function(version) { enabled <- Sys.getenv("RENV_BOOTSTRAP_FROM_GITHUB", unset = "TRUE") @@ -392,23 +564,21 @@ local({ return(FALSE) # prepare download options - pat <- Sys.getenv("GITHUB_PAT") - if (nzchar(Sys.which("curl")) && nzchar(pat)) { + token <- renv_bootstrap_github_token() + if (nzchar(Sys.which("curl")) && nzchar(token)) { fmt <- "--location --fail --header \"Authorization: token %s\"" - extra <- sprintf(fmt, pat) + extra <- sprintf(fmt, token) saved <- options("download.file.method", "download.file.extra") options(download.file.method = "curl", download.file.extra = extra) on.exit(do.call(base::options, saved), add = TRUE) - } else if (nzchar(Sys.which("wget")) && nzchar(pat)) { + } else if (nzchar(Sys.which("wget")) && nzchar(token)) { fmt <- "--header=\"Authorization: token %s\"" - extra <- sprintf(fmt, pat) + extra <- sprintf(fmt, token) saved <- options("download.file.method", "download.file.extra") options(download.file.method = "wget", download.file.extra = extra) 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) @@ -418,26 +588,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", @@ -445,19 +694,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) } @@ -498,6 +735,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()) @@ -667,34 +907,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-") @@ -718,7 +985,7 @@ local({ hooks <- getHook("renv::autoload") for (hook in hooks) if (is.function(hook)) - tryCatch(hook(), error = warning) + tryCatch(hook(), error = warnify) # load the project renv::load(project) @@ -859,6 +1126,40 @@ 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) { @@ -867,7 +1168,7 @@ local({ # if jsonlite is loaded, use that instead if ("jsonlite" %in% loadedNamespaces()) { - json <- catch(renv_json_read_jsonlite(file, text)) + json <- tryCatch(renv_json_read_jsonlite(file, text), error = identity) if (!inherits(json, "error")) return(json) @@ -876,7 +1177,7 @@ local({ } # otherwise, fall back to the default JSON reader - json <- catch(renv_json_read_default(file, text)) + json <- tryCatch(renv_json_read_default(file, text), error = identity) if (!inherits(json, "error")) return(json) @@ -889,14 +1190,14 @@ local({ } renv_json_read_jsonlite <- function(file = NULL, text = NULL) { - text <- paste(text %||% read(file), collapse = "\n") + 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 %||% read(file), collapse = "\n") + text <- paste(text %||% readLines(file, warn = FALSE), collapse = "\n") pattern <- '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]' locs <- gregexpr(pattern, text, perl = TRUE)[[1]] @@ -944,14 +1245,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))) { @@ -978,7 +1279,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)) } } @@ -998,35 +1299,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 index 1a06760..ffdbb32 100644 --- a/renv/settings.json +++ b/renv/settings.json @@ -7,6 +7,8 @@ "Depends", "LinkingTo" ], + "ppm.enabled": null, + "ppm.ignored.urls": [], "r.version": null, "snapshot.type": "implicit", "use.cache": true,