Garrick Aden-Buie 2 лет назад
Родитель
Сommit
1acae30e83
Не найден GPG ключ соответствующий данной подписи
6 измененных файлов: 20987 добавлений и 18846 удалений
  1. +4
    -0
      process/DESCRIPTION
  2. +20584
    -18670
      process/_targets/meta/meta
  3. +226
    -28
      process/renv.lock
  4. +30
    -9
      process/renv/activate.R
  5. +140
    -138
      reports/2023-12-17_about-tables/about-tables.html
  6. +3
    -1
      reports/2023-12-17_about-tables/about-tables.qmd

+ 4
- 0
process/DESCRIPTION Просмотреть файл

@@ -31,7 +31,11 @@ Imports:
docopt,
duckdb,
fastLink,
gt,
here,
lgr,
RSQLite,
snakecase,
tidygeocoder,
tidyr,
visNetwork

+ 20584
- 18670
process/_targets/meta/meta
Разница между файлами не показана из-за своего большого размера
Просмотреть файл


+ 226
- 28
process/renv.lock Просмотреть файл

@@ -15,14 +15,14 @@
"Packages": {
"DBI": {
"Package": "DBI",
"Version": "1.1.3",
"Version": "1.2.2",
"Source": "Repository",
"Repository": "CRAN",
"Repository": "RSPM",
"Requirements": [
"R",
"methods"
],
"Hash": "b2866e62bab9378c3cc9476a1954226b"
"Hash": "164809cd72e1d5160b4cb3aa57f510fe"
},
"MASS": {
"Package": "MASS",
@@ -76,6 +76,25 @@
],
"Hash": "45f0398006e83a5b10b72a90663d8d8c"
},
"RSQLite": {
"Package": "RSQLite",
"Version": "2.3.5",
"Source": "Repository",
"Repository": "RSPM",
"Requirements": [
"DBI",
"R",
"bit64",
"blob",
"cpp11",
"memoise",
"methods",
"pkgconfig",
"plogr",
"rlang"
],
"Hash": "f5a75d57e0a3014a6ef537ac04a80fc6"
},
"Rcpp": {
"Package": "Rcpp",
"Version": "1.0.11",
@@ -114,6 +133,19 @@
],
"Hash": "acb0a5bf38490f26ab8661b467f4f53a"
},
"V8": {
"Package": "V8",
"Version": "4.4.2",
"Source": "Repository",
"Repository": "RSPM",
"Requirements": [
"Rcpp",
"curl",
"jsonlite",
"utils"
],
"Hash": "ca98390ad1cef2a5a609597b49d3d042"
},
"adagio": {
"Package": "adagio",
"Version": "0.9.2",
@@ -199,6 +231,16 @@
],
"Hash": "0c54cf3a08cc0e550fbd64ad33166143"
},
"bigD": {
"Package": "bigD",
"Version": "0.2.0",
"Source": "Repository",
"Repository": "RSPM",
"Requirements": [
"R"
],
"Hash": "93637e906f3fe962413912c956eb44db"
},
"bit": {
"Package": "bit",
"Version": "4.0.5",
@@ -223,6 +265,13 @@
],
"Hash": "9fe98599ca456d6552421db0d6772d8f"
},
"bitops": {
"Package": "bitops",
"Version": "1.0-7",
"Source": "Repository",
"Repository": "RSPM",
"Hash": "b7d8d8ee39869c18d8846a184dd8a1af"
},
"blob": {
"Package": "blob",
"Version": "1.2.4",
@@ -282,14 +331,14 @@
},
"cli": {
"Package": "cli",
"Version": "3.6.1",
"Version": "3.6.2",
"Source": "Repository",
"Repository": "CRAN",
"Repository": "RSPM",
"Requirements": [
"R",
"utils"
],
"Hash": "89e6d8219950eac806ae0c489052048a"
"Hash": "1216ac65ac55ec0058a6f75d7ca0fd52"
},
"clipr": {
"Package": "clipr",
@@ -347,6 +396,13 @@
],
"Hash": "f20c47fd52fae58b4e377c37bb8c335b"
},
"commonmark": {
"Package": "commonmark",
"Version": "1.9.1",
"Source": "Repository",
"Repository": "RSPM",
"Hash": "5d8225445acb167abf7797de48b2ee3c"
},
"cpp11": {
"Package": "cpp11",
"Version": "0.4.6",
@@ -442,17 +498,16 @@
},
"desc": {
"Package": "desc",
"Version": "1.4.2",
"Version": "1.4.3",
"Source": "Repository",
"Repository": "CRAN",
"Repository": "RSPM",
"Requirements": [
"R",
"R6",
"cli",
"rprojroot",
"utils"
],
"Hash": "6b9602c7ebbe87101a9c8edb6e8b6d21"
"Hash": "99b79fcbd6c4d1ce087f5c5c758b384f"
},
"digest": {
"Package": "digest",
@@ -491,9 +546,9 @@
},
"dplyr": {
"Package": "dplyr",
"Version": "1.1.3",
"Version": "1.1.4",
"Source": "Repository",
"Repository": "CRAN",
"Repository": "RSPM",
"Requirements": [
"R",
"R6",
@@ -510,7 +565,7 @@
"utils",
"vctrs"
],
"Hash": "e85ffbebaad5f70e1a2e2ef4302b4949"
"Hash": "fedd9d00c2944ff00a0e2696ccf048ec"
},
"duckdb": {
"Package": "duckdb",
@@ -777,14 +832,14 @@
},
"glue": {
"Package": "glue",
"Version": "1.6.2",
"Version": "1.7.0",
"Source": "Repository",
"Repository": "CRAN",
"Repository": "RSPM",
"Requirements": [
"R",
"methods"
],
"Hash": "4f2596dfb05dac67b9dc558e5c6fba2e"
"Hash": "e0b3a53876554bd45879e596cdb10a52"
},
"graphlayouts": {
"Package": "graphlayouts",
@@ -813,6 +868,36 @@
],
"Hash": "7d7f283939f563670a697165b2cf5560"
},
"gt": {
"Package": "gt",
"Version": "0.10.1",
"Source": "Repository",
"Repository": "RSPM",
"Requirements": [
"R",
"base64enc",
"bigD",
"bitops",
"cli",
"commonmark",
"dplyr",
"fs",
"glue",
"htmltools",
"htmlwidgets",
"juicyjuice",
"magrittr",
"markdown",
"reactable",
"rlang",
"sass",
"scales",
"tidyselect",
"vctrs",
"xml2"
],
"Hash": "03009c105dfae79460b8eb9d8cf791e4"
},
"gtable": {
"Package": "gtable",
"Version": "0.3.4",
@@ -907,24 +992,41 @@
],
"Hash": "a865aa85bcb2697f47505bfd70422471"
},
"httr": {
"Package": "httr",
"Version": "1.4.7",
"Source": "Repository",
"Repository": "RSPM",
"Requirements": [
"R",
"R6",
"curl",
"jsonlite",
"mime",
"openssl"
],
"Hash": "ac107251d9d9fd72f0ca8049988f1d7f"
},
"httr2": {
"Package": "httr2",
"Version": "0.2.3",
"Version": "1.0.0",
"Source": "Repository",
"Repository": "CRAN",
"Repository": "RSPM",
"Requirements": [
"R",
"R6",
"cli",
"curl",
"glue",
"lifecycle",
"magrittr",
"openssl",
"rappdirs",
"rlang",
"vctrs",
"withr"
],
"Hash": "193bb297368afbbb42dc85784a46b36e"
"Hash": "e2b30f1fc039a0bab047dd52bb20ef71"
},
"igraph": {
"Package": "igraph",
@@ -990,6 +1092,16 @@
],
"Hash": "e1b9c55281c5adc4dd113652d9e26768"
},
"juicyjuice": {
"Package": "juicyjuice",
"Version": "0.1.0",
"Source": "Repository",
"Repository": "RSPM",
"Requirements": [
"V8"
],
"Hash": "3bcd11943da509341838da9399e18bce"
},
"knitr": {
"Package": "knitr",
"Version": "1.45",
@@ -1086,6 +1198,19 @@
],
"Hash": "7ce2733a9826b3aeb1775d56fd305472"
},
"markdown": {
"Package": "markdown",
"Version": "1.12",
"Source": "Repository",
"Repository": "RSPM",
"Requirements": [
"R",
"commonmark",
"utils",
"xfun"
],
"Hash": "765cf53992401b3b6c297b69e1edb8bd"
},
"memoise": {
"Package": "memoise",
"Version": "2.0.1",
@@ -1207,6 +1332,13 @@
],
"Hash": "01f28d4278f15c76cddbea05899c5d6f"
},
"plogr": {
"Package": "plogr",
"Version": "0.2.0",
"Source": "Repository",
"Repository": "RSPM",
"Hash": "09eb987710984fc2905c7129c7d85e65"
},
"plotrix": {
"Package": "plotrix",
"Version": "3.8-4",
@@ -1303,6 +1435,31 @@
],
"Hash": "5e3c5dc0b071b21fa128676560dbe94d"
},
"reactR": {
"Package": "reactR",
"Version": "0.5.0",
"Source": "Repository",
"Repository": "RSPM",
"Requirements": [
"htmltools"
],
"Hash": "c9014fd1a435b2d790dd506589cb24e5"
},
"reactable": {
"Package": "reactable",
"Version": "0.4.4",
"Source": "Repository",
"Repository": "RSPM",
"Requirements": [
"R",
"digest",
"htmltools",
"htmlwidgets",
"jsonlite",
"reactR"
],
"Hash": "6069eb2a6597963eae0605c1875ff14c"
},
"readr": {
"Package": "readr",
"Version": "2.1.4",
@@ -1328,24 +1485,24 @@
},
"renv": {
"Package": "renv",
"Version": "1.0.3",
"Version": "1.0.5",
"Source": "Repository",
"Repository": "CRAN",
"Repository": "RSPM",
"Requirements": [
"utils"
],
"Hash": "41b847654f567341725473431dd0d5ab"
"Hash": "32c3f93e8360f667ca5863272ec8ba6a"
},
"rlang": {
"Package": "rlang",
"Version": "1.1.2",
"Version": "1.1.3",
"Source": "Repository",
"Repository": "CRAN",
"Repository": "RSPM",
"Requirements": [
"R",
"utils"
],
"Hash": "50a6dbdc522936ca35afc5e2082ea91b"
"Hash": "42548638fae05fd9a9b5f3f437fbbbe2"
},
"rmarkdown": {
"Package": "rmarkdown",
@@ -1413,6 +1570,18 @@
],
"Hash": "906cb23d2f1c5680b8ce439b44c6fa63"
},
"snakecase": {
"Package": "snakecase",
"Version": "0.11.1",
"Source": "Repository",
"Repository": "RSPM",
"Requirements": [
"R",
"stringi",
"stringr"
],
"Hash": "58767e44739b76965332e8a4fe3f91f1"
},
"stringdist": {
"Package": "stringdist",
"Version": "0.9.12",
@@ -1518,6 +1687,22 @@
],
"Hash": "a84e2cc86d07289b3b6f5069df7a004c"
},
"tidygeocoder": {
"Package": "tidygeocoder",
"Version": "1.0.5",
"Source": "Repository",
"Repository": "RSPM",
"Requirements": [
"R",
"dplyr",
"httr",
"jsonlite",
"lifecycle",
"progress",
"tibble"
],
"Hash": "44fd552dae5b20c4224e895449e3827a"
},
"tidygraph": {
"Package": "tidygraph",
"Version": "1.2.3",
@@ -1542,9 +1727,9 @@
},
"tidyr": {
"Package": "tidyr",
"Version": "1.3.0",
"Version": "1.3.1",
"Source": "Repository",
"Repository": "CRAN",
"Repository": "RSPM",
"Requirements": [
"R",
"cli",
@@ -1561,7 +1746,7 @@
"utils",
"vctrs"
],
"Hash": "e47debdc7ce599b070c8e78e8ac0cfcf"
"Hash": "915fb7ce036c22a6a33b5a8adb712eb1"
},
"tidyselect": {
"Package": "tidyselect",
@@ -1741,6 +1926,19 @@
],
"Hash": "460a5e0fe46a80ef87424ad216028014"
},
"xml2": {
"Package": "xml2",
"Version": "1.3.6",
"Source": "Repository",
"Repository": "RSPM",
"Requirements": [
"R",
"cli",
"methods",
"rlang"
],
"Hash": "1d0336142f4cd25d8d23cd3ba7a8fb61"
},
"yaml": {
"Package": "yaml",
"Version": "2.3.7",

+ 30
- 9
process/renv/activate.R Просмотреть файл

@@ -2,7 +2,7 @@
local({

# the requested version of renv
version <- "1.0.3"
version <- "1.0.5"
attr(version, "sha") <- NULL

# the project directory
@@ -31,6 +31,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(
@@ -50,9 +58,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")
@@ -1041,7 +1062,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)
@@ -1050,7 +1071,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)
@@ -1063,14 +1084,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]]
@@ -1118,14 +1139,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))) {
@@ -1152,7 +1173,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))
}
}

+ 140
- 138
reports/2023-12-17_about-tables/about-tables.html
Разница между файлами не показана из-за своего большого размера
Просмотреть файл


+ 3
- 1
reports/2023-12-17_about-tables/about-tables.qmd Просмотреть файл

@@ -25,7 +25,9 @@ editor:

```{r setup}
#| include: false
library(tidyverse)
library(dplyr)
library(purrr)
library(tidyr)
library(fs)
pkgload::load_all(here::here("process"))
```

Загрузка…
Отмена
Сохранить