Skip to content

Commit

Permalink
update metaBMA tests; standardize vignette metadat
Browse files Browse the repository at this point in the history
  • Loading branch information
IndrajeetPatil committed Sep 15, 2023
1 parent 3ccd43c commit 484c4e6
Show file tree
Hide file tree
Showing 32 changed files with 184 additions and 395 deletions.
16 changes: 8 additions & 8 deletions CITATION.cff
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ message: 'To cite package "ggstatsplot" in publications use:'
type: software
license: GPL-3.0-only
title: 'ggstatsplot: ''ggplot2'' Based Plots with Statistical Details'
version: 0.12.0.9000
version: 0.12.1
doi: 10.21105/joss.03167
abstract: 'Extension of ''ggplot2'', ''ggstatsplot'' creates graphics with details
from statistical tests included in the plots themselves. It provides an easier syntax
Expand Down Expand Up @@ -110,7 +110,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 @@ -137,7 +137,7 @@ references:
email: [email protected]
orcid: https://orcid.org/0000-0001-9560-6336
year: '2023'
version: '>= 0.8.0'
version: '>= 0.9.0'
- type: software
title: dplyr
abstract: 'dplyr: A Grammar of Data Manipulation'
Expand Down Expand Up @@ -309,7 +309,7 @@ references:
email: [email protected]
orcid: https://orcid.org/0000-0002-9271-5075
year: '2023'
version: '>= 0.19.4'
version: '>= 0.19.5'
- type: software
title: paletteer
abstract: 'paletteer: Comprehensive Collection of Color Palettes'
Expand Down Expand Up @@ -369,7 +369,7 @@ references:
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 @@ -449,8 +449,8 @@ references:
given-names: Indrajeet
email: [email protected]
orcid: https://orcid.org/0000-0003-1995-6531
year: '2023'
version: '>= 1.5.2'
year: '2023'
- type: software
title: tidyr
abstract: 'tidyr: Tidy Messy Data'
Expand Down Expand Up @@ -574,12 +574,12 @@ references:
title: metaBMA
abstract: 'metaBMA: Bayesian Model Averaging for Random and Fixed Effects Meta-Analysis'
notes: Suggests
url: https://github.com/danheck/metaBMA
url: https://danheck.github.io/metaBMA/
repository: https://CRAN.R-project.org/package=metaBMA
authors:
- family-names: Heck
given-names: Daniel W.
email: dheck@uni-marburg.de
email: daniel.heck@uni-marburg.de
orcid: https://orcid.org/0000-0002-6302-9252
year: '2023'
- type: software
Expand Down
6 changes: 3 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Type: Package
Package: ggstatsplot
Title: 'ggplot2' Based Plots with Statistical Details
Version: 0.12.0.9000
Version: 0.12.1
Authors@R:
c(person(given = "Indrajeet",
family = "Patil",
Expand Down Expand Up @@ -32,15 +32,15 @@ Depends:
R (>= 4.1.0)
Imports:
correlation (>= 0.8.4),
datawizard (>= 0.8.0),
datawizard (>= 0.9.0),
dplyr (>= 1.1.3),
ggcorrplot (>= 0.1.4.1),
ggplot2 (>= 3.4.3),
ggrepel (>= 0.9.3),
ggside (>= 0.2.2),
ggsignif (>= 0.6.4),
glue,
insight (>= 0.19.4),
insight (>= 0.19.5),
paletteer,
parameters (>= 0.21.1),
patchwork,
Expand Down
4 changes: 3 additions & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
# ggstatsplot 0.12.0.9000
# ggstatsplot 0.12.1

N.B. All statistical analysis in `{ggstatsplot}` is carried out in
`{statsExpressions}`. Thus, to see changes related to statistical expressions,
read the `NEWS` for that package:
<https://indrajeetpatil.github.io/statsExpressions/news/index.html>

- No user-visible changes. Maintenance-only release.

# ggstatsplot 0.12.0

## BREAKING CHANGES
Expand Down
6 changes: 3 additions & 3 deletions R/ggbetweenstats_helpers.R
Original file line number Diff line number Diff line change
Expand Up @@ -201,9 +201,9 @@

# which comparisons were displayed?
display <- case_when(
substr(pairwise.display, 1L, 1L) == "s" ~ "significant",
substr(pairwise.display, 1L, 1L) == "n" ~ "non-significant",
TRUE ~ "all"
startsWith(pairwise.display, "s") ~ "significant",
startsWith(pairwise.display, "n") ~ "non-significant",
.default = "all"
)

parse(text = glue("list('Pairwise test:'~bold('{test}'), 'Bars shown:'~bold('{display}'))"))
Expand Down
2 changes: 1 addition & 1 deletion R/ggpiestats_ggbarstats_helpers.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ descriptive_data <- function(data,
.label = case_when(
grepl("perc|prop", label.content) ~ paste0(round(perc, perc.k), "%"),
grepl("count|n|N", label.content) ~ .prettyNum(counts),
TRUE ~ paste0(.prettyNum(counts), "\n", "(", round(perc, perc.k), "%)")
.default = paste0(.prettyNum(counts), "\n", "(", round(perc, perc.k), "%)")
)
) %>% # reorder the category factor levels to order the legend
mutate({{ x }} := factor({{ x }}, unique({{ x }})))
Expand Down
2 changes: 2 additions & 0 deletions R/globals.R
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ utils::globalVariables(c(
".counts", # <ggpiestats>
"perc", # <ggpiestats>
".label", # <ggpiestats>
"counts", # <descriptive_data>
"perc", # <descriptive_data>
"counts", # <.cat_counter>
"counts", # <onesample_data>
".", # <ggwithinstats>
Expand Down
10 changes: 5 additions & 5 deletions codemeta.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"codeRepository": "https://github.com/IndrajeetPatil/ggstatsplot",
"issueTracker": "https://github.com/IndrajeetPatil/ggstatsplot/issues",
"license": "https://spdx.org/licenses/GPL-3.0",
"version": "0.12.0.9000",
"version": "0.12.1",
"programmingLanguage": {
"@type": "ComputerLanguage",
"name": "R",
Expand Down Expand Up @@ -291,7 +291,7 @@
"@type": "SoftwareApplication",
"identifier": "datawizard",
"name": "datawizard",
"version": ">= 0.8.0",
"version": ">= 0.9.0",
"provider": {
"@id": "https://cran.r-project.org",
"@type": "Organization",
Expand Down Expand Up @@ -394,7 +394,7 @@
"@type": "SoftwareApplication",
"identifier": "insight",
"name": "insight",
"version": ">= 0.19.4",
"version": ">= 0.19.5",
"provider": {
"@id": "https://cran.r-project.org",
"@type": "Organization",
Expand Down Expand Up @@ -457,7 +457,7 @@
"@type": "SoftwareApplication",
"identifier": "purrr",
"name": "purrr",
"version": ">= 1.0.2",
"version": ">= 1.0.3",
"provider": {
"@id": "https://cran.r-project.org",
"@type": "Organization",
Expand Down Expand Up @@ -515,7 +515,7 @@
},
"SystemRequirements": null
},
"fileSize": "9407.077KB",
"fileSize": "9389.231KB",
"citation": [
{
"@type": "ScholarlyArticle",
Expand Down
2 changes: 1 addition & 1 deletion cran-comments.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

0 errors | 0 warnings | 0 note

- Maintenance release.
- No user-visible changes. Maintenance-only release.

## revdepcheck results

Expand Down
26 changes: 1 addition & 25 deletions old/benchmarking.Rmd
Original file line number Diff line number Diff line change
@@ -1,38 +1,14 @@
---
title: "Benchmarking"
author: "Indrajeet Patil"
date: "`r Sys.Date()`"
output:
rmarkdown::html_document:
fig_width: 6
fig.align: 'center'
fig.asp: 0.618
dpi: 300
toc: true
toc_depth: 3
warning: FALSE
message: FALSE
---

```{r}
#| label = "setup",
#| include = FALSE
options(
tibble.width = Inf,
pillar.bold = TRUE,
pillar.neg = TRUE,
pillar.subtle_num = TRUE,
pillar.min_chars = Inf
)
knitr::opts_chunk$set(
collapse = TRUE,
dpi = 300,
out.width = "100%",
comment = "#>",
warning = FALSE,
message = FALSE
)
source("../setup.R")
```

# Introduction
Expand Down
8 changes: 0 additions & 8 deletions old/combine_plots.Rmd
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
---
title: "combine_plots"
author: "Indrajeet Patil"
date: "`r Sys.Date()`"
output:
rmarkdown::html_vignette:
fig_width: 6
fig.align: 'center'
fig.asp: 0.618
dpi: 300
toc: true
warning: FALSE
message: FALSE
vignette: >
%\VignetteIndexEntry{combine_plots}
%\VignetteEngine{knitr::rmarkdown}
Expand Down
7 changes: 0 additions & 7 deletions old/dependencies.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,7 @@ author: "Indrajeet Patil"
date: "`r Sys.Date()`"
output:
rmarkdown::html_document:
fig_width: 6
fig.align: 'center'
fig.asp: 0.618
dpi: 300
toc: true
toc_depth: 3
warning: FALSE
message: FALSE
---

```{r}
Expand Down
9 changes: 0 additions & 9 deletions old/ggcoefstats_old.Rmd
Original file line number Diff line number Diff line change
@@ -1,17 +1,8 @@
---
title: "ggcoefstats"
author: "Indrajeet Patil"
date: "`r Sys.Date()`"
output:
rmarkdown::html_vignette:
fig_width: 6
fig.align: 'center'
fig.asp: 0.618
dpi: 300
toc: true
warning: FALSE
message: FALSE
error: TRUE
vignette: >
%\VignetteIndexEntry{ggcoefstats}
%\VignetteEngine{knitr::rmarkdown}
Expand Down
8 changes: 0 additions & 8 deletions old/purrr_examples.Rmd
Original file line number Diff line number Diff line change
@@ -1,16 +1,8 @@
---
title: "using `{ggstatsplot}` with the `{purrr}` package"
author: "Indrajeet Patil"
date: "`r Sys.Date()`"
output:
rmarkdown::html_document:
fig_width: 6
fig.align: 'center'
fig.asp: 0.618
dpi: 300
toc: true
warning: FALSE
message: FALSE
---

```{r}
Expand Down
2 changes: 1 addition & 1 deletion tests/testthat.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# graphics engine changed in this version, and so snapshots generated on
# previous R version won't work
if (getRversion() > "4.1.0" && getRversion() < "4.4.0") {
if (getRversion() < "4.4.0") {
library(testthat)
suppressPackageStartupMessages(library(ggstatsplot))

Expand Down
6 changes: 3 additions & 3 deletions tests/testthat/_snaps/ggcoefstats/meta-analysis-works.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 484c4e6

Please sign in to comment.