From e10ac7c24c6fe7015d38d9ccba13ae05abf5a888 Mon Sep 17 00:00:00 2001 From: Indrajeet Patil Date: Fri, 22 Mar 2024 20:44:08 +0100 Subject: [PATCH 1/7] minor tweaks for consistency --- R/ggbarstats.R | 3 +-- R/ggbetweenstats.R | 4 +--- R/ggdotplotstats.R | 6 ++---- R/gghistostats.R | 3 +-- R/ggpiestats.R | 3 +-- R/ggscatterstats.R | 17 +++++++---------- R/ggwithinstats.R | 5 +---- man/grouped_ggscatterstats.Rd | 1 - vignettes/web_only/faq.Rmd | 17 +++++++++++++++++ 9 files changed, 31 insertions(+), 28 deletions(-) diff --git a/R/ggbarstats.R b/R/ggbarstats.R index 481ccbd28..85167c293 100644 --- 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 index abd7927b3..b6fb20e3c 100644 --- 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 index a8f585278..d2809f86c 100644 --- 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 index 24c4c5a12..3bbc76c5a 100644 --- 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 index fb8e1de4e..c3d8cc239 100644 --- 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") diff --git a/R/ggscatterstats.R b/R/ggscatterstats.R index 03dd2d8a3..4fb63c4c1 100644 --- a/R/ggscatterstats.R +++ b/R/ggscatterstats.R @@ -108,17 +108,15 @@ ggscatterstats <- function( ...) { # data --------------------------------------- - # ensure the arguments 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 frame data %<>% filter(!is.na({{ x }}), !is.na({{ y }})) # statistical analysis ------------------------------------------ if (results.subtitle) { - type <- stats_type_switch(type) - .f.args <- list( data = data, x = {{ x }}, @@ -145,7 +143,7 @@ ggscatterstats <- function( pos <- position_jitter(width = point.width.jitter, height = point.height.jitter) # scatterplot - plotScatter <- ggplot(data, mapping = aes({{ x }}, {{ y }})) + + plot_scatter <- ggplot(data, mapping = aes({{ x }}, {{ y }})) + exec(geom_point, position = pos, !!!point.args) + exec(geom_smooth, level = conf.level, !!!smooth.line.args, na.rm = TRUE) @@ -158,7 +156,7 @@ ggscatterstats <- function( if (!quo_is_null(enquo(label.expression))) data %<>% filter(!!enexpr(label.expression)) # display points labels using `geom_repel_label` - plotScatter <- plotScatter + + plot_scatter <- plot_scatter + exec( ggrepel::geom_label_repel, data = data, @@ -171,7 +169,7 @@ ggscatterstats <- function( # annotations ------------------------------------- - plotScatter <- plotScatter + + plot_scatter <- plot_scatter + labs( x = xlab %||% as_name(x), y = ylab %||% as_name(y), @@ -185,14 +183,14 @@ ggscatterstats <- function( # marginal --------------------------------------------- if (isTRUE(marginal)) { - plotScatter <- plotScatter + + plot_scatter <- plot_scatter + exec(ggside::geom_xsidehistogram, mapping = aes(y = after_stat(count)), !!!xsidehistogram.args) + exec(ggside::geom_ysidehistogram, mapping = aes(x = after_stat(count)), !!!ysidehistogram.args) + ggside::scale_ysidex_continuous() + ggside::scale_xsidey_continuous() } - plotScatter + plot_scatter } @@ -224,7 +222,6 @@ ggscatterstats <- function( #' library(dplyr, warn.conflicts = FALSE) #' library(ggplot2) #' -#' # basic function call #' grouped_ggscatterstats( #' data = filter(movies_long, genre == "Comedy" | genre == "Drama"), #' x = length, diff --git a/R/ggwithinstats.R b/R/ggwithinstats.R index 5a919ecf4..84db144ab 100644 --- a/R/ggwithinstats.R +++ b/R/ggwithinstats.R @@ -117,13 +117,10 @@ ggwithinstats <- function( ...) { # data ----------------------------------- - # 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 }}) %>% mutate({{ x }} := droplevels(as.factor({{ x }}))) %>% diff --git a/man/grouped_ggscatterstats.Rd b/man/grouped_ggscatterstats.Rd index e97d6fd62..2afdae091 100644 --- a/man/grouped_ggscatterstats.Rd +++ b/man/grouped_ggscatterstats.Rd @@ -132,7 +132,6 @@ set.seed(123) library(dplyr, warn.conflicts = FALSE) library(ggplot2) -# basic function call grouped_ggscatterstats( data = filter(movies_long, genre == "Comedy" | genre == "Drama"), x = length, diff --git a/vignettes/web_only/faq.Rmd b/vignettes/web_only/faq.Rmd index b3a3cd23b..a723067ed 100644 --- a/vignettes/web_only/faq.Rmd +++ b/vignettes/web_only/faq.Rmd @@ -156,6 +156,23 @@ data frame in what you want to do, I will recommend `{purrr}`-based solution: +This solution would work for `x` and `y` arguments, but not for `grouping.var` argument, which first needs to be converted to a symbol: + +```{r} +#| label = "tidyeval-grouping-var", +#| eval = FALSE + +df <- dplyr::filter(movies_long, genre == "Comedy" | genre == "Drama") + +grouped_ggscatterstats( + data = df, + x = !!colnames(df)[3], + y = !!colnames(df)[5], + grouping.var = !!rlang::sym(colnames(df)[8]), + results.subtitle = FALSE +) +``` + ## 7. How can I have uniform Y-axes ranges in `grouped_` functions? Across different facets of a `grouped_` plot, the axes ranges might sometimes From ce1f79c5bddae1c8fad0a43eb82868c6f9255c45 Mon Sep 17 00:00:00 2001 From: Indrajeet Patil Date: Fri, 22 Mar 2024 20:59:11 +0100 Subject: [PATCH 2/7] simplify lmer example --- vignettes/web_only/ggcoefstats.Rmd | 31 +++++------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/vignettes/web_only/ggcoefstats.Rmd b/vignettes/web_only/ggcoefstats.Rmd index 3e3f5b363..a1d4864ed 100644 --- a/vignettes/web_only/ggcoefstats.Rmd +++ b/vignettes/web_only/ggcoefstats.Rmd @@ -118,23 +118,19 @@ linear model (`lm`) and linear mixed-effects model (`lmer`/`lmerMod`) library(lme4) # lm model -mod1 <- stats::lm(formula = scale(rating) ~ scale(budget), data = movies_long) +mod1 <- stats::lm(formula = Reaction ~ Days, data = sleepstudy) # merMod model -mod2 <- lme4::lmer( - formula = scale(rating) ~ scale(budget) + (budget | genre), - data = movies_long, - control = lme4::lmerControl(calc.derivs = FALSE) -) +mod2 <- lme4::lmer(Reaction ~ Days + (Days | Subject), sleepstudy) # combining the two different plots combine_plots( plotlist = list( ggcoefstats(mod1) + - ggplot2::labs(x = parse(text = "'standardized regression coefficient' ~italic(beta)")), + ggplot2::labs(x = parse(text = "'regression coefficient' ~italic(beta)")), ggcoefstats(mod2) + ggplot2::labs( - x = parse(text = "'standardized regression coefficient' ~italic(beta)"), + x = parse(text = "'regression coefficient' ~italic(beta)"), y = "fixed effects" ) ), @@ -145,24 +141,7 @@ combine_plots( Note that for mixed-effects models, only the *fixed* effects are shown because there are no confidence intervals for *random* effects terms. In case, you would -like to see these terms, you can enter the same object you entered as `x` -argument to `parameters::model_parameters`: - -```{r} -#| label = "lmer2" - -library(lme4) -library(parameters) - -# tidy output -parameters::model_parameters( - lme4::lmer( - formula = scale(rating) ~ scale(budget) + (budget | genre), - data = movies_long, - control = lme4::lmerControl(calc.derivs = FALSE) - ) -) -``` +like to see these terms, you can use `parameters::model_parameters()`. ### *z*-statistic From 5f089d334bb29a6578bde7f64714b29f81f63ddc Mon Sep 17 00:00:00 2001 From: Indrajeet Patil Date: Fri, 22 Mar 2024 21:16:31 +0100 Subject: [PATCH 3/7] bump pandoc --- .github/experimental-workflows/metadata.yaml | 1 + .github/workflows/R-CMD-check-devel.yaml | 2 +- .github/workflows/R-CMD-check-hard.yaml | 2 +- .github/workflows/R-CMD-check-strict.yaml | 2 +- .github/workflows/R-CMD-check.yaml | 2 +- .github/workflows/check-link-rot.yaml | 2 +- .github/workflows/check-readme.yaml | 2 +- .github/workflows/check-spelling.yaml | 2 +- .github/workflows/check-vignette-warnings.yaml | 2 +- .github/workflows/pkgdown-no-suggests.yaml | 2 +- .github/workflows/pkgdown.yaml | 2 +- 11 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.github/experimental-workflows/metadata.yaml b/.github/experimental-workflows/metadata.yaml index 45ae3880a..438cb92cc 100644 --- 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 index 9bc7088d6..8d1a3c5c4 100644 --- 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 index 430b34cb5..fcd1fbc2e 100644 --- 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 index 56609dd82..ed3cdfc16 100644 --- 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 index 1c858a483..8e1049494 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -42,7 +42,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 index 75f76750a..01eaa79e8 100644 --- 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 index a9309ccde..fd29431bb 100644 --- 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 index 6c26f5d71..cda2334b7 100644 --- 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 index 75e2a1bcf..90c76eba4 100644 --- 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 index 3cc92197f..12d20b1a7 100644 --- 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 index e6ed3dc3e..c26c85d3f 100644 --- 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: From 08d2f0538046bae520054e805b3d8aa4356783ca Mon Sep 17 00:00:00 2001 From: Indrajeet Patil Date: Sun, 31 Mar 2024 13:56:55 +0200 Subject: [PATCH 4/7] also test on next-R --- .github/workflows/R-CMD-check.yaml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 8e1049494..515d6656a 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -25,13 +25,15 @@ 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" } + - { os: ubuntu-latest, r: "release" } + - { os: ubuntu-latest, r: "oldrel-1" } env: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} From baa31a4f6fc496cdde919edcc73bf6d287c3dc25 Mon Sep 17 00:00:00 2001 From: Indrajeet Patil Date: Mon, 1 Apr 2024 15:27:08 +0200 Subject: [PATCH 5/7] bump deps --- .github/workflows/R-CMD-check.yaml | 2 +- CITATION.cff | 27 +++++++----- DESCRIPTION | 16 +++---- R/globals.R | 67 +++++++++++++++++++----------- codemeta.json | 20 ++++----- 5 files changed, 78 insertions(+), 54 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 515d6656a..7f3dd471a 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -25,7 +25,7 @@ jobs: #- { os: macos-latest, r: "release" } - { os: macos-latest, r: "oldrel-1" } - - { os: windows-latest, r: "next" } + #- { os: windows-latest, r: "next" } #- { os: windows-latest, r: "devel" } - { os: windows-latest, r: "release" } #- { os: windows-latest, r: "oldrel-1" } diff --git a/CITATION.cff b/CITATION.cff index 205ba6553..52ec0f90f 100644 --- 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: brenton@wiernik.org 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: etienne.bacher@protonmail.com 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: brenton@wiernik.org 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: remi.theriault@mail.mcgill.ca 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: patilindrajeet.science@gmail.com 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: wvb@metafor-project.org 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 index 7be944c42..9ef084b22 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -32,7 +32,7 @@ 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), @@ -40,23 +40,23 @@ Imports: 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/globals.R b/R/globals.R index a6968ed6f..06de8b96b 100644 --- a/R/globals.R +++ b/R/globals.R @@ -1,30 +1,47 @@ # Generated by roxyglobals: do not edit by hand utils::globalVariables(c( - ".counts", # - "perc", # - ".label", # - ".p.label", # - "N", # - "group1", # <.ggsignif_adder> - "group2", # <.ggsignif_adder> - "p.value", # <.ggsignif_adder> - "term", # - "p.value", # - "estimate", # - "conf.low", # - "conf.high", # - ".x", # <.histo_labeller> - "var", # <.histo_labeller> - "counts", # - "perc", # - "counts", # <.cat_counter> - "counts", # - ".counts", # - "perc", # - ".label", # - ".", # - ".rowid", # - ".", # <.grouped_list> + # + # <.grouped_list> + ".", + # + # + ".counts", + # + # + ".label", + # + ".p.label", + # + ".rowid", + # <.histo_labeller> + ".x", + # + "conf.high", + # + "conf.low", + # + # <.cat_counter> + # + "counts", + # + "estimate", + # <.ggsignif_adder> + "group1", + # <.ggsignif_adder> + "group2", + # + "N", + # <.ggsignif_adder> + # + "p.value", + # + # + # + "perc", + # + "term", + # <.histo_labeller> + "var", NULL )) diff --git a/codemeta.json b/codemeta.json index aa6e10371..68d099b95 100644 --- a/codemeta.json +++ b/codemeta.json @@ -14,7 +14,7 @@ "name": "R", "url": "https://r-project.org" }, - "runtimePlatform": "R version 4.3.2 (2023-10-31)", + "runtimePlatform": "R version 4.3.3 (2024-02-29)", "provider": { "@id": "https://cran.r-project.org", "@type": "Organization", @@ -111,7 +111,7 @@ "@type": "SoftwareApplication", "identifier": "lme4", "name": "lme4", - "version": ">= 1.1-35.1", + "version": ">= 1.1-35.2", "provider": { "@id": "https://cran.r-project.org", "@type": "Organization", @@ -303,7 +303,7 @@ "@type": "SoftwareApplication", "identifier": "datawizard", "name": "datawizard", - "version": ">= 0.9.1", + "version": ">= 0.10.0", "provider": { "@id": "https://cran.r-project.org", "@type": "Organization", @@ -406,7 +406,7 @@ "@type": "SoftwareApplication", "identifier": "insight", "name": "insight", - "version": ">= 0.19.8", + "version": ">= 0.19.10", "provider": { "@id": "https://cran.r-project.org", "@type": "Organization", @@ -432,7 +432,7 @@ "@type": "SoftwareApplication", "identifier": "parameters", "name": "parameters", - "version": ">= 0.21.5", + "version": ">= 0.21.6", "provider": { "@id": "https://cran.r-project.org", "@type": "Organization", @@ -458,7 +458,7 @@ "@type": "SoftwareApplication", "identifier": "performance", "name": "performance", - "version": ">= 0.10.9", + "version": ">= 0.11.0", "provider": { "@id": "https://cran.r-project.org", "@type": "Organization", @@ -501,20 +501,20 @@ "@type": "SoftwareApplication", "identifier": "statsExpressions", "name": "statsExpressions", - "version": ">= 1.5.3.9000", + "version": ">= 1.5.4", "provider": { "@id": "https://cran.r-project.org", "@type": "Organization", "name": "Comprehensive R Archive Network (CRAN)", "url": "https://cran.r-project.org" }, - "sameAs": "https://github.com/IndrajeetPatil/statsExpressions" + "sameAs": "https://CRAN.R-project.org/package=statsExpressions" }, "20": { "@type": "SoftwareApplication", "identifier": "tidyr", "name": "tidyr", - "version": ">= 1.3.0", + "version": ">= 1.3.1", "provider": { "@id": "https://cran.r-project.org", "@type": "Organization", @@ -530,7 +530,7 @@ }, "SystemRequirements": null }, - "fileSize": "9363.938KB", + "fileSize": "9363.846KB", "citation": [ { "@type": "ScholarlyArticle", From afea16fd2878c1ea468c948f24fd6e1723368190 Mon Sep 17 00:00:00 2001 From: Indrajeet Patil Date: Mon, 1 Apr 2024 15:30:41 +0200 Subject: [PATCH 6/7] Update .pre-commit-config.yaml --- .pre-commit-config.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 8c6511076..332810642 100644 --- 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 From e88a8e4940ef8cb6a9c30259fecc8494c781c79a Mon Sep 17 00:00:00 2001 From: Indrajeet Patil Date: Mon, 1 Apr 2024 15:36:12 +0200 Subject: [PATCH 7/7] Update R-CMD-check.yaml --- .github/workflows/R-CMD-check.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 7f3dd471a..ce19cf444 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -30,10 +30,10 @@ jobs: - { os: windows-latest, r: "release" } #- { os: windows-latest, r: "oldrel-1" } - - { os: ubuntu-latest, r: "next" } + #- { os: ubuntu-latest, r: "next" } #- { os: ubuntu-latest, r: "devel" } - - { os: ubuntu-latest, r: "release" } - - { os: ubuntu-latest, r: "oldrel-1" } + #- { os: ubuntu-latest, r: "release" } + #- { os: ubuntu-latest, r: "oldrel-1" } env: GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}