Merge branch 'main' into lorenzwalthert-patch-1

Author: IndrajeetPatil

.github/workflows/check-full.yaml

@@ -12,31 +12,44 @@ jobs:
   R-CMD-check:
     runs-on: ${{ matrix.config.os }}
 
-    name: ${{ matrix.config.os }} (${{ matrix.config.r }})
+    name: ${{ matrix.config.os }} (${{ matrix.config.r }}) ${{ matrix.config.locale }}
 
     strategy:
       fail-fast: false
       matrix:
         config:
-          - {os: macos-latest,   r: 'release'}
+          - { os: macos-latest, r: "release" }
 
-          - {os: windows-latest, r: 'devel'}
-          - {os: windows-latest, r: 'release'}
+          - { os: windows-latest, r: "devel" }
+          - { os: windows-latest, r: "release" }
           # use 4.1 to check with rtools40's older compiler
-          - {os: windows-latest, r: '4.1'}
+          - { os: windows-latest, r: "4.1" }
 
-          - {os: ubuntu-latest,   r: 'devel', http-user-agent: 'release'}
-          - {os: ubuntu-latest,   r: 'release'}
-          - {os: ubuntu-latest,   r: 'oldrel-1'}
-          - {os: ubuntu-latest,   r: 'oldrel-2'}
-          - {os: ubuntu-latest,   r: 'oldrel-3'}
-          - {os: ubuntu-latest,   r: 'oldrel-4'}
+          - { os: ubuntu-latest, r: "devel", locale: "en_US", http-user-agent: "release" }
+          #- { os: ubuntu-latest, r: "release", locale: "zh_CN" }
+          - { os: ubuntu-latest, r: "release" }
+          - { os: ubuntu-latest, r: "oldrel-1" }
+          - { os: ubuntu-latest, r: "oldrel-2" }
+          - { os: ubuntu-latest, r: "oldrel-3" }
+          - { os: ubuntu-latest, r: "oldrel-4" }
 
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
       R_KEEP_PKG_SOURCE: yes
 
     steps:
+      - name: Set 'en_US' locale
+        if: matrix.config.locale == 'en_US'
+        run: |
+          sudo locale-gen en_US
+          echo "LC_ALL=en_US" >> $GITHUB_ENV
+
+      - name: Set 'zh_CN' locale
+        if: matrix.config.locale == 'zh_CN'
+        run: |
+          sudo locale-gen zh_CN
+          echo "LC_ALL=zh_CN" >> $GITHUB_ENV
+
       - uses: actions/checkout@v4
 
       - uses: r-lib/actions/setup-pandoc@v2
@@ -49,6 +62,8 @@ jobs:
 
       - uses: r-lib/actions/setup-r-dependencies@v2
         with:
+          pak-version: devel
+          upgrade: "TRUE"
           extra-packages: any::rcmdcheck
           needs: check
 

.github/workflows/pkgdown.yaml

@@ -39,7 +39,7 @@ jobs:
 
       - name: Deploy to GitHub pages 🚀
         if: github.event_name != 'pull_request'
-        uses: JamesIves/[email protected].0
+        uses: JamesIves/[email protected].1
         with:
           clean: false
           branch: gh-pages

.github/workflows/pre-commit.yaml

@@ -24,19 +24,14 @@ jobs:
       - uses: actions/checkout@v4
         with:
           fetch-depth: 0
-      - name: Install system dependencies
-        if: runner.os == 'Linux'
-        run: |
-          # your system installation code here
-          # sudo apt-get install -y libcurl4-openssl-dev
       - name: Set up Python
-        uses: actions/setup-python@v5
+        uses: actions/setup-python@v5.1.0
         with:
           python-version: "3.9"
           architecture: "x64"
       - name: Run pre-commit
         uses: pre-commit/[email protected]
-        env: 
+        env:
           SKIP: pkgdown
       - name: Commit files
         if: failure() && startsWith(github.ref, 'refs/heads')

.gitignore

@@ -3,6 +3,7 @@
 .Rhistory
 .Rproj.user
 .gitsum
+.vscode
 Meta
 R/scratch
 README.html
@@ -13,6 +14,7 @@ inst/doc
 revdep/
 !revdep/*.md
 !revdep/problems.md
+tests/testthat/*/*-in_tree
 touchstone/*
 !touchstone/config.json
 !touchstone/script.R

.lintr

@@ -1,13 +1,11 @@
-linters: linters_with_tags(
-    tags = NULL,
+linters: all_linters(
     commented_code_linter = NULL,
     cyclocomp_linter = cyclocomp_linter(40),
     fixed_regex_linter = NULL,
     function_argument_linter = NULL,
     indentation_linter = NULL,
     line_length_linter(120L),
     namespace_linter = NULL,
-    nested_ifelse_linter = NULL,
     nzchar_linter = NULL,
     object_name_linter = NULL,
     object_length_linter(70L),

.pre-commit-config.yaml

@@ -6,7 +6,7 @@ default_language_version:
 
 repos:
   - repo: https://github.com/lorenzwalthert/precommit
-    rev: v0.4.0
+    rev: v0.4.2
     hooks:
       - id: style-files
         args:
@@ -102,7 +102,7 @@ repos:
           )$
       - id: pkgdown
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v4.6.0
     hooks:
       - id: check-added-large-files
         args: ["--maxkb=200"]

CONTRIBUTING.md

@@ -98,7 +98,7 @@ The source code is organized as follows:
 | token-create.R | Utilities for creating tokens, mostly to insert braces around mutli-line if statements. |
 | token-define.R | Defines which tokens belong to which group. |
 | transform-code.R, transform-files.R | Transformation of code for APIs that manipulate files (e.g. `style_file()`). |
-| ui.R | User interaces. Top-level functions for styling. |
+| ui.R | User interfaces. Top-level functions for styling. |
 | unindent.R | Certain tokens cause unindention, e.g. closing braces. |
 | utils.R | low-level general purpose utilities. |
 | vertical.R | S3 class for pretty printing of styled code. |

DESCRIPTION

@@ -27,7 +27,7 @@ Depends:
 Imports: 
     cli (>= 3.1.1),
     magrittr (>= 2.0.0),
-    purrr (>= 0.2.3),
+    purrr (>= 1.0.2),
     R.cache (>= 0.15.0),
     rlang (>= 1.0.0),
     rprojroot (>= 1.1),
@@ -53,6 +53,7 @@ Roxygen: list(markdown = TRUE, roclets = c( "rd", "namespace", "collate",
     warning("Please install r-lib/pkgapi to make sure the file API is kept
     up to date"); NULL}))
 RoxygenNote: 7.3.1
+Language: en-US
 Config/testthat/edition: 3
 Config/testthat/parallel: true
 Collate: 

R/compat-dplyr.R

@@ -10,12 +10,6 @@ lead <- function(x, n = 1L, default = NA) {
   c(x[-seq_len(n)], rep(default, n))
 }
 
-
-arrange <- function(.data, ...) {
-  ord <- eval(substitute(order(...)), .data, parent.frame())
-  vec_slice(.data, ord)
-}
-
 arrange_pos_id <- function(data) {
   pos_id <- data$pos_id
   if (is.unsorted(pos_id)) {
@@ -51,9 +45,3 @@ left_join <- function(x, y, by) {
 last <- function(x) {
   x[[length(x)]]
 }
-
-map_dfr <- function(.x, .f, ...) {
-  .f <- purrr::as_mapper(.f, ...)
-  res <- map(.x, .f, ...)
-  vec_rbind(!!!res)
-}

R/roxygen-examples-parse.R

@@ -179,6 +179,6 @@ needs_rd_emulation <- function(roxygen) {
 #' @keywords internal
 post_parse_roxygen <- function(raw) {
   raw %>%
-    paste0(collapse = "") %>%
+    paste(collapse = "") %>%
     convert_newlines_to_linebreaks()
 }