Merge branch 'release/2.5.7'

UCLATALL · Aug 23, 2023 · 77b8746 · 77b8746
2 parents ce2f9ae + c6f1a49
commit 77b8746
Show file tree

Hide file tree

Showing 16 changed files with 93 additions and 34 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -13,3 +13,4 @@ cache_test_data
 ^CRAN-SUBMISSION$
 ^LICENSE\.md$
 ^\.vscode$
+^revdep$
diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml
@@ -23,12 +23,12 @@ jobs:
       fail-fast: false
       matrix:
         config:
-          - {os: macOS-latest, r: "release"}
-          - {os: windows-latest, r: "release"}
-          - {os: windows-latest, r: "3.6"}
-          - {os: ubuntu-20.04, r: "devel", http-user-agent: "release"}
-          - {os: ubuntu-20.04, r: "release"}
-          - {os: ubuntu-20.04, r: "oldrel-1"}
+          - { os: macOS-latest, r: "release" }
+          - { os: windows-latest, r: "release" }
+          - { os: windows-latest, r: "3.6" }
+          - { os: ubuntu-20.04, r: "devel", http-user-agent: "release" }
+          - { os: ubuntu-20.04, r: "release" }
+          - { os: ubuntu-20.04, r: "oldrel-1" }
 
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
@@ -62,3 +62,5 @@ jobs:
       - uses: r-lib/actions/check-r-package@v2
         with:
           upload-snapshots: true
+        env:
+          _R_CHECK_STOP_ON_INVALID_NUMERIC_VERSION_INPUTS_: true
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Type: Package
 Package: supernova
 Title: Judd, McClelland, & Ryan Formatting for ANOVA Output
-Version: 2.5.6
-Date: 2023-03-20
+Version: 2.5.7
+Date: 2023-08-23
 Authors@R: c(
     person("Adam", "Blake", , "[email protected]", role = c("cre", "aut"),
            comment = c(ORCID = "0000-0001-7881-8652")),
@@ -19,7 +19,7 @@ Description: Produces ANOVA tables in the format used by Judd, McClelland,
 License: AGPL (>= 3)
 URL: https://github.com/UCLATALL/supernova
 BugReports: https://github.com/UCLATALL/supernova/issues
-Depends: 
+Depends:
     R (>= 3.4.0)
 Imports:
     backports,
@@ -34,7 +34,7 @@ Imports:
     stringr,
     tibble,
     vctrs
-Suggests: 
+Suggests:
     car,
     covr,
     lintr,
@@ -46,4 +46,4 @@ Config/testthat/edition: 3
 Encoding: UTF-8
 LazyData: yes
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.2.0
+RoxygenNote: 7.2.3
diff --git a/NEWS.md b/NEWS.md
@@ -1,13 +1,18 @@
 # Changelog
 
+## supernova 2.5.7
+
+- Check package version using string comparison to pass _R_CHECK_STOP_ON_INVALID_NUMERIC_VERSION_INPUTS_ check on CRAN
+- Match parameter names to docs for two internal functions
+
 ## supernova 2.5.6
 
 - Move from deprecated `rlang::with_handlers` + `rlang::calling` to the simpler `rlang::try_fetch`
 - Fix generic function consistency errors (`ggplot2::autoplot`, `pillar::tbl_sum`) with current version (on devel build)
 
 ## supernova 2.5.5
 
-- Remove data (all moved to the [`coursekata` package](https://github.com/UCLATALL/coursekata-r)). This removes some of the messages that spout when the `coursekata` package loads.
+- Remove data (all moved to the [`coursekata` package](https://github.com/coursekata/coursekata-r)). This removes some of the messages that spout when the `coursekata` package loads.
 
 ## supernova 2.5.4
 
@@ -35,7 +40,7 @@
 - Fix bug where `pairwise()` would not recognize categorical variables if they were created by using
   `factor()` in the formula, e.g. `pairwise(lm(mpg ~ factor(cyl), data = mtcars))`.
 - Fix printing in RMarkdown documents where `supernova()` output was interpreted as a table.
-- Move `estimate-extraction` functions to [`coursekata`](https://github.com/UCLATALL/coursekata-r).
+- Move `estimate-extraction` functions to [`coursekata`](https://github.com/coursekata/coursekata-r).
 - **Breaking**: drop support for R 3.4
 
 ## supernova 2.4.4

diff --git a/R/supernova.R b/R/supernova.R
@@ -129,8 +129,8 @@ row_blank <- function(term = NA_character_, description = NA_character_,
 #'
 #' @param term The name of the term the row describes.
 #' @param description An optional, short description of the term (pedagogical).
-#' @param complex The complex model containing the term.
-#' @param simple The simple model (without the term) to compare it to.
+#' @param models The models created by [`generate_models()`] for comparison.
+#' @param term The term to compute the row for.
 #'
 #' @return A [`tibble_row`] with the properties initialized. The code has been written to be as
 #'   simple and understanding as possible. Please take a look at the source and offer any
@@ -175,19 +175,19 @@ row_term <- function(name, description, models, term) {
 #'
 #' @param term The name of the term the row describes (e.g. Error or Total).
 #' @param description An optional, short description of the term (pedagogical).
-#' @param complex The model we are describing error from.
+#' @param fit The model we are describing error from.
 #'
 #' @return A [`tibble_row`] with the properties initialized. The code has been written to be as
 #'   simple and understandable as possible. Please take a look at the source and offer any
 #'   suggestions for improvement!
 #'
 #' @keywords internal
-row_error <- function(name, description, fit) {
+row_error <- function(term, description, fit) {
   ss <- sum(fit$residuals^2)
   df <- nrow(fit$model) - length(fit$coefficients)
   ms <- ss / df
 
-  row_blank(name, description, ss, df, ms)
+  row_blank(term, description, ss, df, ms)
 }
 
 

diff --git a/cran-comments.md b/cran-comments.md
@@ -1,7 +1,8 @@
 ## Release summary
 
-- Move from deprecated `rlang::with_handlers` & `rlang::calling` to the simpler `rlang::try_fetch`
-- Fix generic function consistency errors (`ggplot2::autoplot`, `pillar::tbl_sum`) with current version (on devel build)
+- Check package version using string comparison to pass _R_CHECK_STOP_ON_INVALID_NUMERIC_VERSION_INPUTS_ check on CRAN
+- Match parameter names to docs for two internal functions
+- Fixed notes about HTTP 301 responses on NEWS.md links
 
 ## Test environments
 
@@ -21,4 +22,8 @@ R CMD check succeeded
 
 ## Reverse dependencies
 
-No known reverse dependencies (no results from `devtools::revdep('supernova')`)
+Dependencies were identified with `devtools::revdep_check()` and tested with `revdepcheck::revdep_check(num_workers = 4)`. No problems were found.
+
+Packages:
+
+- eda4treeR
diff --git a/man/check_pairwise_args.Rd b/man/check_pairwise_args.Rd
diff --git a/man/row_error.Rd b/man/row_error.Rd
diff --git a/man/row_term.Rd b/man/row_term.Rd
diff --git a/revdep/.gitignore b/revdep/.gitignore
@@ -0,0 +1,7 @@
+checks
+library
+checks.noindex
+library.noindex
+cloud.noindex
+data.sqlite
+*.html
diff --git a/revdep/README.md b/revdep/README.md
@@ -0,0 +1,27 @@
+# Platform
+
+| field    | value                              |
+| :------- | :--------------------------------- |
+| version  | R version 4.2.3 (2023-03-15)       |
+| os       | macOS Ventura 13.5                 |
+| system   | aarch64, darwin20                  |
+| ui       | X11                                |
+| language | (EN)                               |
+| collate  | en_US.UTF-8                        |
+| ctype    | en_US.UTF-8                        |
+| tz       | America/Los_Angeles                |
+| date     | 2023-08-23                         |
+| pandoc   | 3.1.6.2 @ /opt/homebrew/bin/pandoc |
+
+# Dependencies
+
+| package   | old   | new   | Δ   |
+| :-------- | :---- | :---- | :-- |
+| supernova | 2.5.6 | 2.5.7 | \*  |
+| ggplot2   | NA    | 3.4.3 | \*  |
+| gtable    | NA    | 0.3.4 | \*  |
+| purrr     | NA    | 1.0.2 | \*  |
+
+# Revdeps
+
+- eda4treeR
diff --git a/revdep/cran.md b/revdep/cran.md
@@ -0,0 +1,7 @@
+## revdepcheck results
+
+We checked 1 reverse dependencies, comparing R CMD check results across CRAN and dev versions of this package.
+
+ * We saw 0 new problems
+ * We failed to check 0 packages
+
diff --git a/revdep/email.yml b/revdep/email.yml
@@ -0,0 +1,5 @@
+release_date: ???
+rel_release_date: ???
+my_news_url: ???
+release_version: ???
+release_details: ???
diff --git a/revdep/failures.md b/revdep/failures.md
@@ -0,0 +1 @@
+*Wow, no problems at all. :)*
diff --git a/revdep/problems.md b/revdep/problems.md
@@ -0,0 +1 @@
+*Wow, no problems at all. :)*
diff --git a/tests/testthat/test-supernova.lmerMod.R b/tests/testthat/test-supernova.lmerMod.R
@@ -91,7 +91,7 @@ test_that("magrittr can pipe lmer() to supernova", {
 
 test_that("magrittr can pipe data to lm() to supernova", {
   skip_if(
-    package_version(R.version) < 3.5,
+    package_version(R.version) < "3.5",
     "This is only skipped to make this package compatible with DataCamp Light."
   )
 
@@ -173,7 +173,7 @@ test_that("nested repeated measures tables are beautifully formatted", {
 
 test_that("crossed repeated measures tables are beautifully formatted", {
   skip_if(
-    package_version(R.version) < 3.5,
+    package_version(R.version) < "3.5",
     "The MSE between will be off negligibly on older R versions (~.001)."
   )