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

Minor tweaks for consistency #921

Merged
merged 7 commits into from
Apr 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .github/experimental-workflows/metadata.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ jobs:
- uses: r-lib/actions/setup-r-dependencies@v2
with:
pak-version: devel
upgrade: 'TRUE'
extra-packages: |
local::.
cboettig/codemeta
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/R-CMD-check-devel.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
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.12.1"
pandoc-version: "3.1.12.3"

- 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.12.1"
pandoc-version: "3.1.12.3"

- uses: r-lib/actions/setup-r@v2
with:
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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" }
Expand All @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-link-rot.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.12.1"
pandoc-version: "3.1.12.3"

- uses: r-lib/actions/setup-r@v2
with:
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.12.1"
pandoc-version: "3.1.12.3"

- 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.12.1"
pandoc-version: "3.1.12.3"

- uses: r-lib/actions/setup-r@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check-vignette-warnings.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
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.12.1"
pandoc-version: "3.1.12.3"

- uses: r-lib/actions/setup-r@v2
with:
Expand Down
2 changes: 1 addition & 1 deletion .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.12.1"
pandoc-version: "3.1.12.3"

- uses: r-lib/actions/setup-r@v2
with:
Expand Down
6 changes: 3 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -29,7 +29,7 @@ repos:
)$

- repo: https://github.com/lorenzwalthert/gitignore-tidy
rev: "475bf5d96927a1887ce2863ff3075b1d7240bc51"
rev: "0.1.2"
hooks:
- id: tidy-gitignore

Expand Down
27 changes: 17 additions & 10 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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'
Expand Down Expand Up @@ -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'
Expand All @@ -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
Expand All @@ -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'
Expand All @@ -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
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand All @@ -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'
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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'
Expand Down
16 changes: 8 additions & 8 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand All @@ -71,7 +71,6 @@ Suggests:
withr,
WRS2
Remotes:
IndrajeetPatil/statsExpressions,
tidyverse/ggplot2
VignetteBuilder:
knitr
Expand All @@ -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
3 changes: 1 addition & 2 deletions R/ggbarstats.R
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}) %>%
Expand Down
4 changes: 1 addition & 3 deletions R/ggbetweenstats.R
Original file line number Diff line number Diff line change
Expand Up @@ -186,11 +186,9 @@
...) {
# 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 }}) %>%
Expand Down Expand Up @@ -264,7 +262,7 @@
var.equal = var.equal,
p.adjust.method = p.adjust.method,
digits = digits,
)

Check warning on line 265 in R/ggbetweenstats.R

View workflow job for this annotation

GitHub Actions / lint

file=R/ggbetweenstats.R,line=265,col=5,[missing_argument_linter] Missing argument 10 in function call.

Check warning on line 265 in R/ggbetweenstats.R

View workflow job for this annotation

GitHub Actions / lint-changed-files

file=R/ggbetweenstats.R,line=265,col=5,[missing_argument_linter] Missing argument 10 in function call.

# adding the layer for pairwise comparisons
plot_comparison <- .ggsignif_adder(
Expand Down
6 changes: 2 additions & 4 deletions R/ggdotplotstats.R
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}) %>%
Expand Down
3 changes: 1 addition & 2 deletions R/gghistostats.R
Original file line number Diff line number Diff line change
Expand Up @@ -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 }},
Expand Down
3 changes: 1 addition & 2 deletions R/ggpiestats.R
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
Loading
Loading