Skip to content

Commit

Permalink
Merge pull request #405 from IndrajeetPatil/devel_4.0.0
Browse files Browse the repository at this point in the history
adjust tests for statsExpressions changes; more args cleanup
  • Loading branch information
IndrajeetPatil authored Apr 15, 2020
2 parents 6bb51c9 + 82ad4ff commit 0702036
Show file tree
Hide file tree
Showing 407 changed files with 9,441 additions and 11,439 deletions.
5 changes: 0 additions & 5 deletions .github/workflows/check-full.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,3 @@ jobs:
with:
name: ${{ runner.os }}-r${{ matrix.config.r }}-results
path: check

# - name: Test coverage
# if: matrix.config.os == 'macOS-latest'
# run: covr::codecov(token = "${{secrets.CODECOV_TOKEN}}")
# shell: Rscript {0}
43 changes: 0 additions & 43 deletions .github/workflows/test-coverage.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion .lintr
Original file line number Diff line number Diff line change
@@ -1 +1 @@
linters: with_defaults(object_name_linter=NULL,line_length_linter(100),trailing_whitespace_linter=NULL, open_curly_linter = NULL, closed_curly_linter = NULL)
linters: with_defaults(object_name_linter=NULL,line_length_linter(120),trailing_whitespace_linter=NULL, open_curly_linter = NULL, closed_curly_linter = NULL)
157 changes: 50 additions & 107 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,123 +1,66 @@
language: r
r:
- release
# - devel

latex: true
warnings_are_errors: TRUE

env:
global:
#- R_MAX_NUM_DLLS=999
- _R_CHECK_FORCE_SUGGESTS_=true
- _R_CHECK_CRAN_INCOMING_=true

cache:
- packages
- ccache

jobs:
include:
- r: devel
r_binary_packages:
- magrittr
- curl
- jsonlite
- rstan
- Rcpp
- RcppEigen
- openssl
- utf8
- gss
- haven
- minqa
- mvtnorm
- nloptr
- SparseM
- httpuv
- markdown
- sem
- readxl
- openxlsx
- pander
- lme4
- psych
- git2r
- rlang
- bindrcpp
- tidyr
- dplyr
- rstantools
- bridgesampling
- BH
- stringi
- metaBMA
r_packages:
- coin
- bayestestR
- effectsize
- parameters
- performance
- sjstats
- WRS2
- coda
- remotes
- knitr
- pairwiseComparisons
- ipmisc
- rmarkdown
- statsExpressions
r_github_packages:
- jimhester/lintr
- r-lib/covr
- r: release
r_binary_packages:
- magrittr
- curl
- jsonlite
- rstan
- Rcpp
- RcppEigen
- openssl
- utf8
- gss
- haven
- minqa
- mvtnorm
- nloptr
- SparseM
- httpuv
- markdown
- sem
- readxl
- openxlsx
- pander
- lme4
- psych
- git2r
- rlang
- bindrcpp
- tidyr
- dplyr
- rstantools
- bridgesampling
- BH
- stringi
- metaBMA
r_packages:
- coin
- bayestestR
- effectsize
- parameters
- performance
- sjstats
- WRS2
- coda
- remotes
- knitr
- pairwiseComparisons
- ipmisc
- rmarkdown
- statsExpressions
r_github_packages:
- jimhester/lintr
- r-lib/covr
r_binary_packages:
- magrittr
- curl
- jsonlite
- rstan
- Rcpp
- RcppEigen
- openssl
- utf8
- gss
- haven
- minqa
- mvtnorm
- nloptr
- SparseM
- httpuv
- markdown
- readxl
- openxlsx
- pander
- git2r
- rlang
- bindrcpp
- tidyr
- dplyr
- rstantools
- bridgesampling
- BH
- stringi
- metaBMA
- metaplus
- fastGHQuad
- multcomp
- coda
r_packages:
- coin
- effectsize
- insight
- parameters
- WRS2
- remotes
- knitr
- rmarkdown
r_github_packages:
- jimhester/lintr
- r-lib/covr

addons:
apt:
Expand Down
18 changes: 8 additions & 10 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
Type: Package
Package: ggstatsplot
Title: 'ggplot2' Based Plots with Statistical Details
Version: 0.4.0.9000
Version: 0.4.0
Authors@R:
c(person(given = "Indrajeet",
family = "Patil",
role = c("cre", "aut", "ctb"),
role = c("cre", "aut", "cph"),
email = "[email protected]",
comment = c(ORCID = "0000-0003-1995-6531")),
person(given = "Chuck",
Expand All @@ -29,10 +29,10 @@ URL: https://indrajeetpatil.github.io/ggstatsplot/,
https://github.com/IndrajeetPatil/ggstatsplot
BugReports: https://github.com/IndrajeetPatil/ggstatsplot/issues
Depends:
R (>= 3.5.0)
R (>= 3.6.0)
Imports:
broomExtra,
correlation (>= 0.1.1),
broomExtra (>= 3.0.0),
correlation (>= 0.2.0),
cowplot,
dplyr,
ggcorrplot,
Expand All @@ -42,13 +42,13 @@ Imports:
ggsignif,
groupedstats,
insight,
ipmisc,
pairwiseComparisons,
ipmisc (>= 2.0.0),
pairwiseComparisons (>= 0.3.0),
paletteer,
purrr,
rlang,
stats,
statsExpressions,
statsExpressions (>= 0.4.0),
tidyr
Suggests:
forcats,
Expand All @@ -62,8 +62,6 @@ Suggests:
testthat,
tibble,
WRS2
Remotes:
easystats/correlation
VignetteBuilder:
knitr
Encoding: UTF-8
Expand Down
8 changes: 4 additions & 4 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ export("%>%")
export("%|%")
export("%||%")
export(as_tibble)
export(augment)
export(bartlett_message)
export(combine_plots)
export(combine_plots2)
Expand All @@ -20,7 +19,6 @@ export(gghistostats)
export(ggpiestats)
export(ggscatterstats)
export(ggwithinstats)
export(glance)
export(grouped_ggbarstats)
export(grouped_ggbetweenstats)
export(grouped_ggcorrmat)
Expand All @@ -39,7 +37,6 @@ export(theme_corrmat)
export(theme_ggstatsplot)
export(theme_pie)
export(tibble)
export(tidy)
import(ggplot2)
importFrom(broomExtra,augment)
importFrom(broomExtra,glance)
Expand Down Expand Up @@ -91,6 +88,8 @@ importFrom(ipmisc,"%$%")
importFrom(ipmisc,"%<-%")
importFrom(ipmisc,"%<>%")
importFrom(ipmisc,"%>%")
importFrom(ipmisc,"%|%")
importFrom(ipmisc,"%||%")
importFrom(ipmisc,as_tibble)
importFrom(ipmisc,bartlett_message)
importFrom(ipmisc,blue)
Expand All @@ -101,9 +100,11 @@ importFrom(ipmisc,red)
importFrom(ipmisc,set_cwd)
importFrom(ipmisc,signif_column)
importFrom(ipmisc,specify_decimal_p)
importFrom(ipmisc,stats_type_switch)
importFrom(ipmisc,tibble)
importFrom(ipmisc,yellow)
importFrom(pairwiseComparisons,p_adjust_text)
importFrom(pairwiseComparisons,pairwise_caption)
importFrom(pairwiseComparisons,pairwise_comparisons)
importFrom(pairwiseComparisons,pairwise_p)
importFrom(paletteer,scale_color_paletteer_d)
Expand All @@ -116,7 +117,6 @@ importFrom(purrr,pmap)
importFrom(purrr,pmap_dfc)
importFrom(rlang,"!!!")
importFrom(rlang,"!!")
importFrom(rlang,"%|%")
importFrom(rlang,"%||%")
importFrom(rlang,":=")
importFrom(rlang,as_name)
Expand Down
Loading

0 comments on commit 0702036

Please sign in to comment.