Skip to content

Commit a1589a4

Browse files
Merge branch 'main' into split-roxygen-exec
2 parents 1288ccc + edf399c commit a1589a4

File tree

87 files changed

+327
-218
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

87 files changed

+327
-218
lines changed

.github/workflows/check-all-examples.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
2323

2424
steps:
25-
- uses: actions/checkout@v3
25+
- uses: actions/checkout@v4
2626

2727
- uses: r-lib/actions/setup-r@v2
2828
with:

.github/workflows/check-full.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
R_KEEP_PKG_SOURCE: yes
3939

4040
steps:
41-
- uses: actions/checkout@v3
41+
- uses: actions/checkout@v4
4242

4343
- uses: r-lib/actions/setup-pandoc@v2
4444

@@ -56,6 +56,7 @@ jobs:
5656
- uses: r-lib/actions/check-r-package@v2
5757
with:
5858
upload-snapshots: true
59-
error-on: '"note"'
59+
error-on: 'ifelse(getRversion() > "3.6", "warning", "note")'
6060
env:
6161
_R_CHECK_FORCE_SUGGESTS_: false
62+
_R_CHECK_STOP_ON_INVALID_NUMERIC_VERSION_INPUTS_: true

.github/workflows/check-link-rot.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
1616
R_KEEP_PKG_SOURCE: yes
1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919

2020
- uses: r-lib/actions/setup-pandoc@v2
2121

.github/workflows/pkgdown.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
env:
2121
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
2222
steps:
23-
- uses: actions/checkout@v3
23+
- uses: actions/checkout@v4
2424

2525
- uses: r-lib/actions/setup-pandoc@v2
2626

@@ -39,7 +39,7 @@ jobs:
3939

4040
- name: Deploy to GitHub pages 🚀
4141
if: github.event_name != 'pull_request'
42-
uses: JamesIves/[email protected].1
42+
uses: JamesIves/[email protected].3
4343
with:
4444
clean: false
4545
branch: gh-pages

.github/workflows/pre-commit.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ jobs:
1818
)
1919
steps:
2020
- name: Cancel Previous Runs
21-
uses: styfle/cancel-workflow-action@0.11.0
21+
uses: styfle/cancel-workflow-action@0.12.0
2222
with:
2323
access_token: ${{ github.token }}
24-
- uses: actions/checkout@v3
24+
- uses: actions/checkout@v4
2525
with:
2626
fetch-depth: 0
2727
- name: Install system dependencies

.github/workflows/test-coverage.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
1616

1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919

2020
- uses: r-lib/actions/setup-r@v2
2121
with:

.github/workflows/touchstone-receive.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
config: ${{ steps.read_touchstone_config.outputs.config }}
2525
steps:
2626
- name: Checkout repo
27-
uses: actions/checkout@v3
27+
uses: actions/checkout@v4
2828
with:
2929
fetch-depth: 0
3030

.pre-commit-config.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ default_language_version:
66

77
repos:
88
- repo: https://github.com/lorenzwalthert/precommit
9-
rev: v0.3.2.9007
9+
rev: v0.3.2.9019
1010
hooks:
1111
- id: style-files
1212
args:
@@ -34,8 +34,9 @@ repos:
3434
- id: roxygenize
3535
additional_dependencies:
3636
- r-lib/pkgapi
37-
38-
37+
38+
39+
3940
- id: use-tidy-description
4041
- id: spell-check
4142
exclude: >

API

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ specify_reindention(regex_pattern = NULL, indention = 0L, comments_only = TRUE)
2727
specify_transformers_drop(spaces = NULL, indention = NULL, line_breaks = NULL, tokens = NULL)
2828
style_dir(path = ".", ..., style = tidyverse_style, transformers = style(...), filetype = c("R", "Rprofile", "Rmd", "Rmarkdown", "Rnw", "Qmd"), recursive = TRUE, exclude_files = NULL, exclude_dirs = c("packrat", "renv"), include_roxygen_examples = TRUE, base_indention = 0L, dry = "off")
2929
style_file(path, ..., style = tidyverse_style, transformers = style(...), include_roxygen_examples = TRUE, base_indention = 0L, dry = "off")
30-
style_pkg(pkg = ".", ..., style = tidyverse_style, transformers = style(...), filetype = c("R", "Rprofile", "Rmd", "Rmarkdown", "Rnw", "Qmd"), exclude_files = c("R/RcppExports.R", "R/cpp11.R"), exclude_dirs = c("packrat", "renv"), include_roxygen_examples = TRUE, base_indention = 0L, dry = "off")
30+
style_pkg(pkg = ".", ..., style = tidyverse_style, transformers = style(...), filetype = c("R", "Rprofile", "Rmd", "Rmarkdown", "Rnw", "Qmd"), exclude_files = c("R/RcppExports\\.R", "R/cpp11\\.R", "R/import-standalone.*\\.R"), exclude_dirs = c("packrat", "renv"), include_roxygen_examples = TRUE, base_indention = 0L, dry = "off")
3131
style_text(text, ..., style = tidyverse_style, transformers = style(...), include_roxygen_examples = TRUE, base_indention = 0L)
3232
tidyverse_math_token_spacing()
3333
tidyverse_reindention()

DESCRIPTION

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
Type: Package
22
Package: styler
33
Title: Non-Invasive Pretty Printing of R Code
4-
Version: 1.9.1
4+
Version: 1.10.2
55
Authors@R:
66
c(person(given = "Kirill",
77
family = "Müller",
@@ -37,7 +37,6 @@ Imports:
3737
Suggests:
3838
data.tree (>= 0.1.6),
3939
digest,
40-
dplyr,
4140
here,
4241
knitr,
4342
prettycode,

0 commit comments

Comments
 (0)