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.

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

Check for new lints and following kebab-case for naming R files #260

Merged
merged 46 commits into from
Jan 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
a82ed6e
Check for new lints
IndrajeetPatil Nov 21, 2023
f02ba74
avoid nesting inside function calls
IndrajeetPatil Nov 21, 2023
2305c90
more cleanup
IndrajeetPatil Nov 21, 2023
46bbf25
more cleanup
IndrajeetPatil Nov 21, 2023
0104a06
to trigger CI again
IndrajeetPatil Nov 21, 2023
71cc114
fix regression and remaining lints
IndrajeetPatil Nov 21, 2023
2d9eaff
Update styler.yaml
IndrajeetPatil Nov 21, 2023
d60037e
bump parameters version
IndrajeetPatil Nov 23, 2023
5dc6d39
update README for linux installation
IndrajeetPatil Nov 26, 2023
2925fd6
bump insight
IndrajeetPatil Nov 28, 2023
cd134ba
to trigger CI
IndrajeetPatil Dec 1, 2023
253959f
use consistent indentation for function args
IndrajeetPatil Dec 2, 2023
d414c08
starwars data has changed in latest dplyr
IndrajeetPatil Dec 2, 2023
236c6ca
Update pkgdown.yaml
IndrajeetPatil Dec 4, 2023
f44c62c
consistently follow kebab-case for filenames
IndrajeetPatil Dec 9, 2023
b06992f
Update .Rbuildignore
IndrajeetPatil Dec 9, 2023
74d5021
fix vignette paths to examples as well
IndrajeetPatil Dec 9, 2023
38927b3
run checks on windows instead
IndrajeetPatil Dec 9, 2023
dd55f12
try macos instead
IndrajeetPatil Dec 9, 2023
eb0dcef
Apply automatic changes
IndrajeetPatil Dec 9, 2023
efff93b
Merge branch 'lints-nov23' of https://github.com/IndrajeetPatil/stats…
IndrajeetPatil Dec 9, 2023
e3b21b6
Apply automatic changes
IndrajeetPatil Dec 9, 2023
e8c9eab
back to ubuntu
IndrajeetPatil Dec 9, 2023
d9abb4e
bump BayesFactor
IndrajeetPatil Dec 10, 2023
f3971ee
Update .lintr
IndrajeetPatil Dec 10, 2023
59b6cc5
Update .lintr
IndrajeetPatil Dec 10, 2023
9060ae3
use r-release for now
IndrajeetPatil Dec 10, 2023
e9c41f0
Update pre-commit.yaml
IndrajeetPatil Dec 11, 2023
f4653bf
minor formatting changes
IndrajeetPatil Dec 12, 2023
4713e59
bump Pandoc
IndrajeetPatil Dec 13, 2023
a3133ed
Update data.R
IndrajeetPatil Dec 13, 2023
e91d1b4
update snapshots
IndrajeetPatil Dec 15, 2023
4b15dbf
fix build failure
IndrajeetPatil Dec 15, 2023
026037e
Revert "fix build failure"
IndrajeetPatil Dec 15, 2023
15a8dcf
Update switch-functions.R
IndrajeetPatil Dec 15, 2023
2ac5f15
bump Pandoc
IndrajeetPatil Dec 16, 2023
d7f73d7
Update codemeta.json
IndrajeetPatil Dec 22, 2023
5fd2477
minor
IndrajeetPatil Dec 27, 2023
8b6bb75
minor
IndrajeetPatil Dec 28, 2023
e482755
use pak to upgrade to latest pkg versions
IndrajeetPatil Dec 28, 2023
ae78a0e
Revert "use pak to upgrade to latest pkg versions"
IndrajeetPatil Dec 28, 2023
35af4e7
bump pandoc
IndrajeetPatil Jan 7, 2024
97baa63
Apply automatic changes
IndrajeetPatil Jan 7, 2024
e268f06
Update meta_analysis.Rd
IndrajeetPatil Jan 11, 2024
6804fe4
bump roxygen2 version
IndrajeetPatil Jan 13, 2024
5d61b96
band-aid
IndrajeetPatil Jan 13, 2024
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
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.ls-lint.yml
^.*\.Rproj$
^.gitlab-ci\.yaml$
^API$
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/R-CMD-check-devel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@ jobs:

- uses: r-lib/actions/setup-pandoc@v2
with:
pandoc-version: "3.1.7"
pandoc-version: "3.1.11.1"

- uses: r-lib/actions/setup-r@v2
with:
r-version: "devel"
#r-version: "devel"
http-user-agent: "release"
use-public-rspm: true

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/R-CMD-check-hard.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:

- uses: r-lib/actions/setup-pandoc@v2
with:
pandoc-version: "3.1.9"
pandoc-version: "3.1.11.1"

- uses: r-lib/actions/setup-r@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/R-CMD-check-strict.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:

- uses: r-lib/actions/setup-pandoc@v2
with:
pandoc-version: "3.1.9"
pandoc-version: "3.1.11.1"

- uses: r-lib/actions/setup-r@v2
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@ jobs:

#- { os: windows-latest, r: "devel" }
- { os: windows-latest, r: "release" }
- { os: windows-latest, r: "oldrel-1" }
#- { os: windows-latest, r: "oldrel-1" }

#- { os: ubuntu-latest, r: "devel" }
- { os: ubuntu-latest, r: "release" }
- { os: ubuntu-latest, r: "oldrel-1" }
#- { os: ubuntu-latest, r: "oldrel-1" }

env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -42,7 +42,7 @@ jobs:

- uses: r-lib/actions/setup-pandoc@v2
with:
pandoc-version: "3.1.9"
pandoc-version: "3.1.11.1"

- uses: r-lib/actions/setup-r@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-all-examples.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:

- uses: r-lib/actions/setup-r@v2
with:
r-version: "devel"
#r-version: "devel"
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/check-link-rot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ jobs:

- uses: r-lib/actions/setup-pandoc@v2
with:
pandoc-version: "3.1.9"
pandoc-version: "3.1.11.1"

- uses: r-lib/actions/setup-r@v2
with:
r-version: "devel"
#r-version: "devel"
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-random-test-order.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:

- uses: r-lib/actions/setup-r@v2
with:
r-version: "devel"
#r-version: "devel"
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-readme.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:

- uses: r-lib/actions/setup-pandoc@v2
with:
pandoc-version: "3.1.7"
pandoc-version: "3.1.11.1"

- uses: r-lib/actions/setup-r@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-spelling.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:

- uses: r-lib/actions/setup-pandoc@v2
with:
pandoc-version: "3.1.9"
pandoc-version: "3.1.11.1"

- uses: r-lib/actions/setup-r@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-test-warnings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

- uses: r-lib/actions/setup-r@v2
with:
r-version: "devel"
#r-version: "devel"
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v2
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/check-vignette-warnings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ jobs:

- uses: r-lib/actions/setup-pandoc@v2
with:
pandoc-version: "3.1.7"
pandoc-version: "3.1.11.1"

- uses: r-lib/actions/setup-r@v2
with:
r-version: "devel"
#r-version: "devel"
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v2
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/html-5-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

- uses: r-lib/actions/setup-r@v2
with:
r-version: "devel"
#r-version: "devel"
use-public-rspm: true

- uses: r-lib/actions/setup-r-dependencies@v2
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ jobs:
run: |
options(crayon.enabled = TRUE)
library(lintr)
lint_package(linters = linters_with_defaults(
lint_package(linters = linters_with_tags(
tags = NULL,
absolute_path_linter = NULL,
assignment_linter = NULL,
commented_code_linter = NULL,
Expand All @@ -59,8 +60,7 @@ jobs:
undesirable_function_linter = NULL,
undesirable_operator_linter = NULL,
unnecessary_concatenation_linter(allow_single_expression = FALSE),
unused_import_linter = NULL,
defaults = linters_with_tags(tags = NULL)
unused_import_linter = NULL
))
shell: Rscript {0}
env:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pkgdown-no-suggests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:

- uses: r-lib/actions/setup-pandoc@v2
with:
pandoc-version: "3.1.9"
pandoc-version: "3.1.11.1"

- uses: r-lib/actions/setup-r@v2
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:

- uses: r-lib/actions/setup-pandoc@v2
with:
pandoc-version: "3.1.7"
pandoc-version: "3.1.11.1"

- uses: r-lib/actions/setup-r@v2
with:
Expand All @@ -46,7 +46,7 @@ jobs:

- name: Deploy to GitHub pages 🚀
if: github.event_name != 'pull_request'
uses: JamesIves/github-pages-deploy-action@v4.4.3
uses: JamesIves/github-pages-deploy-action@v4.5.0
with:
branch: gh-pages
folder: docs
2 changes: 1 addition & 1 deletion .github/workflows/pre-commit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
fetch-depth: 0

- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.9"
architecture: "x64"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/styler.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
local::.
r-lib/pkgapi
r-lib/styler
r-lib/roxygen2
any::roxygen2
anthonynorth/roxyglobals
needs: |
styler
Expand Down
6 changes: 2 additions & 4 deletions .lintr
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
linters: linters_with_defaults(
linters: all_linters(
absolute_path_linter = NULL,
assignment_linter = NULL,
commented_code_linter = NULL,
cyclocomp_linter(25L),
extraction_operator_linter = NULL,
if_not_else_linter(exceptions = character(0L)),
implicit_integer_linter = NULL,
library_call_linter = NULL,
Expand All @@ -19,6 +18,5 @@ linters: linters_with_defaults(
undesirable_function_linter = NULL,
undesirable_operator_linter = NULL,
unnecessary_concatenation_linter(allow_single_expression = FALSE),
unused_import_linter = NULL,
defaults = linters_with_tags(tags = NULL)
unused_import_linter = NULL
)
6 changes: 6 additions & 0 deletions .ls-lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
ls:
.R: kebab-case

# package name can't be changed to follow kebab-case
ignore:
- '**/statsExpressions*'
15 changes: 8 additions & 7 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ references:
given-names: Jeffrey N.
email: [email protected]
year: '2023'
version: '>= 0.9.12-4.5'
version: '>= 0.9.12-4.6'
- type: software
title: correlation
abstract: 'correlation: Methods for Correlation Analysis'
Expand Down Expand Up @@ -201,7 +201,7 @@ references:
email: [email protected]
orcid: https://orcid.org/0000-0003-4777-038X
year: '2023'
version: '>= 1.1.3'
version: '>= 1.1.4'
- type: software
title: effectsize
abstract: 'effectsize: Indices of Effect Size'
Expand Down Expand Up @@ -255,7 +255,7 @@ references:
abstract: 'insight: Easy Access to Model Information for Various Model Objects'
notes: Imports
url: https://easystats.github.io/insight/
repository: https://easystats.r-universe.dev
repository: https://CRAN.R-project.org/package=insight
authors:
- family-names: Lüdecke
given-names: Daniel
Expand Down Expand Up @@ -290,7 +290,7 @@ references:
email: [email protected]
orcid: https://orcid.org/0000-0002-9271-5075
year: '2023'
version: '>= 0.19.6'
version: '>= 0.19.7'
- type: software
title: magrittr
abstract: 'magrittr: A Forward-Pipe Operator for R'
Expand Down Expand Up @@ -336,13 +336,13 @@ references:
email: [email protected]
orcid: https://orcid.org/0000-0001-9560-6336
year: '2023'
version: '>= 0.21.2'
version: '>= 0.21.3'
- type: software
title: performance
abstract: 'performance: Assessment of Regression Models Performance'
notes: Imports
url: https://easystats.github.io/performance/
repository: https://CRAN.R-project.org/package=performance
repository: https://easystats.r-universe.dev
authors:
- family-names: Lüdecke
given-names: Daniel
Expand Down Expand Up @@ -537,6 +537,7 @@ references:
email: [email protected]
orcid: https://orcid.org/0000-0001-9560-6336
year: '2023'
version: '>= 0.13.1'
- type: software
title: ggplot2
abstract: 'ggplot2: Create Elegant Data Visualisations Using the Grammar of Graphics'
Expand Down Expand Up @@ -706,7 +707,7 @@ references:
given-names: Hadley
email: [email protected]
year: '2023'
version: '>= 3.2.0'
version: '>= 3.2.1'
- type: software
title: utils
abstract: 'R: A Language and Environment for Statistical Computing'
Expand Down
14 changes: 7 additions & 7 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ Depends:
R (>= 4.1.0)
Imports:
afex (>= 1.3-0),
BayesFactor (>= 0.9.12-4.5),
BayesFactor (>= 0.9.12-4.6),
correlation (>= 0.8.4),
datawizard (>= 0.9.0),
dplyr (>= 1.1.3),
dplyr (>= 1.1.4),
effectsize (>= 0.8.6),
glue,
insight (>= 0.19.6),
insight (>= 0.19.7),
magrittr,
parameters (>= 0.21.2),
parameters (>= 0.21.3),
performance (>= 0.10.8),
PMCMRplus,
purrr (>= 1.0.2),
Expand All @@ -46,7 +46,7 @@ Imports:
WRS2,
zeallot
Suggests:
bayestestR,
bayestestR (>= 0.13.1),
ggplot2,
knitr,
metaBMA,
Expand All @@ -55,7 +55,7 @@ Suggests:
rmarkdown,
rstantools,
survival,
testthat (>= 3.2.0),
testthat (>= 3.2.1),
utils
VignetteBuilder:
knitr
Expand All @@ -66,7 +66,7 @@ Roxygen: list(
markdown = TRUE,
roclets = c("collate", "namespace", "rd", "pkgapi::api_roclet", "roxyglobals::global_roclet")
)
RoxygenNote: 7.2.3.9000
RoxygenNote: 7.3.0
Config/testthat/edition: 3
Config/testthat/parallel: true
Config/Needs/check: anthonynorth/roxyglobals
Loading