Minor tweaks for consistency (#921)

IndrajeetPatil · Apr 1, 2024 · 8129567 · 8129567
1 parent 7649557
commit 8129567
Show file tree

Hide file tree

Showing 26 changed files with 129 additions and 120 deletions.
diff --git a/.github/experimental-workflows/metadata.yaml b/.github/experimental-workflows/metadata.yaml
@@ -21,6 +21,7 @@ jobs:
       - uses: r-lib/actions/setup-r-dependencies@v2
         with:
           pak-version: devel
+          upgrade: 'TRUE'
           extra-packages: |
             local::.
             cboettig/codemeta

diff --git a/.github/workflows/R-CMD-check-devel.yaml b/.github/workflows/R-CMD-check-devel.yaml
@@ -20,7 +20,7 @@ jobs:
 
       - uses: r-lib/actions/setup-pandoc@v2
         with:
-          pandoc-version: "3.1.12.1"
+          pandoc-version: "3.1.12.3"
 
       - uses: r-lib/actions/setup-r@v2
         with:

diff --git a/.github/workflows/R-CMD-check-hard.yaml b/.github/workflows/R-CMD-check-hard.yaml
@@ -27,7 +27,7 @@ jobs:
 
       - uses: r-lib/actions/setup-pandoc@v2
         with:
-          pandoc-version: "3.1.12.1"
+          pandoc-version: "3.1.12.3"
 
       - uses: r-lib/actions/setup-r@v2
         with:

diff --git a/.github/workflows/R-CMD-check-strict.yaml b/.github/workflows/R-CMD-check-strict.yaml
@@ -40,7 +40,7 @@ jobs:
 
       - uses: r-lib/actions/setup-pandoc@v2
         with:
-          pandoc-version: "3.1.12.1"
+          pandoc-version: "3.1.12.3"
 
       - uses: r-lib/actions/setup-r@v2
         with:

diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -25,10 +25,12 @@ jobs:
           #- { os: macos-latest, r: "release" }
           - { os: macos-latest, r: "oldrel-1" }
 
+          #- { os: windows-latest, r: "next" }
           #- { os: windows-latest, r: "devel" }
           - { os: windows-latest, r: "release" }
           #- { os: windows-latest, r: "oldrel-1" }
 
+          #- { os: ubuntu-latest, r: "next" }
           #- { os: ubuntu-latest, r: "devel" }
           #- { os: ubuntu-latest, r: "release" }
           #- { os: ubuntu-latest, r: "oldrel-1" }
@@ -42,7 +44,7 @@ jobs:
 
       - uses: r-lib/actions/setup-pandoc@v2
         with:
-          pandoc-version: "3.1.12.1"
+          pandoc-version: "3.1.12.3"
 
       - uses: r-lib/actions/setup-r@v2
         with:

diff --git a/.github/workflows/check-link-rot.yaml b/.github/workflows/check-link-rot.yaml
@@ -21,7 +21,7 @@ jobs:
 
       - uses: r-lib/actions/setup-pandoc@v2
         with:
-          pandoc-version: "3.1.12.1"
+          pandoc-version: "3.1.12.3"
 
       - uses: r-lib/actions/setup-r@v2
         with:

diff --git a/.github/workflows/check-readme.yaml b/.github/workflows/check-readme.yaml
@@ -30,7 +30,7 @@ jobs:
 
       - uses: r-lib/actions/setup-pandoc@v2
         with:
-          pandoc-version: "3.1.12.1"
+          pandoc-version: "3.1.12.3"
 
       - uses: r-lib/actions/setup-r@v2
         with:

diff --git a/.github/workflows/check-spelling.yaml b/.github/workflows/check-spelling.yaml
@@ -21,7 +21,7 @@ jobs:
 
       - uses: r-lib/actions/setup-pandoc@v2
         with:
-          pandoc-version: "3.1.12.1"
+          pandoc-version: "3.1.12.3"
 
       - uses: r-lib/actions/setup-r@v2
         with:

diff --git a/.github/workflows/check-vignette-warnings.yaml b/.github/workflows/check-vignette-warnings.yaml
@@ -18,7 +18,7 @@ jobs:
 
       - uses: r-lib/actions/setup-pandoc@v2
         with:
-          pandoc-version: "3.1.12.1"
+          pandoc-version: "3.1.12.3"
 
       - uses: r-lib/actions/setup-r@v2
         with:

diff --git a/.github/workflows/pkgdown-no-suggests.yaml b/.github/workflows/pkgdown-no-suggests.yaml
@@ -25,7 +25,7 @@ jobs:
 
       - uses: r-lib/actions/setup-pandoc@v2
         with:
-          pandoc-version: "3.1.12.1"
+          pandoc-version: "3.1.12.3"
 
       - uses: r-lib/actions/setup-r@v2
         with:

diff --git a/.github/workflows/pkgdown.yaml b/.github/workflows/pkgdown.yaml
@@ -24,7 +24,7 @@ jobs:
 
       - uses: r-lib/actions/setup-pandoc@v2
         with:
-          pandoc-version: "3.1.12.1"
+          pandoc-version: "3.1.12.3"
 
       - uses: r-lib/actions/setup-r@v2
         with:

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -6,14 +6,14 @@ default_language_version:
 
 repos:
   - repo: https://github.com/lorenzwalthert/precommit
-    rev: v0.3.2.9003
+    rev: v0.4.1
     hooks:
       - id: no-browser-statement
       - id: no-debug-statement
       - id: parsable-R
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v4.5.0
     hooks:
       - id: check-added-large-files
       - id: check-json
@@ -29,7 +29,7 @@ repos:
           )$
 
   - repo: https://github.com/lorenzwalthert/gitignore-tidy
-    rev: "475bf5d96927a1887ce2863ff3075b1d7240bc51"
+    rev: "0.1.2"
     hooks:
       - id: tidy-gitignore
 

diff --git a/CITATION.cff b/CITATION.cff
@@ -109,7 +109,7 @@ references:
   abstract: 'datawizard: Easy Data Wrangling and Statistical Transformations'
   notes: Imports
   url: https://easystats.github.io/datawizard/
-  repository: https://easystats.r-universe.dev
+  repository: https://CRAN.R-project.org/package=datawizard
   authors:
   - family-names: Patil
     given-names: Indrajeet
@@ -136,7 +136,7 @@ references:
     email: [email protected]
     orcid: https://orcid.org/0000-0001-9560-6336
   year: '2024'
-  version: '>= 0.9.1'
+  version: '>= 0.10.0'
 - type: software
   title: dplyr
   abstract: 'dplyr: A Grammar of Data Manipulation'
@@ -312,7 +312,7 @@ references:
     email: [email protected]
     orcid: https://orcid.org/0000-0002-9271-5075
   year: '2024'
-  version: '>= 0.19.8'
+  version: '>= 0.19.10'
 - type: software
   title: paletteer
   abstract: 'paletteer: Comprehensive Collection of Color Palettes'
@@ -329,7 +329,7 @@ references:
   abstract: 'parameters: Processing of Model Parameters'
   notes: Imports
   url: https://easystats.github.io/parameters/
-  repository: https://easystats.r-universe.dev
+  repository: https://CRAN.R-project.org/package=parameters
   authors:
   - family-names: Lüdecke
     given-names: Daniel
@@ -355,7 +355,7 @@ references:
     email: [email protected]
     orcid: https://orcid.org/0000-0001-9560-6336
   year: '2024'
-  version: '>= 0.21.5'
+  version: '>= 0.21.6'
 - type: software
   title: patchwork
   abstract: 'patchwork: The Composer of Plots'
@@ -374,7 +374,7 @@ references:
   abstract: 'performance: Assessment of Regression Models Performance'
   notes: Imports
   url: https://easystats.github.io/performance/
-  repository: https://easystats.r-universe.dev
+  repository: https://CRAN.R-project.org/package=performance
   authors:
   - family-names: Lüdecke
     given-names: Daniel
@@ -405,7 +405,7 @@ references:
     email: [email protected]
     orcid: https://orcid.org/0000-0003-4315-6788
   year: '2024'
-  version: '>= 0.10.9'
+  version: '>= 0.11.0'
 - type: software
   title: purrr
   abstract: 'purrr: Functional Programming Tools'
@@ -457,8 +457,8 @@ references:
     given-names: Indrajeet
     email: [email protected]
     orcid: https://orcid.org/0000-0003-1995-6531
-  version: '>= 1.5.3.9000'
   year: '2024'
+  version: '>= 1.5.4'
 - type: software
   title: tidyr
   abstract: 'tidyr: Tidy Messy Data'
@@ -475,7 +475,7 @@ references:
   - family-names: Girlich
     given-names: Maximilian
   year: '2024'
-  version: '>= 1.3.0'
+  version: '>= 1.3.1'
 - type: software
   title: utils
   abstract: 'R: A Language and Environment for Statistical Computing'
@@ -567,7 +567,7 @@ references:
     given-names: Steven
     orcid: https://orcid.org/0000-0002-4394-9078
   year: '2024'
-  version: '>= 1.1-35.1'
+  version: '>= 1.1-35.2'
 - type: software
   title: MASS
   abstract: 'MASS: Support Functions and Datasets for Venables and Ripley''s MASS'
@@ -603,6 +603,13 @@ references:
     email: [email protected]
     orcid: https://orcid.org/0000-0003-3463-4063
   year: '2024'
+  identifiers:
+  - type: url
+    value: https://github.com/wviechtb/metafor
+  - type: url
+    value: https://wviechtb.github.io/metafor/
+  - type: url
+    value: https://www.wvbauer.com
 - type: software
   title: metaplus
   abstract: 'metaplus: Robust Meta-Analysis and Meta-Regression'

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -32,31 +32,31 @@ Depends:
     R (>= 4.1.0)
 Imports:
     correlation (>= 0.8.4),
-    datawizard (>= 0.9.1),
+    datawizard (>= 0.10.0),
     dplyr (>= 1.1.4),
     ggcorrplot (>= 0.1.4.1),
     ggplot2 (>= 3.5.0),
     ggrepel (>= 0.9.5),
     ggside (>= 0.3.0),
     ggsignif (>= 0.6.4),
     glue,
-    insight (>= 0.19.8),
+    insight (>= 0.19.10),
     paletteer (>= 1.6.0),
-    parameters (>= 0.21.5),
+    parameters (>= 0.21.6),
     patchwork (>= 1.2.0),
-    performance (>= 0.10.9),
+    performance (>= 0.11.0),
     purrr (>= 1.0.2),
     rlang,
     stats,
-    statsExpressions (>= 1.5.3.9000),
-    tidyr (>= 1.3.0),
+    statsExpressions (>= 1.5.4),
+    tidyr (>= 1.3.1),
     utils
 Suggests:
     afex,
     BayesFactor (>= 0.9.12-4.7),
     gapminder,
     knitr,
-    lme4 (>= 1.1-35.1),
+    lme4 (>= 1.1-35.2),
     MASS,
     metaBMA,
     metafor,
@@ -71,7 +71,6 @@ Suggests:
     withr,
     WRS2
 Remotes:
-    IndrajeetPatil/statsExpressions,
     tidyverse/ggplot2
 VignetteBuilder: 
     knitr
@@ -86,3 +85,4 @@ RoxygenNote: 7.3.1
 Config/testthat/edition: 3
 Config/testthat/parallel: true
 Config/Needs/check: anthonynorth/roxyglobals
+Config/roxyglobals/unique: TRUE
diff --git a/R/ggbarstats.R b/R/ggbarstats.R
@@ -71,10 +71,9 @@ ggbarstats <- function(
     ...) {
   # data frame ------------------------------------------
 
-  type <- stats_type_switch(type)
-
   # make sure both quoted and unquoted arguments are allowed
   c(x, y) %<-% c(ensym(x), ensym(y))
+  type <- stats_type_switch(type)
 
   data %<>%
     select({{ x }}, {{ y }}, .counts = {{ counts }}) %>%

diff --git a/R/ggbetweenstats.R b/R/ggbetweenstats.R
@@ -186,11 +186,9 @@ ggbetweenstats <- function(
     ...) {
   # data -----------------------------------
 
-
-  type <- stats_type_switch(type)
-
   # make sure both quoted and unquoted arguments are allowed
   c(x, y) %<-% c(ensym(x), ensym(y))
+  type <- stats_type_switch(type)
 
   data %<>%
     select({{ x }}, {{ y }}) %>%

diff --git a/R/ggdotplotstats.R b/R/ggdotplotstats.R
@@ -74,11 +74,9 @@ ggdotplotstats <- function(
     ...) {
   # data -----------------------------------
 
-
-  type <- stats_type_switch(type)
-
-  # ensure the variables work quoted or unquoted
+  # make sure both quoted and unquoted arguments are allowed
   c(x, y) %<-% c(ensym(x), ensym(y))
+  type <- stats_type_switch(type)
 
   data %<>%
     select({{ x }}, {{ y }}) %>%

diff --git a/R/gghistostats.R b/R/gghistostats.R
@@ -89,12 +89,11 @@ gghistostats <- function(
   x <- ensym(x)
   data <- tidyr::drop_na(select(data, {{ x }}))
   x_vec <- pull(data, {{ x }})
+  type <- stats_type_switch(type)
 
   # statistical analysis ------------------------------------------
 
   if (results.subtitle) {
-    type <- stats_type_switch(type)
-
     .f.args <- list(
       data = data,
       x = {{ x }},

diff --git a/R/ggpiestats.R b/R/ggpiestats.R
@@ -94,11 +94,10 @@ ggpiestats <- function(
     ...) {
   # data frame ------------------------------------------
 
-  type <- stats_type_switch(type)
-
   # ensure the variables work quoted or unquoted
   x <- ensym(x)
   y <- if (!quo_is_null(enquo(y))) ensym(y)
+  type <- stats_type_switch(type)
 
   # one-way or two-way table?
   test <- ifelse(quo_is_null(enquo(y)), "one.way", "two.way")