diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 05dab09d9..993e30c8b 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -2,7 +2,7 @@ # R specific hooks: https://github.com/lorenzwalthert/precommit repos: - repo: https://github.com/lorenzwalthert/precommit - rev: v0.4.3.9029 + rev: 77a38466565b7eb356763123ab8c151a436efd5b hooks: - id: style-files args: [--style_pkg=styler, --style_fun=tidyverse_style, --cache-root=styler-perm] diff --git a/inst/hooks/exported/renv-lockfile-validate.R b/inst/hooks/exported/renv-lockfile-validate.R index 491ee5dfd..628ec000e 100755 --- a/inst/hooks/exported/renv-lockfile-validate.R +++ b/inst/hooks/exported/renv-lockfile-validate.R @@ -19,7 +19,10 @@ if (packageVersion("renv") < package_version("1.0.8")) { rlang::abort("You need at least version 1.0.8 of {renv} to run this hook.") } if (!require(jsonvalidate, quietly = TRUE)) { - stop("{jsonvalidate} could not be loaded, please install it.") + stop( + "{jsonvalidate} could not be loaded, please add it", + "to `.pre-commit-config.yaml` -> hook `renv-lockfile-validate` -> `additional_dependencies`" + ) } arguments <- precommit::precommit_docopt(doc) diff --git a/inst/update-dependency-graph-existing-packages.R b/inst/update-dependency-graph-existing-packages.R index cadd1bd58..e6fa6a3d1 100644 --- a/inst/update-dependency-graph-existing-packages.R +++ b/inst/update-dependency-graph-existing-packages.R @@ -5,9 +5,12 @@ hook_deps <- function(root) { dont <- c( "yaml", "usethis", "withr", "rstudioapi", "precommit", "pkgdown", - "httr" + "httr", + "jsonvalidate" + ) + out <- c( + out, "docopt", "roxygen2", "spelling", "styler", "pkgload", "lintr", "knitr", "desc" ) - out <- c(out, "docopt", "roxygen2", "spelling", "styler", "pkgload", "lintr", "knitr", "desc", "jsonvalidate") out <- setdiff(c(unique(c(out, deps[deps$type == "Imports", ]$package))), dont) out <- names(renv:::renv_package_dependencies(out)) return(sort(out)) diff --git a/renv.lock b/renv.lock index f2603b19e..b4419f80f 100644 --- a/renv.lock +++ b/renv.lock @@ -1,6 +1,6 @@ { "R": { - "Version": "4.6.1", + "Version": "4.5.2", "Repositories": [ { "Name": "RSPM", @@ -179,42 +179,6 @@ "Maintainer": "Dirk Eddelbuettel ", "Repository": "RSPM" }, - "V8": { - "Package": "V8", - "Version": "8.2.0", - "Source": "Repository", - "Type": "Package", - "Title": "Embedded JavaScript and WebAssembly Engine for R", - "Authors@R": "c( person(\"Jeroen\", \"Ooms\", role = c(\"aut\", \"cre\"), email = \"jeroenooms@gmail.com\", comment = c(ORCID = \"0000-0002-4035-0289\")), person(\"George\", \"Stagg\", role = \"ctb\", comment = c(ORCID = \"0009-0006-3173-9846\")), person(\"Jan Marvin\", \"Garbuszus\", role = \"ctb\"))", - "Description": "An R interface to V8 : Google's open source JavaScript and WebAssembly engine. This package can be compiled either with V8 or NodeJS when built as a shared library.", - "License": "MIT + file LICENSE", - "URL": "https://jeroen.r-universe.dev/V8", - "BugReports": "https://github.com/jeroen/v8/issues", - "SystemRequirements": "On Linux you can build against libv8-dev (Debian) or v8-devel (Fedora). We also provide static libv8 binaries for most platforms, see the README for details.", - "NeedsCompilation": "yes", - "VignetteBuilder": "knitr", - "Imports": [ - "Rcpp (>= 0.12.12)", - "jsonlite (>= 1.0)", - "curl (>= 1.0)", - "utils" - ], - "LinkingTo": [ - "Rcpp" - ], - "Suggests": [ - "testthat", - "knitr", - "rmarkdown" - ], - "RoxygenNote": "7.3.1", - "Language": "en-US", - "Encoding": "UTF-8", - "Biarch": "true", - "Author": "Jeroen Ooms [aut, cre] (ORCID: ), George Stagg [ctb] (ORCID: ), Jan Marvin Garbuszus [ctb]", - "Maintainer": "Jeroen Ooms ", - "Repository": "RSPM" - }, "backports": { "Package": "backports", "Version": "1.5.1", @@ -435,40 +399,6 @@ "Maintainer": "Davis Vaughan ", "Repository": "RSPM" }, - "curl": { - "Package": "curl", - "Version": "7.1.0", - "Source": "Repository", - "Type": "Package", - "Title": "A Modern and Flexible Web Client for R", - "Authors@R": "c( person(\"Jeroen\", \"Ooms\", role = c(\"aut\", \"cre\"), email = \"jeroenooms@gmail.com\", comment = c(ORCID = \"0000-0002-4035-0289\")), person(\"Hadley\", \"Wickham\", role = \"ctb\"), person(\"Posit Software, PBC\", role = \"cph\"))", - "Description": "Bindings to 'libcurl' for performing fully configurable HTTP/FTP requests where responses can be processed in memory, on disk, or streaming via the callback or connection interfaces. Some knowledge of 'libcurl' is recommended; for a more-user-friendly web client see the 'httr2' package which builds on this package with http specific tools and logic.", - "License": "MIT + file LICENSE", - "SystemRequirements": "libcurl (>= 7.73): libcurl-devel (rpm) or libcurl4-openssl-dev (deb)", - "URL": "https://jeroen.r-universe.dev/curl", - "BugReports": "https://github.com/jeroen/curl/issues", - "Suggests": [ - "spelling", - "testthat (>= 1.0.0)", - "knitr", - "jsonlite", - "later", - "rmarkdown", - "httpuv (>= 1.4.4)", - "webutils" - ], - "VignetteBuilder": "knitr", - "Depends": [ - "R (>= 3.0.0)" - ], - "RoxygenNote": "7.3.2", - "Encoding": "UTF-8", - "Language": "en-US", - "NeedsCompilation": "yes", - "Author": "Jeroen Ooms [aut, cre] (ORCID: ), Hadley Wickham [ctb], Posit Software, PBC [cph]", - "Maintainer": "Jeroen Ooms ", - "Repository": "RSPM" - }, "desc": { "Package": "desc", "Version": "1.4.3", @@ -783,67 +713,6 @@ "Maintainer": "Jeroen Ooms ", "Repository": "RSPM" }, - "jsonlite": { - "Package": "jsonlite", - "Version": "2.0.0", - "Source": "Repository", - "Title": "A Simple and Robust JSON Parser and Generator for R", - "License": "MIT + file LICENSE", - "Depends": [ - "methods" - ], - "Authors@R": "c( person(\"Jeroen\", \"Ooms\", role = c(\"aut\", \"cre\"), email = \"jeroenooms@gmail.com\", comment = c(ORCID = \"0000-0002-4035-0289\")), person(\"Duncan\", \"Temple Lang\", role = \"ctb\"), person(\"Lloyd\", \"Hilaiel\", role = \"cph\", comment=\"author of bundled libyajl\"))", - "URL": "https://jeroen.r-universe.dev/jsonlite https://arxiv.org/abs/1403.2805", - "BugReports": "https://github.com/jeroen/jsonlite/issues", - "Maintainer": "Jeroen Ooms ", - "VignetteBuilder": "knitr, R.rsp", - "Description": "A reasonably fast JSON parser and generator, optimized for statistical data and the web. Offers simple, flexible tools for working with JSON in R, and is particularly powerful for building pipelines and interacting with a web API. The implementation is based on the mapping described in the vignette (Ooms, 2014). In addition to converting JSON data from/to R objects, 'jsonlite' contains functions to stream, validate, and prettify JSON data. The unit tests included with the package verify that all edge cases are encoded and decoded consistently for use with dynamic data in systems and applications.", - "Suggests": [ - "httr", - "vctrs", - "testthat", - "knitr", - "rmarkdown", - "R.rsp", - "sf" - ], - "RoxygenNote": "7.3.2", - "Encoding": "UTF-8", - "NeedsCompilation": "yes", - "Author": "Jeroen Ooms [aut, cre] (), Duncan Temple Lang [ctb], Lloyd Hilaiel [cph] (author of bundled libyajl)", - "Repository": "RSPM" - }, - "jsonvalidate": { - "Package": "jsonvalidate", - "Version": "1.5.0", - "Source": "Repository", - "Title": "Validate 'JSON' Schema", - "Authors@R": "c(person(\"Rich\", \"FitzJohn\", role = c(\"aut\", \"cre\"), email = \"rich.fitzjohn@gmail.com\"), person(\"Rob\", \"Ashton\", role = \"aut\"), person(\"Alex\", \"Hill\", role = \"ctb\"), person(\"Alicia\", \"Schep\", role = \"ctb\"), person(\"Ian\", \"Lyttle\", role = \"ctb\"), person(\"Kara\", \"Woo\", role = \"ctb\"), person(\"Mathias\", \"Buus\", role = c(\"aut\", \"cph\"), comment = \"Author of bundled imjv library\"), person(\"Evgeny\", \"Poberezkin\", role = c(\"aut\", \"cph\"), comment = \"Author of bundled Ajv library\"))", - "Maintainer": "Rich FitzJohn ", - "Description": "Uses the node library 'is-my-json-valid' or 'ajv' to validate 'JSON' against a 'JSON' schema. Drafts 04, 06 and 07 of 'JSON' schema are supported.", - "License": "MIT + file LICENSE", - "URL": "https://docs.ropensci.org/jsonvalidate/, https://github.com/ropensci/jsonvalidate", - "BugReports": "https://github.com/ropensci/jsonvalidate/issues", - "Imports": [ - "R6", - "V8" - ], - "Suggests": [ - "knitr", - "jsonlite", - "rmarkdown", - "testthat", - "withr" - ], - "RoxygenNote": "7.3.2", - "VignetteBuilder": "knitr", - "Encoding": "UTF-8", - "Language": "en-GB", - "Config/testthat/edition": "3", - "NeedsCompilation": "no", - "Author": "Rich FitzJohn [aut, cre], Rob Ashton [aut], Alex Hill [ctb], Alicia Schep [ctb], Ian Lyttle [ctb], Kara Woo [ctb], Mathias Buus [aut, cph] (Author of bundled imjv library), Evgeny Poberezkin [aut, cph] (Author of bundled Ajv library)", - "Repository": "RSPM" - }, "knitr": { "Package": "knitr", "Version": "1.51",