Merge pull request #555 from lorenzwalthert/dev

Relax dependencies on stdout / stderr for third-party packages on CRAN

Author: lorenzwalthert

R/release.R

@@ -98,6 +98,7 @@ release_msg <- function(last_release, new_version) {
 #' @param tag The tag to push. `NULL` will derive the tag from `DESCRIPTION`.
 #' @keywords internal
 release_complete <- function(ask = TRUE, is_cran = ask, tag = NULL) {
+  abort_if_not_yes("Are you on main branch with no changes in worktree?")
   if (git_branch_get() != "main") {
     rlang::abort("Must be on main to complete the release.")
   }

R/testing.R

@@ -273,6 +273,17 @@ not_conda <- function() {
   Sys.getenv("PRECOMMIT_INSTALLATION_METHOD") != "conda"
 }
 
+#' Reduce a check to the empty string on CRAN
+#'
+#' In testing, we don't want to rely on exact error messages or stdout on CRAN
+#' for third-party packages, since this would complicate the release process for
+#' dependencies of \{precommit\}.
+#' @param string The string to test.
+#' @keywords internal
+empty_on_cran <- function(string) {
+  ifelse(on_cran(), "", string)
+}
+
 #' Testing utilities
 #'
 #' Similar to the `local_()` family from `{withr}`, this function creates a

man/empty_on_cran.Rd

@@ -16,7 +16,7 @@ run_test("pkgdown",
     "DESCRIPTION" = "DESCRIPTION"
   ),
   suffix = "",
-  std_err = "topic must be a known"
+  std_err = empty_on_cran("topic must be a known")
 )
 
 # failed articles

tests/testthat/test-hook-pkgdown.R

@@ -3,7 +3,7 @@ run_test("roxygenize",
   file_name = c("man/flie.Rd" = "flie.Rd"),
   suffix = "",
   std_err = NA,
-  std_out = "Writing NAMESPACE",
+  std_out = empty_on_cran("Writing NAMESPACE"),
   artifacts = c(
     "DESCRIPTION" = test_path("in/DESCRIPTION-no-deps.dcf"),
     "R/roxygenize.R" = test_path("in/roxygenize.R")
@@ -24,7 +24,7 @@ if (!on_cran()) {
     suffix = "",
     std_err = NA,
     cmd_args = "--root=rpkg",
-    std_out = "Writing NAMESPACE",
+    std_out = empty_on_cran("Writing NAMESPACE"),
     artifacts = c(
       "rpkg/DESCRIPTION" = test_path("in/DESCRIPTION-no-deps.dcf"),
       "rpkg/R/roxygenize.R" = test_path("in/roxygenize.R")
@@ -79,7 +79,7 @@ run_test("roxygenize",
 run_test("roxygenize",
   file_name = c("man/flie.Rd" = "flie-true.Rd"),
   suffix = "",
-  std_err = "Writing NAMESPACE",
+  std_err = empty_on_cran("Writing NAMESPACE"),
   artifacts = c(
     "DESCRIPTION" = test_path("in/DESCRIPTION-no-deps.dcf"),
     "R/roxygenize.R" = test_path("in/roxygenize.R")