Merge branch 'hotfix/2.4.2'

#SUP-9 #hotfix
UCLATALL · Jul 24, 2021 · d5922ae · d5922ae
2 parents f5d3b37 + 6e31b35
commit d5922ae
Show file tree

Hide file tree

Showing 11 changed files with 808 additions and 11 deletions.
diff --git a/.github/workflows/check-standard.yaml b/.github/workflows/check-standard.yaml
@@ -5,10 +5,12 @@ on:
     branches:
       - main
       - release/*
+      - hotfix/*
   pull_request:
     branches:
       - develop
       - release/*
+      - hotfix/*
 
 name: R-CMD-check
 

diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: supernova
 Type: Package
 Title: Judd, McClelland, & Ryan Formatting for ANOVA Output
-Version: 2.4.1
-Date: 2021-05-28
+Version: 2.4.2
+Date: 2021-07-24
 Authors@R: c(
     person(
       "Adam", "Blake", 
@@ -47,7 +47,7 @@ Imports:
     rlang,
     stringr,
     vctrs,
-    pillar,
+    pillar (>= 1.5.0),
     methods,
     backports
 RoxygenNote: 7.1.1

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,8 @@
+# supernova 2.4.2
+
+* Hotfix to ensure appropriate version of `pillar` is available (thanks @cedricbatailler)
+
+
 # supernova 2.4.1
 
 * Small tweaks to make the package work on R 3.4.0

diff --git a/cran-comments.md b/cran-comments.md
@@ -1,17 +1,15 @@
 ## Release summary
 
-Small tweaks to make the package work on R 3.4
+Hotfix to ensure appropriate version of `pillar` is installed
 
 
 ## Test environments
 
-- Local install on macOS Big Sur 11.3; R 4.0.4
-- Win Builder via `devtools::check_win_devel()`
-- R-Hub via `devtools::check_rhub()`
+- Local install on macOS Big Sur 11.5; R 4.1.0
 - GitHub Actions
-  * Mac OS X, 10.15.7; R 4.0.5
-  * Microsoft Windows Server 2019, 10.0.17763; R 4.0.5
-  * Ubuntu, 20.04; R-devel, R 4.0.5, 3.4.4
+  * Mac OS X, 10.15.7; R 4.1.0
+  * Microsoft Windows Server 2019, 10.0.17763; R 4.1.0
+  * Ubuntu, 20.04; R-devel, R 4.1.0, 3.4.4
 
 
 ## R CMD check results

diff --git a/tests/testthat/_snaps/pairwise/bonferroni-one-variable.svg b/tests/testthat/_snaps/pairwise/bonferroni-one-variable.svg