version 0.3.1

cran · May 27, 2020 · 48b9425 · 48b9425
1 parent 030202d
commit 48b9425
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 27 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,11 +1,11 @@
 Type: Package
 Package: pairwiseComparisons
 Title: Multiple Pairwise Comparison Tests
-Version: 0.3.0
+Version: 0.3.1
 Authors@R: 
     person(given = "Indrajeet",
            family = "Patil",
-           role = c("cre", "aut", "ctb"),
+           role = c("cre", "aut", "cph"),
            email = "patilindrajeet.science@gmail.com",
            comment = c(ORCID = "0000-0003-1995-6531"))
 Maintainer: Indrajeet Patil <patilindrajeet.science@gmail.com>
@@ -21,16 +21,16 @@ URL: https://indrajeetpatil.github.io/pairwiseComparisons/,
         https://github.com/IndrajeetPatil/pairwiseComparisons
 BugReports: https://github.com/IndrajeetPatil/pairwiseComparisons/issues
 Depends: R (>= 3.6.0)
-Imports: broomExtra, dplyr, forcats, ipmisc (>= 2.0.0), jmv, purrr,
-        rlang, stats, tidyBF (>= 0.2.0), tidyr, utils, WRS2
+Imports: broomExtra, dplyr, forcats, ipmisc, jmv, purrr, rlang, stats,
+        tidyBF, tidyr, utils, WRS2
 Suggests: ggplot2, knitr, rmarkdown, spelling, testthat
 Encoding: UTF-8
 Language: en-US
 LazyData: true
 RoxygenNote: 7.1.0.9000
 NeedsCompilation: no
-Packaged: 2020-04-11 16:06:30 UTC; inp099
-Author: Indrajeet Patil [cre, aut, ctb]
+Packaged: 2020-05-27 08:09:15 UTC; inp099
+Author: Indrajeet Patil [cre, aut, cph]
     (<https://orcid.org/0000-0003-1995-6531>)
 Repository: CRAN
-Date/Publication: 2020-04-11 17:00:02 UTC
+Date/Publication: 2020-05-27 09:00:02 UTC
diff --git a/MD5 b/MD5
@@ -1,26 +1,27 @@
-a0f631eba675616ff66d96da858e9739 *DESCRIPTION
+12f6805146a9def596fec6a84d15025c *DESCRIPTION
 882a34304fbad2094a2e16309dd9884b *LICENSE
 8a0f934acc2c8d9a01c53a2386682d9b *NAMESPACE
-033e7d46c8e6273671b6a4a5ec2c5a19 *NEWS.md
-d9357fdd647f95d859ecbece69c14ffc *R/data.R
+888bd0061135486315abf8d3cb5e18b7 *NEWS.md
+80270429833d4133a8fa719c5bd94810 *R/data.R
 67a984b95592c893f60413d194ad8b5d *R/games_howell.R
-6417910da652d6def85b1252c1585e5f *R/global_vars.R
+579c7cf4a370014cbd34e9a083062fe2 *R/global_vars.R
 89e7d2a7b71d974cd5e1ab6de0449584 *R/helpers.R
-4fc2df300799807e5949902d7f2bb120 *R/pairwise_comparisons.R
+0002a659bead13f0fdeef26b15850f7c *R/pairwise_comparisons.R
 1c4de2dbad08b4e6209118170bd4f773 *R/pairwise_expr_helpers.R
 b77482de3566b241f8408a71d721d2d1 *R/reexports.R
-c03784f08dbf8f529bae070174e24808 *README.md
+1752e16067fdcbc5b8f188a8ae7927d8 *README.md
 60e0e78acc2c42531f52352f480329c2 *data/bugs_long.rdata
 c5ee4fa2f5ea32bdf87e02ea71a415f8 *data/iris_long.rdata
 91069babfae39db7b08f35ede31084f2 *data/movies_long.rdata
 54a342a94ac6e4232913e999a95d4e94 *data/movies_wide.rdata
 2664a73ea8c7701c767239b0613dc913 *inst/CITATION
-c2c84086444c08a10d1ddfc4b53f12e7 *inst/WORDLIST
+c57482bed5d8a3612f29b17d68ae9e82 *inst/WORDLIST
 802fc4c2df4afaaf8de39a8b423f5a7b *man/bugs_long.Rd
 3eeeef10beffd25cb2d0aea4da47365e *man/figures/README-ggsignif-1.png
 1c40d56bf84cc175121e0aec5e894c8d *man/figures/README-ggsignif2-1.png
+8aa93283e08db18090dc39423bd9b612 *man/figures/logo.png
 995c704e147f20fdf578e2608b4319f5 *man/games_howell.Rd
-f0eb6a1e5aef4ff056b4d8fe5f7047c7 *man/iris_long.Rd
+253003637707cb3641bb791336692759 *man/iris_long.Rd
 196b31e52d4ff6159337e678c8ceba85 *man/movies_long.Rd
 76c828ebc4af2aa768e38bf959af4353 *man/movies_wide.Rd
 f0aa869c42fcccef14881835d7d0f4ae *man/p_adjust_text.Rd

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,9 @@
+# pairwiseComparisons 0.3.1
+
+  - Adapts to breaking changes in upcoming release of `broom 0.7.0`.
+
+  - Thanks to Sarah, the package has a hexsticker. :)
+
 # pairwiseComparisons 0.3.0
 
   - Due to changes made to downstream dependencies, the minimum R version

diff --git a/R/data.R b/R/data.R
@@ -97,9 +97,6 @@
 #'   \item value.	Value of the measurement.
 #' }
 #'
-#' @source
-#' \url{https://stat.ethz.ch/R-manual/R-devel/library/datasets/html/iris.html}
-#'
 #' @examples
 #' dim(iris_long)
 #' head(iris_long)

diff --git a/R/global_vars.R b/R/global_vars.R
@@ -203,7 +203,8 @@ utils::globalVariables(
     "main",
     "pair1",
     "W",
-    "stat"
+    "stat",
+    "contrast"
   ),
   package = "pairwiseComparisons",
   add = FALSE

diff --git a/R/pairwise_comparisons.R b/R/pairwise_comparisons.R
@@ -226,7 +226,15 @@ pairwise_comparisons <- function(data,
       # extracting and cleaning up Tukey's HSD output
       df_tukey <-
         stats::TukeyHSD(x = aovmodel, conf.level = 0.95) %>%
-        broomExtra::tidy(.) %>%
+        broomExtra::tidy(.)
+
+      # breaking change in `broom 0.7.0`
+      if ("contrast" %in% names(df_tukey)) {
+        df_tukey %<>% dplyr::rename(.data = ., comparison = contrast)
+      }
+
+      # cleanup
+      df_tukey %<>%
         dplyr::select(.data = ., comparison, estimate) %>%
         tidyr::separate(
           data = .,

diff --git a/README.md b/README.md
@@ -5,14 +5,14 @@
 
 | Package                                                                                                                                                                         | Status                                                                                                                                                                                                       | Usage                                                                                                                                                                                 | GitHub                                                                                                                                                                         | References                                                                                                                                                                      |
 | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| [![CRAN\_Release\_Badge](http://www.r-pkg.org/badges/version-ago/pairwiseComparisons)](https://CRAN.R-project.org/package=pairwiseComparisons)                                  | [![Travis Build Status](https://travis-ci.org/IndrajeetPatil/pairwiseComparisons.svg?branch=master)](https://travis-ci.org/IndrajeetPatil/pairwiseComparisons)                                               | [![Daily downloads badge](https://cranlogs.r-pkg.org/badges/last-day/pairwiseComparisons?color=blue)](https://CRAN.R-project.org/package=pairwiseComparisons)                         | [![GitHub version](https://img.shields.io/badge/GitHub-0.3.0-orange.svg?style=flat-square)](https://github.com/IndrajeetPatil/pairwiseComparisons/)                            | [![Website](https://img.shields.io/badge/website-pairwiseComparisons-orange.svg?colorB=E91E63)](https://indrajeetpatil.github.io/pairwiseComparisons/)                          |
+| [![CRAN\_Release\_Badge](http://www.r-pkg.org/badges/version-ago/pairwiseComparisons)](https://CRAN.R-project.org/package=pairwiseComparisons)                                  | [![Travis Build Status](https://travis-ci.org/IndrajeetPatil/pairwiseComparisons.svg?branch=master)](https://travis-ci.org/IndrajeetPatil/pairwiseComparisons)                                               | [![Daily downloads badge](https://cranlogs.r-pkg.org/badges/last-day/pairwiseComparisons?color=blue)](https://CRAN.R-project.org/package=pairwiseComparisons)                         | [![GitHub version](https://img.shields.io/badge/GitHub-0.3.1-orange.svg?style=flat-square)](https://github.com/IndrajeetPatil/pairwiseComparisons/)                            | [![Website](https://img.shields.io/badge/website-pairwiseComparisons-orange.svg?colorB=E91E63)](https://indrajeetpatil.github.io/pairwiseComparisons/)                          |
 | [![CRAN Checks](https://cranchecks.info/badges/summary/pairwiseComparisons)](https://cran.r-project.org/web/checks/check_results_pairwiseComparisons.html)                      | [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/github/IndrajeetPatil/pairwiseComparisons?branch=master&svg=true)](https://ci.appveyor.com/project/IndrajeetPatil/pairwiseComparisons) | [![Weekly downloads badge](https://cranlogs.r-pkg.org/badges/last-week/pairwiseComparisons?color=blue)](https://CRAN.R-project.org/package=pairwiseComparisons)                       | [![Forks](https://img.shields.io/badge/forks-3-blue.svg)](https://github.com/IndrajeetPatil/pairwiseComparisons/)                                                              | [![Rdoc](https://www.rdocumentation.org/badges/version/pairwiseComparisons)](https://www.rdocumentation.org/packages/pairwiseComparisons)                                       |
-| [![minimal R version](https://img.shields.io/badge/R%3E%3D-3.6.0-6666ff.svg)](https://cran.r-project.org/)                                                                      | [![lifecycle](https://img.shields.io/badge/lifecycle-maturing-blue.svg)](https://www.tidyverse.org/lifecycle/)                                                                                               | [![Monthly downloads badge](https://cranlogs.r-pkg.org/badges/last-month/pairwiseComparisons?color=blue)](https://CRAN.R-project.org/package=pairwiseComparisons)                     | [![Github Issues](https://img.shields.io/badge/issues-0-red.svg)](https://github.com/IndrajeetPatil/pairwiseComparisons/issues)                                                | [![vignettes](https://img.shields.io/badge/vignettes-0.2.6-orange.svg?colorB=FF5722)](https://CRAN.R-project.org/package=pairwiseComparisons/vignettes/)                        |
+| [![minimal R version](https://img.shields.io/badge/R%3E%3D-3.6.0-6666ff.svg)](https://cran.r-project.org/)                                                                      | [![lifecycle](https://img.shields.io/badge/lifecycle-maturing-blue.svg)](https://www.tidyverse.org/lifecycle/)                                                                                               | [![Monthly downloads badge](https://cranlogs.r-pkg.org/badges/last-month/pairwiseComparisons?color=blue)](https://CRAN.R-project.org/package=pairwiseComparisons)                     | [![Github Issues](https://img.shields.io/badge/issues-2-red.svg)](https://github.com/IndrajeetPatil/pairwiseComparisons/issues)                                                | [![vignettes](https://img.shields.io/badge/vignettes-0.3.1-orange.svg?colorB=FF5722)](https://github.com/IndrajeetPatil/pairwiseComparisons/blob/master/README.md)              |
 | [![GitHub code size in bytes](https://img.shields.io/github/languages/code-size/IndrajeetPatil/pairwiseComparisons.svg)](https://github.com/IndrajeetPatil/pairwiseComparisons) | [![Coverage Status](https://coveralls.io/repos/github/IndrajeetPatil/pairwiseComparisons/badge.svg?branch=master)](https://coveralls.io/github/IndrajeetPatil/pairwiseComparisons?branch=master)             | [![Total downloads badge](https://cranlogs.r-pkg.org/badges/grand-total/pairwiseComparisons?color=blue)](https://CRAN.R-project.org/package=pairwiseComparisons)                      | [![Github Stars](https://img.shields.io/github/stars/IndrajeetPatil/pairwiseComparisons.svg?style=social&label=Github)](https://github.com/IndrajeetPatil/pairwiseComparisons) | [![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.2074621.svg)](https://doi.org/10.5281/zenodo.2074621)                                                                       |
-| [![Licence](https://img.shields.io/badge/licence-GPL--3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0.en.html)                                                                | [![Codecov test coverage](https://codecov.io/gh/IndrajeetPatil/pairwiseComparisons/branch/master/graph/badge.svg)](https://codecov.io/gh/IndrajeetPatil/pairwiseComparisons?branch=master)                   | [![Covrpage Summary](https://img.shields.io/badge/covrpage-Last_Build_2020_02_11-brightgreen.svg)](https://github.com/IndrajeetPatil/pairwiseComparisons/blob/master/tests/README.md) | [![Last-changedate](https://img.shields.io/badge/last%20change-2020--04--11-yellowgreen.svg)](https://github.com/IndrajeetPatil/pairwiseComparisons/commits/master)            | [![GitHub last commit](https://img.shields.io/github/last-commit/IndrajeetPatil/pairwiseComparisons.svg)](https://github.com/IndrajeetPatil/pairwiseComparisons/commits/master) |
+| [![Licence](https://img.shields.io/badge/licence-GPL--3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0.en.html)                                                                | [![Codecov test coverage](https://codecov.io/gh/IndrajeetPatil/pairwiseComparisons/branch/master/graph/badge.svg)](https://codecov.io/gh/IndrajeetPatil/pairwiseComparisons?branch=master)                   | [![Covrpage Summary](https://img.shields.io/badge/covrpage-Last_Build_2020_02_11-brightgreen.svg)](https://github.com/IndrajeetPatil/pairwiseComparisons/blob/master/tests/README.md) | [![Last-changedate](https://img.shields.io/badge/last%20change-2020--05--27-yellowgreen.svg)](https://github.com/IndrajeetPatil/pairwiseComparisons/commits/master)            | [![GitHub last commit](https://img.shields.io/github/last-commit/IndrajeetPatil/pairwiseComparisons.svg)](https://github.com/IndrajeetPatil/pairwiseComparisons/commits/master) |
 | [![status](https://tinyverse.netlify.com/badge/pairwiseComparisons)](https://CRAN.R-project.org/package=pairwiseComparisons)                                                    | [![R build status](https://github.com/IndrajeetPatil/pairwiseComparisons/workflows/R-CMD-check/badge.svg)](https://github.com/IndrajeetPatil/pairwiseComparisons)                                            | [![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/pairwiseComparisons/community)                                                                       | [![Project Status](http://www.repostatus.org/badges/latest/active.svg)](http://www.repostatus.org/#active)                                                                     | [![contributions welcome](https://img.shields.io/badge/contributions-welcome-brightgreen.svg?style=flat)](https://github.com/IndrajeetPatil/pairwiseComparisons/issues)         |
 
-# Introduction
+# Introduction <img src="man/figures/logo.png" align="right" width="240" />
 
 [`pairwiseComparisons`](https://indrajeetpatil.github.io/pairwiseComparisons/)
 provides a tidy data friendly way to carry out pairwise comparison
@@ -478,6 +478,11 @@ p +
 
 <img src="man/figures/README-ggsignif2-1.png" width="100%" />
 
+# Acknowledgments
+
+The hexsticker was generously designed by Sarah Otterstetter (Max Planck
+Institute for Human Development, Berlin).
+
 # Contributing
 
 I’m happy to receive bug reports, suggestions, questions, and (most of

diff --git a/inst/WORDLIST b/inst/WORDLIST
@@ -18,6 +18,7 @@ freighteningness
 github
 Github
 Gitter
+hexsticker
 HFHD
 howell
 https
@@ -33,6 +34,7 @@ lifecycle
 mpaa
 MPAA
 NumGenre
+Otterstetter
 Rdoc
 rpubs
 RPubs

diff --git a/man/figures/logo.png b/man/figures/logo.png
diff --git a/man/iris_long.Rd b/man/iris_long.Rd