Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/github_actions/actions/checkout-4
Browse files Browse the repository at this point in the history
  • Loading branch information
IndrajeetPatil authored Sep 15, 2023
2 parents ccdf3dc + 42c169a commit 5c7a0af
Show file tree
Hide file tree
Showing 24 changed files with 195 additions and 36 deletions.
30 changes: 17 additions & 13 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
version: 0.12.0.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 @@ -77,7 +77,7 @@ references:
abstract: 'correlation: Methods for Correlation Analysis'
notes: Imports
url: https://easystats.github.io/correlation/
repository: https://CRAN.R-project.org/package=correlation
repository: https://easystats.r-universe.dev
authors:
- family-names: Makowski
given-names: Dominique
Expand All @@ -99,6 +99,10 @@ references:
given-names: Mattan S.
email: [email protected]
orcid: https://orcid.org/0000-0002-4287-4801
- family-names: Thériault
given-names: Rémi
email: [email protected]
orcid: https://orcid.org/0000-0003-4315-6788
year: '2023'
version: '>= 0.8.4'
- type: software
Expand Down Expand Up @@ -158,7 +162,7 @@ references:
email: [email protected]
orcid: https://orcid.org/0000-0003-4777-038X
year: '2023'
version: '>= 1.1.2'
version: '>= 1.1.3'
- type: software
title: ggcorrplot
abstract: 'ggcorrplot: Visualization of a Correlation Matrix using ''ggplot2'''
Expand All @@ -170,7 +174,7 @@ references:
given-names: Alboukadel
email: [email protected]
year: '2023'
version: '>= 0.1.4'
version: '>= 0.1.4.1'
- type: software
title: ggplot2
abstract: 'ggplot2: Create Elegant Data Visualisations Using the Grammar of Graphics'
Expand Down Expand Up @@ -206,7 +210,7 @@ references:
given-names: Dewey
orcid: https://orcid.org/0000-0002-9415-4582
year: '2023'
version: '>= 3.4.2'
version: '>= 3.4.3'
- type: software
title: ggrepel
abstract: 'ggrepel: Automatically Position Non-Overlapping Text Labels with ''ggplot2'''
Expand Down Expand Up @@ -305,7 +309,7 @@ references:
email: [email protected]
orcid: https://orcid.org/0000-0002-9271-5075
year: '2023'
version: '>= 0.19.3'
version: '>= 0.19.4'
- type: software
title: paletteer
abstract: 'paletteer: Comprehensive Collection of Color Palettes'
Expand Down Expand Up @@ -365,7 +369,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 All @@ -392,7 +396,7 @@ references:
email: [email protected]
orcid: https://orcid.org/0000-0001-9560-6336
year: '2023'
version: '>= 0.10.4'
version: '>= 0.10.5'
- type: software
title: purrr
abstract: 'purrr: Functional Programming Tools'
Expand All @@ -408,7 +412,7 @@ references:
given-names: Lionel
email: [email protected]
year: '2023'
version: '>= 1.0.1'
version: '>= 1.0.2'
- type: software
title: rlang
abstract: 'rlang: Functions for Base Types and Core R and ''Tidyverse'' Features'
Expand Down Expand Up @@ -445,8 +449,8 @@ references:
given-names: Indrajeet
email: [email protected]
orcid: https://orcid.org/0000-0003-1995-6531
version: '>= 1.5.1'
year: '2023'
version: '>= 1.5.2'
- type: software
title: tidyr
abstract: 'tidyr: Tidy Messy Data'
Expand Down Expand Up @@ -719,10 +723,10 @@ references:
authors:
- family-names: Henry
given-names: Lionel
email: lionel@rstudio.com
email: lionel@posit.co
- family-names: Pedersen
given-names: Thomas Lin
email: thomas.pedersen@rstudio.com
email: thomas.pedersen@posit.co
orcid: https://orcid.org/0000-0002-5147-4711
- family-names: Luciani
given-names: T Jake
Expand All @@ -734,7 +738,7 @@ references:
given-names: Vaudor
email: [email protected]
year: '2023'
version: '>= 1.0.5'
version: '>= 1.0.6'
- type: software
title: WRS2
abstract: 'WRS2: A Collection of Robust Statistical Methods'
Expand Down
18 changes: 10 additions & 8 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -33,24 +33,26 @@ Depends:
Imports:
correlation (>= 0.8.4),
datawizard (>= 0.8.0),
dplyr (>= 1.1.2),
ggcorrplot (>= 0.1.4),
ggplot2 (>= 3.4.2),
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.3),
insight (>= 0.19.4),
paletteer,
parameters (>= 0.21.1),
patchwork,
performance (>= 0.10.4),
purrr (>= 1.0.1),
performance (>= 0.10.5),
purrr (>= 1.0.2),
rlang,
stats,
statsExpressions (>= 1.5.1),
statsExpressions (>= 1.5.2),
tidyr,
utils
Remotes:
r-lib/vdiffr
Suggests:
afex,
BayesFactor (>= 0.9.12-4.4),
Expand All @@ -67,7 +69,7 @@ Suggests:
survival,
testthat (>= 3.1.10),
tibble,
vdiffr (>= 1.0.5),
vdiffr (>= 1.0.6),
WRS2
VignetteBuilder:
knitr
Expand Down
2 changes: 1 addition & 1 deletion R/combine_plots.R
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#' this wrapper around it which is mostly useful with `{ggstatsplot}` plots. It
#' is exported only for backward compatibility.
#'
#' @return Combined plot with annotation labels
#' @returns A combined plot with annotation labels.
#'
#' @param plotlist A list containing `ggplot` objects.
#' @param plotgrid.args A `list` of additional arguments passed to
Expand Down
2 changes: 1 addition & 1 deletion R/extract_stats.R
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
#' `correlation::correlation()` function which provides tidy data frames by
#' default.
#'
#' @return
#' @returns
#'
#' A list of tibbles containing summaries of various statistical analyses.
#' The exact details included will depend on the function.
Expand Down
2 changes: 1 addition & 1 deletion R/theme_ggstatsplot.R
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#' All `{ggstatsplot}` functions have a `ggtheme` parameter that let you choose
#' a different theme.
#'
#' @return A `ggplot` object with the `theme_ggstatsplot` theme overlaid.
#' @returns A `ggplot` object with the `theme_ggstatsplot` theme overlaid.
#'
#' @examples
#' library(ggplot2)
Expand Down
22 changes: 11 additions & 11 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",
"version": "0.12.0.9000",
"programmingLanguage": {
"@type": "ComputerLanguage",
"name": "R",
Expand Down Expand Up @@ -245,14 +245,14 @@
"@type": "SoftwareApplication",
"identifier": "vdiffr",
"name": "vdiffr",
"version": ">= 1.0.5",
"version": ">= 1.0.6",
"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=vdiffr"
"sameAs": "https://github.com/r-lib/vdiffr"
},
{
"@type": "SoftwareApplication",
Expand Down Expand Up @@ -304,7 +304,7 @@
"@type": "SoftwareApplication",
"identifier": "dplyr",
"name": "dplyr",
"version": ">= 1.1.2",
"version": ">= 1.1.3",
"provider": {
"@id": "https://cran.r-project.org",
"@type": "Organization",
Expand All @@ -317,7 +317,7 @@
"@type": "SoftwareApplication",
"identifier": "ggcorrplot",
"name": "ggcorrplot",
"version": ">= 0.1.4",
"version": ">= 0.1.4.1",
"provider": {
"@id": "https://cran.r-project.org",
"@type": "Organization",
Expand All @@ -330,7 +330,7 @@
"@type": "SoftwareApplication",
"identifier": "ggplot2",
"name": "ggplot2",
"version": ">= 3.4.2",
"version": ">= 3.4.3",
"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.3",
"version": ">= 0.19.4",
"provider": {
"@id": "https://cran.r-project.org",
"@type": "Organization",
Expand Down Expand Up @@ -444,7 +444,7 @@
"@type": "SoftwareApplication",
"identifier": "performance",
"name": "performance",
"version": ">= 0.10.4",
"version": ">= 0.10.5",
"provider": {
"@id": "https://cran.r-project.org",
"@type": "Organization",
Expand All @@ -457,7 +457,7 @@
"@type": "SoftwareApplication",
"identifier": "purrr",
"name": "purrr",
"version": ">= 1.0.1",
"version": ">= 1.0.2",
"provider": {
"@id": "https://cran.r-project.org",
"@type": "Organization",
Expand Down Expand Up @@ -487,7 +487,7 @@
"@type": "SoftwareApplication",
"identifier": "statsExpressions",
"name": "statsExpressions",
"version": ">= 1.5.1",
"version": ">= 1.5.2",
"provider": {
"@id": "https://cran.r-project.org",
"@type": "Organization",
Expand Down Expand Up @@ -515,7 +515,7 @@
},
"SystemRequirements": null
},
"fileSize": "9401.95KB",
"fileSize": "9407.077KB",
"citation": [
{
"@type": "ScholarlyArticle",
Expand Down
2 changes: 1 addition & 1 deletion man/combine_plots.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 9 additions & 0 deletions tests/testthat/_snaps/ggcorrmat/with-nas.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 5c7a0af

Please sign in to comment.