Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: synced file(s) with ssi-dk/AEF-DDF #161

Merged
merged 2 commits into from
Jan 15, 2025
Merged

chore: synced file(s) with ssi-dk/AEF-DDF #161

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
336603e
chore: synced file(s) with ssi-dk/AEF-DDF
RasmusSkytte Jan 15, 2025
d8a1976
chore: Update pak.lock
RasmusSkytte Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion R/0_linters.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ diseasy_code_linters <- function() {
"documentation_template_linter" = documentation_template_linter()
),
lintr::all_linters(
object_length_linter = lintr::object_length_linter(length = 40L), # We allow for longer variable names
line_length_linter = NULL, # We use 120, nolint-aware line length linter instead
cyclocomp_linter = NULL, # Not required in diseasy style guide
keyword_quote_linter = NULL, # Not required in diseasy style guide
Expand Down Expand Up @@ -269,7 +270,7 @@ param_and_field_linter <- function() {

# Remove auto-generated documentation
detection_info <- detection_info |>
dplyr::filter(!stringr::str_detect(.data$rd_line, r"{@(param|field) +[\.\w]+ +`r }"))
dplyr::filter(!stringr::str_detect(.data$rd_line, r"{@(param|field) +[\.\,\w]+ +`r }"))



Expand Down
16 changes: 8 additions & 8 deletions pak.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3508,7 +3508,7 @@
{
"ref": "Rcpp",
"package": "Rcpp",
"version": "1.0.13-1",
"version": "1.0.14",
"type": "standard",
"direct": false,
"binary": true,
Expand All @@ -3520,10 +3520,10 @@
"RemoteRef": "Rcpp",
"RemoteRepos": "https://packagemanager.posit.co/cran/__linux__/noble/latest",
"RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-24.04",
"RemoteSha": "1.0.13-1"
"RemoteSha": "1.0.14"
},
"sources": "https://packagemanager.posit.co/cran/__linux__/noble/latest/src/contrib/Rcpp_1.0.13-1.tar.gz",
"target": "src/contrib/x86_64-pc-linux-gnu-ubuntu-24.04/4.4/Rcpp_1.0.13-1.tar.gz",
"sources": "https://packagemanager.posit.co/cran/__linux__/noble/latest/src/contrib/Rcpp_1.0.14.tar.gz",
"target": "src/contrib/x86_64-pc-linux-gnu-ubuntu-24.04/4.4/Rcpp_1.0.14.tar.gz",
"platform": "x86_64-pc-linux-gnu-ubuntu-24.04",
"rversion": "4.4",
"directpkg": false,
Expand Down Expand Up @@ -4431,7 +4431,7 @@
{
"ref": "testthat",
"package": "testthat",
"version": "3.2.2",
"version": "3.2.3",
"type": "standard",
"direct": false,
"binary": true,
Expand All @@ -4443,10 +4443,10 @@
"RemoteRef": "testthat",
"RemoteRepos": "https://packagemanager.posit.co/cran/__linux__/noble/latest",
"RemotePkgPlatform": "x86_64-pc-linux-gnu-ubuntu-24.04",
"RemoteSha": "3.2.2"
"RemoteSha": "3.2.3"
},
"sources": "https://packagemanager.posit.co/cran/__linux__/noble/latest/src/contrib/testthat_3.2.2.tar.gz",
"target": "src/contrib/x86_64-pc-linux-gnu-ubuntu-24.04/4.4/testthat_3.2.2.tar.gz",
"sources": "https://packagemanager.posit.co/cran/__linux__/noble/latest/src/contrib/testthat_3.2.3.tar.gz",
"target": "src/contrib/x86_64-pc-linux-gnu-ubuntu-24.04/4.4/testthat_3.2.3.tar.gz",
"platform": "x86_64-pc-linux-gnu-ubuntu-24.04",
"rversion": "4.4",
"directpkg": false,
Expand Down
3 changes: 2 additions & 1 deletion tests/testthat/test-0_linters.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,8 @@ test_that("param_and_field_linter works", {
test_that("documentation_template_linter works", {
skip_if_not_installed("lintr")
skip_if_not_installed("devtools")
skip_if(!identical(Sys.getenv("R_CHECK"), "true"), "Skip if running in R_check")
skip_if(!interactive(), "Skip if running in R_check")
skip_on_cran()

lintr::expect_lint(
"#' @param observable text", # rd_observable defined in R/0_documentation.R # nolint: documentation_template_linter, param_and_field_linter
Expand Down
Loading