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

Sync with ggplot2 and ggside changes #915

Merged
merged 7 commits into from
Feb 27, 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
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.11"
pandoc-version: "3.1.12.1"

- 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.11"
pandoc-version: "3.1.12.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.11"
pandoc-version: "3.1.12.1"

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

- uses: r-lib/actions/setup-pandoc@v2
with:
pandoc-version: "3.1.11"
pandoc-version: "3.1.12.1"

- 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.11"
pandoc-version: "3.1.12.1"

- 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.11"
pandoc-version: "3.1.12.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.11"
pandoc-version: "3.1.12.1"

- 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.11"
pandoc-version: "3.1.12.1"

- 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.11"
pandoc-version: "3.1.12.1"

- 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.11"
pandoc-version: "3.1.12.1"

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

- name: Run pre-commit
uses: pre-commit/[email protected].0
uses: pre-commit/[email protected].1

- name: Commit files
if: failure() && startsWith(github.ref, 'refs/heads')
Expand Down
25 changes: 16 additions & 9 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.1.9000
version: 0.12.2.9000
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 @@ -209,8 +209,11 @@ references:
- family-names: Dunnington
given-names: Dewey
orcid: https://orcid.org/0000-0002-9415-4582
- family-names: van den Brand
given-names: Teun
orcid: https://orcid.org/0000-0002-9335-7468
year: '2024'
version: '>= 3.4.4'
version: '>= 3.5.0'
- type: software
title: ggrepel
abstract: 'ggrepel: Automatically Position Non-Overlapping Text Labels with ''ggplot2'''
Expand All @@ -236,7 +239,7 @@ references:
email: [email protected]
orcid: https://orcid.org/0000-0001-5501-4934
year: '2024'
version: '>= 0.2.3'
version: '>= 0.3.0'
- type: software
title: ggsignif
abstract: 'ggsignif: Significance Brackets for ''ggplot2'''
Expand Down Expand Up @@ -309,7 +312,7 @@ references:
email: [email protected]
orcid: https://orcid.org/0000-0002-9271-5075
year: '2024'
version: '>= 0.19.7'
version: '>= 0.19.8'
- type: software
title: paletteer
abstract: 'paletteer: Comprehensive Collection of Color Palettes'
Expand All @@ -320,7 +323,7 @@ references:
- family-names: file.
given-names: See AUTHORS
year: '2024'
version: '>= 1.5.0'
version: '>= 1.6.0'
- type: software
title: parameters
abstract: 'parameters: Processing of Model Parameters'
Expand Down Expand Up @@ -352,7 +355,7 @@ references:
email: [email protected]
orcid: https://orcid.org/0000-0001-9560-6336
year: '2024'
version: '>= 0.21.3'
version: '>= 0.21.5'
- type: software
title: patchwork
abstract: 'patchwork: The Composer of Plots'
Expand Down Expand Up @@ -397,8 +400,12 @@ references:
given-names: Brenton M.
email: [email protected]
orcid: https://orcid.org/0000-0001-9560-6336
- family-names: Thériault
given-names: Rémi
email: [email protected]
orcid: https://orcid.org/0000-0003-4315-6788
year: '2024'
version: '>= 0.10.8'
version: '>= 0.10.9'
- type: software
title: purrr
abstract: 'purrr: Functional Programming Tools'
Expand Down Expand Up @@ -624,7 +631,7 @@ references:
email: [email protected]
orcid: https://orcid.org/0000-0003-3855-3025
year: '2024'
version: '>= 1.9.9'
version: '>= 1.9.10'
- type: software
title: psych
abstract: 'psych: Procedures for Psychological, Psychometric, and Personality Research'
Expand Down Expand Up @@ -785,7 +792,7 @@ references:
email: [email protected]
- family-names: Wickham
given-names: Hadley
email: hadley@rstudio.com
email: hadley@posit.co
- family-names: Chang
given-names: Winston
year: '2024'
Expand Down
20 changes: 11 additions & 9 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.2
Version: 0.12.2.9000
Authors@R:
c(person(given = "Indrajeet",
family = "Patil",
Expand Down Expand Up @@ -35,16 +35,16 @@ Imports:
datawizard (>= 0.9.1),
dplyr (>= 1.1.4),
ggcorrplot (>= 0.1.4.1),
ggplot2 (>= 3.4.4),
ggplot2 (>= 3.5.0),
ggrepel (>= 0.9.5),
ggside (>= 0.2.3),
ggside (>= 0.3.0),
ggsignif (>= 0.6.4),
glue,
insight (>= 0.19.7),
paletteer (>= 1.5.0),
parameters (>= 0.21.3),
insight (>= 0.19.8),
paletteer (>= 1.6.0),
parameters (>= 0.21.5),
patchwork (>= 1.2.0),
performance (>= 0.10.8),
performance (>= 0.10.9),
purrr (>= 1.0.2),
rlang,
stats,
Expand All @@ -61,7 +61,7 @@ Suggests:
metaBMA,
metafor,
metaplus,
PMCMRplus (>= 1.9.9),
PMCMRplus (>= 1.9.10),
psych,
rmarkdown,
rstantools,
Expand All @@ -71,6 +71,8 @@ Suggests:
vdiffr (>= 1.0.7),
withr,
WRS2
Remotes:
tidyverse/ggplot2
VignetteBuilder:
knitr
Encoding: UTF-8
Expand All @@ -80,7 +82,7 @@ Roxygen: list(
markdown = TRUE,
roclets = c("collate", "namespace", "rd", "pkgapi::api_roclet", "roxyglobals::global_roclet")
)
RoxygenNote: 7.3.0
RoxygenNote: 7.3.1
Config/testthat/edition: 3
Config/testthat/parallel: true
Config/Needs/check: anthonynorth/roxyglobals
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.2
# ggstatsplot 0.12.2.9000

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>

# ggstatsplot 0.12.2

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

# ggstatsplot 0.12.1
Expand Down
2 changes: 1 addition & 1 deletion R/gghistostats-helpers.R
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
exec(geom_vline, xintercept = df_central$var, !!!centrality.line.args) +
scale_x_continuous(
sec.axis = sec_axis(
trans = ~.,
transform = ~.,
name = NULL,
labels = parse(text = df_central$expression),
breaks = df_central$var
Expand Down
4 changes: 2 additions & 2 deletions R/gghistostats.R
Original file line number Diff line number Diff line change
Expand Up @@ -128,9 +128,9 @@ gghistostats <- function(
) +
scale_y_continuous(
sec.axis = sec_axis(
trans = ~ . / nrow(data),
transform = ~ . / nrow(data),
labels = function(x) insight::format_percent(x, digits = 0L),
name = "proportion"
name = "proportion"
)
) +
guides(fill = "none")
Expand Down
20 changes: 10 additions & 10 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.1.9000",
"version": "0.12.2.9000",
"programmingLanguage": {
"@type": "ComputerLanguage",
"name": "R",
Expand Down Expand Up @@ -172,7 +172,7 @@
"@type": "SoftwareApplication",
"identifier": "PMCMRplus",
"name": "PMCMRplus",
"version": ">= 1.9.9",
"version": ">= 1.9.10",
"provider": {
"@id": "https://cran.r-project.org",
"@type": "Organization",
Expand Down Expand Up @@ -355,14 +355,14 @@
"@type": "SoftwareApplication",
"identifier": "ggplot2",
"name": "ggplot2",
"version": ">= 3.4.4",
"version": ">= 3.5.0",
"provider": {
"@id": "https://cran.r-project.org",
"@type": "Organization",
"name": "Comprehensive R Archive Network (CRAN)",
"url": "https://cran.r-project.org"
},
"sameAs": "https://CRAN.R-project.org/package=ggplot2"
"sameAs": "https://github.com/tidyverse/ggplot2"
},
"7": {
"@type": "SoftwareApplication",
Expand All @@ -381,7 +381,7 @@
"@type": "SoftwareApplication",
"identifier": "ggside",
"name": "ggside",
"version": ">= 0.2.3",
"version": ">= 0.3.0",
"provider": {
"@id": "https://cran.r-project.org",
"@type": "Organization",
Expand Down Expand Up @@ -419,7 +419,7 @@
"@type": "SoftwareApplication",
"identifier": "insight",
"name": "insight",
"version": ">= 0.19.7",
"version": ">= 0.19.8",
"provider": {
"@id": "https://cran.r-project.org",
"@type": "Organization",
Expand All @@ -432,7 +432,7 @@
"@type": "SoftwareApplication",
"identifier": "paletteer",
"name": "paletteer",
"version": ">= 1.5.0",
"version": ">= 1.6.0",
"provider": {
"@id": "https://cran.r-project.org",
"@type": "Organization",
Expand All @@ -445,7 +445,7 @@
"@type": "SoftwareApplication",
"identifier": "parameters",
"name": "parameters",
"version": ">= 0.21.3",
"version": ">= 0.21.5",
"provider": {
"@id": "https://cran.r-project.org",
"@type": "Organization",
Expand All @@ -471,7 +471,7 @@
"@type": "SoftwareApplication",
"identifier": "performance",
"name": "performance",
"version": ">= 0.10.8",
"version": ">= 0.10.9",
"provider": {
"@id": "https://cran.r-project.org",
"@type": "Organization",
Expand Down Expand Up @@ -543,7 +543,7 @@
},
"SystemRequirements": null
},
"fileSize": "9364.282KB",
"fileSize": "9359.421KB",
"citation": [
{
"@type": "ScholarlyArticle",
Expand Down
Binary file modified man/figures/README-ggbarstats1-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified man/figures/README-ggbarstats2-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified man/figures/README-ggbetweenstats1-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified man/figures/README-ggbetweenstats2-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified man/figures/README-ggcorrmat1-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified man/figures/README-ggcorrmat2-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified man/figures/README-ggdotplotstats1-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified man/figures/README-ggdotplotstats2-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified man/figures/README-gghistostats1-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified man/figures/README-gghistostats2-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified man/figures/README-ggpiestats1-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified man/figures/README-ggwithinstats1-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading