Skip to content

Commit

Permalink
Use older lintr version
Browse files Browse the repository at this point in the history
  • Loading branch information
raulcd committed Feb 13, 2025
1 parent feb940f commit bfc6b12
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 6 deletions.
1 change: 0 additions & 1 deletion .github/workflows/r.yml
Original file line number Diff line number Diff line change
Expand Up @@ -406,7 +406,6 @@ jobs:
# we use pak for package installation since it is faster, safer and more convenient
pak::local_install()
pak::pak("lintr@3.1.2")
pak::pak("cyclocomp")
lintr::expect_lint_free()
- name: Dump install logs
shell: cmd
Expand Down
3 changes: 1 addition & 2 deletions ci/docker/linux-apt-lint.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@ RUN cat /arrow/ci/etc/rprofile >> $(R RHOME)/etc/Rprofile.site
# Also ensure parallel compilation of C/C++ code
RUN echo "MAKEFLAGS=-j$(R -s -e 'cat(parallel::detectCores())')" >> $(R RHOME)/etc/Renviron.site
# We don't need arrow's dependencies, only lintr (and its dependencies)
RUN R -e "install.packages('lintr')"
RUN R -e "install.packages('cyclocomp')"
RUN R -e "install.packages('lintr@3.1.2')"

# Docker linter
COPY --from=hadolint /bin/hadolint /usr/bin/hadolint
Expand Down
4 changes: 1 addition & 3 deletions r/.lintr
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,8 @@ linters: linters_with_defaults(
# object_name_linter = object_name_linter(styles = c("snake_case", "camelCase", "CamelCase", "symbols", "dotted.case", "UPPERCASE", "SNAKE_CASE")),
object_length_linter = object_length_linter(40),
object_usage_linter = NULL, # R6 methods are flagged,
cyclocomp_linter = cyclocomp_linter(26), # TODO: reduce to default of 15
cyclocomp_linter = cyclocomp_linter(26) # TODO: reduce to default of 15
# See also https://github.com/r-lib/lintr/issues/804 for cyclocomp issues with R6
# TODO: Fix newly added return_linter. See: https://github.com/apache/arrow/pull/45524#issuecomment-2656149531
return_linter = NULL
)
exclusions: list(
"R/arrowExports.R",
Expand Down

0 comments on commit bfc6b12

Please sign in to comment.