From 0deeb07f00e4fc9f404bac921d9b7b465ab44414 Mon Sep 17 00:00:00 2001 From: florisvdh Date: Fri, 21 Jun 2024 16:06:31 +0200 Subject: [PATCH 1/7] Bump dev version number --- DESCRIPTION | 2 +- NEWS.md | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 85fc167..46aaa82 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: n2khabmon Title: Prepare and Manage N2KHAB Monitoring Schemes -Version: 0.3.0 +Version: 0.3.0.9000 Authors@R: c( person("Floris", "Vanderhaeghe", email = "floris.vanderhaeghe@inbo.be", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-6378-6229")), person("Toon", "Westra", email = "toon.westra@inbo.be", role = c("ctb"), comment = c(ORCID = "0000-0003-2478-9459")), diff --git a/NEWS.md b/NEWS.md index 25f654f..73ef606 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,5 @@ +# n2khabmon (development version) + # n2khabmon 0.3.0 (2024-06-21) - `namelist` data source: update names of some schemes (#13). From 9a411f7ba29e2779ed1e11efd44470a0d94aed97 Mon Sep 17 00:00:00 2001 From: florisvdh Date: Mon, 7 Oct 2024 12:04:45 +0200 Subject: [PATCH 2/7] generate_textdata: update renv & packages (~ n2khab 0.11.0) --- misc/generate_textdata/renv.lock | 199 ++++++++++++------------- misc/generate_textdata/renv/activate.R | 105 +++++++++++-- 2 files changed, 193 insertions(+), 111 deletions(-) diff --git a/misc/generate_textdata/renv.lock b/misc/generate_textdata/renv.lock index ecd3434..463b45f 100644 --- a/misc/generate_textdata/renv.lock +++ b/misc/generate_textdata/renv.lock @@ -70,24 +70,24 @@ }, "Rcpp": { "Package": "Rcpp", - "Version": "1.0.12", + "Version": "1.0.13", "Source": "Repository", "Repository": "RSPM", "Requirements": [ "methods", "utils" ], - "Hash": "5ea2700d21e038ace58269ecdbeb9ec0" + "Hash": "f27411eb6d9c3dada5edd444b8416675" }, "askpass": { "Package": "askpass", - "Version": "1.2.0", + "Version": "1.2.1", "Source": "Repository", "Repository": "RSPM", "Requirements": [ "sys" ], - "Hash": "cad6cf7f1d5f6e906700b9d3e718c796" + "Hash": "c39f4155b3ceb1a9a2799d700fbd4b6a" }, "assertthat": { "Package": "assertthat", @@ -111,7 +111,7 @@ }, "bookdown": { "Package": "bookdown", - "Version": "0.39", + "Version": "0.40", "Source": "Repository", "Repository": "RSPM", "Requirements": [ @@ -124,7 +124,7 @@ "xfun", "yaml" ], - "Hash": "cb4f7066855b6f936e8d25edc9a9cff9" + "Hash": "896a79478a50c78fb035a37148638f4e" }, "brew": { "Package": "brew", @@ -145,7 +145,7 @@ }, "bslib": { "Package": "bslib", - "Version": "0.7.0", + "Version": "0.8.0", "Source": "Repository", "Repository": "RSPM", "Requirements": [ @@ -163,7 +163,7 @@ "rlang", "sass" ], - "Hash": "8644cc53f43828f19133548195d7e59e" + "Hash": "b299c6741ca9746fb227debcb0f9fb6c" }, "cachem": { "Package": "cachem", @@ -232,14 +232,14 @@ }, "cli": { "Package": "cli", - "Version": "3.6.2", + "Version": "3.6.3", "Source": "Repository", "Repository": "RSPM", "Requirements": [ "R", "utils" ], - "Hash": "1216ac65ac55ec0058a6f75d7ca0fd52" + "Hash": "b21916dd77a27642b447374a5d30ecf3" }, "clipr": { "Package": "clipr", @@ -253,24 +253,24 @@ }, "commonmark": { "Package": "commonmark", - "Version": "1.9.1", + "Version": "1.9.2", "Source": "Repository", "Repository": "RSPM", - "Hash": "5d8225445acb167abf7797de48b2ee3c" + "Hash": "14eb0596f987c71535d07c3aff814742" }, "cpp11": { "Package": "cpp11", - "Version": "0.4.7", + "Version": "0.5.0", "Source": "Repository", "Repository": "RSPM", "Requirements": [ "R" ], - "Hash": "5a295d7d963cc5035284dcdbaf334f4e" + "Hash": "91570bba75d0c9d3f1040c835cee8fba" }, "crayon": { "Package": "crayon", - "Version": "1.5.2", + "Version": "1.5.3", "Source": "Repository", "Repository": "RSPM", "Requirements": [ @@ -278,11 +278,11 @@ "methods", "utils" ], - "Hash": "e8a1e41acf02548751f45c718d55aa6a" + "Hash": "859d96e65ef198fd43e82b9628d593ef" }, "credentials": { "Package": "credentials", - "Version": "2.0.1", + "Version": "2.0.2", "Source": "Repository", "Repository": "RSPM", "Requirements": [ @@ -292,17 +292,17 @@ "openssl", "sys" ], - "Hash": "c7844b32098dcbd1c59cbd8dddb4ecc6" + "Hash": "09fd631e607a236f8cc7f9604db32cb8" }, "curl": { "Package": "curl", - "Version": "5.2.1", + "Version": "5.2.3", "Source": "Repository", "Repository": "RSPM", "Requirements": [ "R" ], - "Hash": "411ca2c03b1ce5f548345d2fc2685f7a" + "Hash": "d91263322a58af798f6cf3b13fd56dde" }, "desc": { "Package": "desc", @@ -368,14 +368,14 @@ }, "digest": { "Package": "digest", - "Version": "0.6.35", + "Version": "0.6.37", "Source": "Repository", "Repository": "RSPM", "Requirements": [ "R", "utils" ], - "Hash": "698ece7ba5a4fa4559e3d537e7ec3d31" + "Hash": "33698c4b3127fc9f506654607fb73676" }, "downlit": { "Package": "downlit", @@ -422,7 +422,7 @@ }, "e1071": { "Package": "e1071", - "Version": "1.7-14", + "Version": "1.7-16", "Source": "Repository", "Repository": "RSPM", "Requirements": [ @@ -434,7 +434,7 @@ "stats", "utils" ], - "Hash": "4ef372b716824753719a8a38b258442d" + "Hash": "27a09ca40266a1066d62ef5402dd51d6" }, "ellipsis": { "Package": "ellipsis", @@ -449,14 +449,13 @@ }, "evaluate": { "Package": "evaluate", - "Version": "0.24.0", + "Version": "1.0.0", "Source": "Repository", "Repository": "RSPM", "Requirements": [ - "R", - "methods" + "R" ], - "Hash": "a1066cbc05caee9a4bf6d90f194ff4da" + "Hash": "6b567375113ceb7d9f800de4dd42218e" }, "fansi": { "Package": "fansi", @@ -551,7 +550,7 @@ }, "gert": { "Package": "gert", - "Version": "2.0.1", + "Version": "2.1.2", "Source": "Repository", "Repository": "RSPM", "Requirements": [ @@ -562,7 +561,7 @@ "sys", "zip" ], - "Hash": "f70d3fe2d9e7654213a946963d1591eb" + "Hash": "347d104ed332650b737f509a703c9c7f" }, "gh": { "Package": "gh", @@ -596,7 +595,7 @@ }, "git2rdata": { "Package": "git2rdata", - "Version": "0.4.0", + "Version": "0.4.1", "Source": "Repository", "Repository": "RSPM", "Requirements": [ @@ -606,7 +605,7 @@ "methods", "yaml" ], - "Hash": "873d32667639e500e05450cb54a36b55" + "Hash": "5ad03d40bdc00cc4a42ce88cc8b1a53e" }, "gitcreds": { "Package": "gitcreds", @@ -620,14 +619,14 @@ }, "glue": { "Package": "glue", - "Version": "1.7.0", + "Version": "1.8.0", "Source": "Repository", "Repository": "RSPM", "Requirements": [ "R", "methods" ], - "Hash": "e0b3a53876554bd45879e596cdb10a52" + "Hash": "5899f1eaa825580172bb56c08266f37c" }, "googledrive": { "Package": "googledrive", @@ -756,7 +755,7 @@ }, "httr2": { "Package": "httr2", - "Version": "1.0.1", + "Version": "1.0.5", "Source": "Repository", "Repository": "RSPM", "Requirements": [ @@ -773,7 +772,7 @@ "vctrs", "withr" ], - "Hash": "03d741c92fda96d98c3a3f22494e3b4a" + "Hash": "d84e4c33206aaace37714901ac2b00c3" }, "ids": { "Package": "ids", @@ -805,24 +804,19 @@ }, "jsonlite": { "Package": "jsonlite", - "Version": "1.8.8", + "Version": "1.8.9", "Source": "Repository", "Repository": "RSPM", "Requirements": [ "methods" ], - "Hash": "e1b9c55281c5adc4dd113652d9e26768" + "Hash": "4e993b65c2c3ffbffce7bb3e2c6f832b" }, "knitr": { "Package": "knitr", - "Version": "1.47.2", - "Source": "GitHub", - "RemoteType": "github", - "RemoteHost": "api.github.com", - "RemoteRepo": "knitr", - "RemoteUsername": "yihui", - "RemoteRef": "HEAD", - "RemoteSha": "f50b75b6feadb625ab0b3f76f21f5777e3c53232", + "Version": "1.48", + "Source": "Repository", + "Repository": "RSPM", "Requirements": [ "R", "evaluate", @@ -832,7 +826,7 @@ "xfun", "yaml" ], - "Hash": "871ca8f9bb61c5e646bdb62c90348dd8" + "Hash": "acf380f300c721da9fde7df115a5f86f" }, "later": { "Package": "later", @@ -916,9 +910,11 @@ }, "n2khab": { "Package": "n2khab", - "Version": "0.10.1", + "Version": "0.11.0", "Source": "Repository", "Repository": "https://inbo.r-universe.dev", + "RemoteUrl": "https://github.com/inbo/n2khab", + "RemoteSha": "74bce510ca746c4f32c8807ba70ed482200ab180", "Requirements": [ "R", "assertthat", @@ -936,17 +932,17 @@ "stringr", "tidyr" ], - "Hash": "0c77bc5e4608a9cdefffb054c6cd24c8" + "Hash": "b90c634da91affa0afe269ae9761d035" }, "openssl": { "Package": "openssl", - "Version": "2.2.0", + "Version": "2.2.2", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "askpass" ], - "Hash": "2bcca3848e4734eb3b16103bc9aa4b8e" + "Hash": "d413e0fef796c9401a4419485f709ca1" }, "pander": { "Package": "pander", @@ -1010,7 +1006,7 @@ }, "pkgdown": { "Package": "pkgdown", - "Version": "2.0.9", + "Version": "2.1.1", "Source": "Repository", "Repository": "RSPM", "Requirements": [ @@ -1021,11 +1017,11 @@ "desc", "digest", "downlit", + "fontawesome", "fs", - "httr", + "httr2", "jsonlite", - "magrittr", - "memoise", + "openssl", "purrr", "ragg", "rlang", @@ -1036,28 +1032,29 @@ "xml2", "yaml" ], - "Hash": "8bf1151ed1a48328d71b937e651117a6" + "Hash": "df2912d5873422b55a13002510f02c9f" }, "pkgload": { "Package": "pkgload", - "Version": "1.3.4", + "Version": "1.4.0", "Source": "Repository", "Repository": "RSPM", "Requirements": [ "R", "cli", - "crayon", "desc", "fs", "glue", + "lifecycle", "methods", "pkgbuild", + "processx", "rlang", "rprojroot", "utils", "withr" ], - "Hash": "876c618df5ae610be84356d5d7a5d124" + "Hash": "2ec30ffbeec83da57655b850cf2d3e0e" }, "plyr": { "Package": "plyr", @@ -1102,18 +1099,16 @@ }, "profvis": { "Package": "profvis", - "Version": "0.3.8", + "Version": "0.4.0", "Source": "Repository", "Repository": "RSPM", "Requirements": [ "R", "htmlwidgets", - "purrr", "rlang", - "stringr", "vctrs" ], - "Hash": "aa5a3864397ce6ae03458f98618395a1" + "Hash": "bffa126bf92987e677c12cfb5651fc1d" }, "promises": { "Package": "promises", @@ -1145,14 +1140,14 @@ }, "ps": { "Package": "ps", - "Version": "1.7.6", + "Version": "1.8.0", "Source": "Repository", "Repository": "RSPM", "Requirements": [ "R", "utils" ], - "Hash": "dd2b9319ee0656c8acf45c7f40c59de7" + "Hash": "4b9c8485b0c7eecdf0a9ba5132a45576" }, "purrr": { "Package": "purrr", @@ -1171,14 +1166,14 @@ }, "ragg": { "Package": "ragg", - "Version": "1.3.0", + "Version": "1.3.3", "Source": "Repository", "Repository": "RSPM", "Requirements": [ "systemfonts", "textshaping" ], - "Hash": "082e1a198e3329d571f4448ef0ede4bc" + "Hash": "0595fe5e47357111f29ad19101c7d271" }, "rappdirs": { "Package": "rappdirs", @@ -1245,13 +1240,13 @@ }, "renv": { "Package": "renv", - "Version": "1.0.7", + "Version": "1.0.10", "Source": "Repository", - "Repository": "RSPM", + "Repository": "P3M", "Requirements": [ "utils" ], - "Hash": "397b7b2a265bc5a7a06852524dabae20" + "Hash": "d0387d5687ec933dd7587efd4cfa2d85" }, "rlang": { "Package": "rlang", @@ -1266,9 +1261,9 @@ }, "rmarkdown": { "Package": "rmarkdown", - "Version": "2.27", + "Version": "2.28", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "R", "bslib", @@ -1285,11 +1280,11 @@ "xfun", "yaml" ], - "Hash": "27f9502e1cdbfa195f94e03b0f517484" + "Hash": "062470668513dcda416927085ee9bdc7" }, "roxygen2": { "Package": "roxygen2", - "Version": "7.3.1", + "Version": "7.3.2", "Source": "Repository", "Repository": "RSPM", "Requirements": [ @@ -1311,7 +1306,7 @@ "withr", "xml2" ], - "Hash": "c25fe7b2d8cba73d1b63c947bf7afdb9" + "Hash": "6ee25f9054a70f44d615300ed531ba8d" }, "rprojroot": { "Package": "rprojroot", @@ -1344,7 +1339,7 @@ }, "s2": { "Package": "s2", - "Version": "1.1.6", + "Version": "1.1.7", "Source": "Repository", "Repository": "RSPM", "Requirements": [ @@ -1352,7 +1347,7 @@ "Rcpp", "wk" ], - "Hash": "32f7b1a15bb01ae809022960abad5363" + "Hash": "3c8013cdd7f1d20de5762e3f97e5e274" }, "sass": { "Package": "sass", @@ -1383,7 +1378,7 @@ }, "sf": { "Package": "sf", - "Version": "1.0-16", + "Version": "1.0-17", "Source": "Repository", "Repository": "RSPM", "Requirements": [ @@ -1402,11 +1397,11 @@ "units", "utils" ], - "Hash": "ad57b543f7c3fca05213ba78ff63df9b" + "Hash": "453a7d0263eae87a7831242a74fe9b60" }, "shiny": { "Package": "shiny", - "Version": "1.8.1.1", + "Version": "1.9.1", "Source": "Repository", "Repository": "RSPM", "Requirements": [ @@ -1435,7 +1430,7 @@ "withr", "xtable" ], - "Hash": "54b26646816af9960a4c64d8ceec75d6" + "Hash": "6a293995a66e12c48d13aa1f957d09c7" }, "sourcetools": { "Package": "sourcetools", @@ -1479,10 +1474,10 @@ }, "sys": { "Package": "sys", - "Version": "3.4.2", + "Version": "3.4.3", "Source": "Repository", "Repository": "RSPM", - "Hash": "3a1be13d68d47a8cd0bfd74739ca1555" + "Hash": "de342ebfebdbf40477d0758d05426646" }, "systemfonts": { "Package": "systemfonts", @@ -1609,13 +1604,13 @@ }, "tinytex": { "Package": "tinytex", - "Version": "0.51", + "Version": "0.53", "Source": "Repository", - "Repository": "CRAN", + "Repository": "RSPM", "Requirements": [ "xfun" ], - "Hash": "d44e2fcd2e4e076f0aac540208559d1d" + "Hash": "9db859e8aabbb474293dde3097839420" }, "units": { "Package": "units", @@ -1644,7 +1639,7 @@ }, "usethis": { "Package": "usethis", - "Version": "2.2.3", + "Version": "3.0.0", "Source": "Repository", "Repository": "RSPM", "Requirements": [ @@ -1671,7 +1666,7 @@ "withr", "yaml" ], - "Hash": "d524fd42c517035027f866064417d7e6" + "Hash": "b2fbf93c2127bedd2cbe9b799530d5d2" }, "utf8": { "Package": "utf8", @@ -1685,13 +1680,13 @@ }, "uuid": { "Package": "uuid", - "Version": "1.2-0", + "Version": "1.2-1", "Source": "Repository", "Repository": "RSPM", "Requirements": [ "R" ], - "Hash": "303c19bfd970bece872f93a824e323d9" + "Hash": "34e965e62a41fcafb1ca60e9b142085b" }, "vctrs": { "Package": "vctrs", @@ -1709,21 +1704,20 @@ }, "waldo": { "Package": "waldo", - "Version": "0.5.2", + "Version": "0.5.3", "Source": "Repository", "Repository": "RSPM", "Requirements": [ "R", "cli", "diffobj", - "fansi", "glue", "methods", "rematch2", "rlang", "tibble" ], - "Hash": "c7d3fd6d29ab077cbac8f0e2751449e6" + "Hash": "16aa934a49658677d8041df9017329b9" }, "whisker": { "Package": "whisker", @@ -1734,7 +1728,7 @@ }, "withr": { "Package": "withr", - "Version": "3.0.0", + "Version": "3.0.1", "Source": "Repository", "Repository": "RSPM", "Requirements": [ @@ -1742,29 +1736,30 @@ "grDevices", "graphics" ], - "Hash": "d31b6c62c10dcf11ec530ca6b0dd5d35" + "Hash": "07909200e8bbe90426fbfeb73e1e27aa" }, "wk": { "Package": "wk", - "Version": "0.9.1", + "Version": "0.9.3", "Source": "Repository", "Repository": "RSPM", "Requirements": [ "R" ], - "Hash": "5d4545e140e36476f35f20d0ca87963e" + "Hash": "9ca478d7cb1450b42dcb8af2ea5681cc" }, "xfun": { "Package": "xfun", - "Version": "0.45", + "Version": "0.48", "Source": "Repository", "Repository": "RSPM", "Requirements": [ + "R", "grDevices", "stats", "tools" ], - "Hash": "ca59c87fe305b16a9141a5874c3a7889" + "Hash": "89e455b87c84e227eb7f60a1b4e5fe1f" }, "xml2": { "Package": "xml2", @@ -1804,10 +1799,10 @@ }, "yaml": { "Package": "yaml", - "Version": "2.3.8", + "Version": "2.3.10", "Source": "Repository", "Repository": "RSPM", - "Hash": "29240487a071f535f5e5d5a323b7afbd" + "Hash": "51dab85c6c98e50a18d7551e9d49f76c" }, "zip": { "Package": "zip", diff --git a/misc/generate_textdata/renv/activate.R b/misc/generate_textdata/renv/activate.R index d13f993..c19fc3e 100644 --- a/misc/generate_textdata/renv/activate.R +++ b/misc/generate_textdata/renv/activate.R @@ -2,7 +2,7 @@ local({ # the requested version of renv - version <- "1.0.7" + version <- "1.0.10" attr(version, "sha") <- NULL # the project directory @@ -98,6 +98,66 @@ local({ unloadNamespace("renv") # load bootstrap tools + 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) { if (is.null(x)) y else x } @@ -142,7 +202,10 @@ local({ # compute common indent indent <- regexpr("[^[:space:]]", lines) common <- min(setdiff(indent, -1L)) - leave - paste(substring(lines, common), collapse = "\n") + text <- paste(substring(lines, common), collapse = "\n") + + # substitute in ANSI links for executable renv code + ansify(text) } @@ -306,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) @@ -385,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 @@ -470,6 +549,14 @@ local({ } + 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") @@ -477,16 +564,16 @@ 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) From 137290205366c084087e071206df3de49931652e Mon Sep 17 00:00:00 2001 From: florisvdh Date: Mon, 7 Oct 2024 12:09:36 +0200 Subject: [PATCH 3/7] scheme_types: drop rbbvos+ (~ n2khab 0.11.0) --- inst/textdata/scheme_types.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/inst/textdata/scheme_types.yml b/inst/textdata/scheme_types.yml index a65ed96..62476cd 100644 --- a/inst/textdata/scheme_types.yml +++ b/inst/textdata/scheme_types.yml @@ -1,11 +1,11 @@ ..generic: - git2rdata: 0.4.0 + git2rdata: 0.4.1 optimize: yes NA string: NA sorting: - scheme - type - hash: fd5e35e7671efa6e0d9a6fc691da0ac4c745d2fe + hash: bb6f605be54e590109dd85bbbc9577f06dff7eed data_hash: fc922afef448dda550b49c0d0ac2debc985de441 scheme: class: factor @@ -214,7 +214,6 @@ type: - rbbkam - rbbkam+ - rbbvos - - rbbvos+ - rbbzil - rbbzil+ - '7110' @@ -326,7 +325,6 @@ type: - 57 - 104 - 58 - - 105 - 59 - 106 - 107 From ffc0b4f92bc45f903a1e0d20ce80e191d5424542 Mon Sep 17 00:00:00 2001 From: florisvdh Date: Mon, 7 Oct 2024 12:10:18 +0200 Subject: [PATCH 4/7] schemes, namelist: git2rdata version was updated --- inst/textdata/namelist.yml | 2 +- inst/textdata/schemes.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/inst/textdata/namelist.yml b/inst/textdata/namelist.yml index 5ebc022..0327f0a 100644 --- a/inst/textdata/namelist.yml +++ b/inst/textdata/namelist.yml @@ -1,5 +1,5 @@ ..generic: - git2rdata: 0.4.0 + git2rdata: 0.4.1 optimize: yes NA string: NA sorting: diff --git a/inst/textdata/schemes.yml b/inst/textdata/schemes.yml index 438f593..f40d2d3 100644 --- a/inst/textdata/schemes.yml +++ b/inst/textdata/schemes.yml @@ -1,5 +1,5 @@ ..generic: - git2rdata: 0.4.0 + git2rdata: 0.4.1 optimize: yes NA string: NA sorting: From 13a4c1eb52a77fa09612fda3b47ee1470a611d94 Mon Sep 17 00:00:00 2001 From: florisvdh Date: Mon, 7 Oct 2024 12:12:48 +0200 Subject: [PATCH 5/7] DESCRIPTION: update minimum required n2khab version --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 46aaa82..21afbeb 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -20,7 +20,7 @@ Imports: curl, dplyr, git2rdata, - n2khab (>= 0.10.0), + n2khab (>= 0.11.0), remotes, rlang, stringr, From 40de63d0f2d1bdc5f77b269016b85d88c21c405b Mon Sep 17 00:00:00 2001 From: florisvdh Date: Mon, 7 Oct 2024 12:22:33 +0200 Subject: [PATCH 6/7] Update NEWS.md --- NEWS.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/NEWS.md b/NEWS.md index 73ef606..26da8ae 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,8 @@ # n2khabmon (development version) +- `scheme_types` data source: type `rbbvos+` has been dropped as type level, which is inherited from `{n2khab}` 0.11.0 (#16). +Note that the data source has always only referred to `rbbvos`; `rbbvos` formerly included subtype `rbbvos+`. + # n2khabmon 0.3.0 (2024-06-21) - `namelist` data source: update names of some schemes (#13). From 88d59931ae09f67b4ec293418fd80d46efa6e8b1 Mon Sep 17 00:00:00 2001 From: florisvdh Date: Mon, 7 Oct 2024 12:24:34 +0200 Subject: [PATCH 7/7] Increment version number to 0.3.1 --- .zenodo.json | 2 +- DESCRIPTION | 2 +- NEWS.md | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.zenodo.json b/.zenodo.json index 50cf457..80b8162 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -4,7 +4,7 @@ "license": "GPL-3.0", "upload_type": "software", "access_right": "open", - "version": "0.3.0", + "version": "0.3.1", "creators": [ { "name": "Vanderhaeghe, Floris", diff --git a/DESCRIPTION b/DESCRIPTION index 21afbeb..dba754f 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: n2khabmon Title: Prepare and Manage N2KHAB Monitoring Schemes -Version: 0.3.0.9000 +Version: 0.3.1 Authors@R: c( person("Floris", "Vanderhaeghe", email = "floris.vanderhaeghe@inbo.be", role = c("aut", "cre"), comment = c(ORCID = "0000-0002-6378-6229")), person("Toon", "Westra", email = "toon.westra@inbo.be", role = c("ctb"), comment = c(ORCID = "0000-0003-2478-9459")), diff --git a/NEWS.md b/NEWS.md index 26da8ae..9e4c3c4 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,4 +1,4 @@ -# n2khabmon (development version) +# n2khabmon 0.3.1 (2024-10-07) - `scheme_types` data source: type `rbbvos+` has been dropped as type level, which is inherited from `{n2khab}` 0.11.0 (#16). Note that the data source has always only referred to `rbbvos`; `rbbvos` formerly included subtype `rbbvos+`.