From 29af5e1fa354dfe893c8f9912a293e2666ab8210 Mon Sep 17 00:00:00 2001 From: Kara Woo Date: Fri, 19 Dec 2025 10:39:46 -0800 Subject: [PATCH 1/3] maintain previous pipe linter behavior --- .lintr | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.lintr b/.lintr index 41b22f67d..015a97392 100644 --- a/.lintr +++ b/.lintr @@ -4,7 +4,8 @@ linters: linters_with_defaults( cyclocomp_linter = NULL, # Issues with R6 classes. object_length_linter(32L), indentation_linter = indentation_linter(hanging_indent_style = "tidy"), - return_linter = NULL + return_linter = NULL, + pipe_consistency_linter = pipe_consistency_linter("auto") ) exclusions: list( "tests/testthat/2024.07.0/", From 03888d33a15a1b5ad6b48af580925e82187b10d2 Mon Sep 17 00:00:00 2001 From: Kara Woo Date: Fri, 19 Dec 2025 10:39:57 -0800 Subject: [PATCH 2/3] remove cyclocomp linter this was removed as a default linter from lintr in 3.2.0 --- .lintr | 1 - 1 file changed, 1 deletion(-) diff --git a/.lintr b/.lintr index 015a97392..bb028bce3 100644 --- a/.lintr +++ b/.lintr @@ -1,7 +1,6 @@ linters: linters_with_defaults( line_length_linter = line_length_linter(120L), object_name_linter = object_name_linter(styles = c("snake_case", "symbols", "CamelCase")), - cyclocomp_linter = NULL, # Issues with R6 classes. object_length_linter(32L), indentation_linter = indentation_linter(hanging_indent_style = "tidy"), return_linter = NULL, From 5749c45e0f6b9caf7fa85fa7bfd83234fa52da5f Mon Sep 17 00:00:00 2001 From: Kara Woo Date: Fri, 19 Dec 2025 11:15:43 -0800 Subject: [PATCH 3/3] fix version parsing in skip_if_connect_older_than --- tests/integrated/helper.R | 3 ++- tests/testthat/test-utils.R | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/integrated/helper.R b/tests/integrated/helper.R index 5d5d4c2bc..78dae1286 100644 --- a/tests/integrated/helper.R +++ b/tests/integrated/helper.R @@ -9,7 +9,8 @@ expect_ptype_equal <- function(actual, expected, exact = TRUE) { } skip_if_connect_older_than <- function(client, version) { - if (numeric_version(safe_server_version(client)) < numeric_version(version)) { + current <- numeric_version(simplify_version(safe_server_version(client))) + if (current < numeric_version(version)) { skip(paste("Requires Connect >=", version)) } } diff --git a/tests/testthat/test-utils.R b/tests/testthat/test-utils.R index 6ed188214..b436a7ce9 100644 --- a/tests/testthat/test-utils.R +++ b/tests/testthat/test-utils.R @@ -3,6 +3,7 @@ test_that("simplify_version works", { expect_identical(simplify_version("1.8.2.1-4"), "1.8.2") expect_identical(simplify_version("10.70.204.1-4"), "10.70.204") expect_identical(simplify_version("10.0.0.0-4"), "10.0.0") + expect_identical(simplify_version("2026.01.0-dev+15-z596093a50w"), "2026.01.0") }) test_that("compare_connect_version works", {