Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

House keeping #536

Merged
merged 3 commits into from
Jan 19, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,5 @@ Roxygen: list(markdown = TRUE, roclets = c( "rd", "namespace", "collate",
if (rlang::is_installed("pkgapi")) "pkgapi::api_roclet" else {
warning("Please install r-lib/pkgapi to make sure the file API is kept
up to date"); NULL} ) )
RoxygenNote: 7.2.3
RoxygenNote: 7.3.0
SystemRequirements: git
6 changes: 3 additions & 3 deletions R/cache.R
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#' Issue a warning if `{R.cache}` uses temporary cache only
#' Issue a warning if \{R.cache\} uses temporary cache only
#'
#' This function used to check if a permanent cache was available and issue a
#' warning if not, but since {R.cache} version `0.15.0` (release date
#' warning if not, but since \{R.cache\} version `0.15.0` (release date
#' 2021-04-27), a permanent directory will be used automatically, so this check
#' if redundant. the function is kept in the package for compatibility, i.e.
#' if someone updates the R package {precommit} but not the hook revisions.
#' if someone updates the R package \{precommit\} but not the hook revisions.
#' @param temp_cache_is_enough ignored.
#' @family hook script helpers
#' @keywords internal
Expand Down
2 changes: 1 addition & 1 deletion R/release.R
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ release_prechecks <- function(bump, is_cran) {
dsc
}

#' Updates the hook version ref of {precommit} in a `.pre-commit-config` file
#' Updates the hook version ref of \{precommit\} in a `.pre-commit-config` file
#'
#' This is useful in the release process because when releasing a new version,
#' we must make sure the template that is used with `precommit::use_precommit()`
Expand Down
6 changes: 3 additions & 3 deletions man/may_require_permanent_cache.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/update_rev_in_config.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion tests/testthat/test-hook-roxygenize.R
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ test_that("warns if there is any other warning", {
"R/blur.R"
)

expect_warning(
expect_message(
roxygenize_with_cache(list(getwd()), dirs = dirs_R.cache("roxygenize")),
"(with|a) @name"
)
Expand Down
2 changes: 1 addition & 1 deletion tests/testthat/test-hooks.R
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ run_test("deps-in-desc",

# in sub directory with wrong root
run_test("deps-in-desc",
suffix = "-fail.R", std_err = "contains a file",
suffix = "-fail.R", std_err = "Could not find R package",
file_transformer = function(files) {
fs::path_abs(fs::file_move(files, "rpkg"))
},
Expand Down
Loading