Skip to content

Commit 4f5ac61

Browse files
Merge pull request #536 from lorenzwalthert/dev-roxygen-update
House keeping
2 parents 3835b4f + 95abfa1 commit 4f5ac61

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

DESCRIPTION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,5 +48,5 @@ Roxygen: list(markdown = TRUE, roclets = c( "rd", "namespace", "collate",
4848
if (rlang::is_installed("pkgapi")) "pkgapi::api_roclet" else {
4949
warning("Please install r-lib/pkgapi to make sure the file API is kept
5050
up to date"); NULL} ) )
51-
RoxygenNote: 7.2.3
51+
RoxygenNote: 7.3.0
5252
SystemRequirements: git

R/cache.R

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
#' Issue a warning if `{R.cache}` uses temporary cache only
1+
#' Issue a warning if \{R.cache\} uses temporary cache only
22
#'
33
#' This function used to check if a permanent cache was available and issue a
4-
#' warning if not, but since {R.cache} version `0.15.0` (release date
4+
#' warning if not, but since \{R.cache\} version `0.15.0` (release date
55
#' 2021-04-27), a permanent directory will be used automatically, so this check
66
#' if redundant. the function is kept in the package for compatibility, i.e.
7-
#' if someone updates the R package {precommit} but not the hook revisions.
7+
#' if someone updates the R package \{precommit\} but not the hook revisions.
88
#' @param temp_cache_is_enough ignored.
99
#' @family hook script helpers
1010
#' @keywords internal

R/release.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ release_prechecks <- function(bump, is_cran) {
144144
dsc
145145
}
146146

147-
#' Updates the hook version ref of {precommit} in a `.pre-commit-config` file
147+
#' Updates the hook version ref of \{precommit\} in a `.pre-commit-config` file
148148
#'
149149
#' This is useful in the release process because when releasing a new version,
150150
#' we must make sure the template that is used with `precommit::use_precommit()`

man/may_require_permanent_cache.Rd

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/update_rev_in_config.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/testthat/test-hook-roxygenize.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ test_that("warns if there is any other warning", {
154154
"R/blur.R"
155155
)
156156

157-
expect_warning(
157+
expect_message(
158158
roxygenize_with_cache(list(getwd()), dirs = dirs_R.cache("roxygenize")),
159159
"(with|a) @name"
160160
)

tests/testthat/test-hooks.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ run_test("deps-in-desc",
251251

252252
# in sub directory with wrong root
253253
run_test("deps-in-desc",
254-
suffix = "-fail.R", std_err = "contains a file",
254+
suffix = "-fail.R", std_err = "Could not find R package",
255255
file_transformer = function(files) {
256256
fs::path_abs(fs::file_move(files, "rpkg"))
257257
},

0 commit comments

Comments
 (0)