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

rdev 1.7.2 #165

Merged
merged 6 commits into from
Nov 8, 2023
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
3 changes: 2 additions & 1 deletion .lintr
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ linters: linters_with_tags(
missing_package_linter = NULL,
namespace_linter = NULL,
nonportable_path_linter = NULL,
paste_linter(allow_file_path = "always"),
todo_comment_linter = NULL,
undesirable_function_linter(
within(all_undesirable_functions, rm(ifelse, library, require))
within(all_undesirable_functions, rm(ifelse, library, require, structure))
),
undesirable_operator_linter(all_undesirable_operators),
unnecessary_concatenation_linter(allow_single_expression = FALSE),
Expand Down
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: rdev
Title: R Development Tools
Version: 1.7.1
Version: 1.7.2
Authors@R:
person("John", "Benninghoff", , "[email protected]", role = c("aut", "cre"),
comment = c(ORCID = "0000-0002-6230-4742"))
Expand Down
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# rdev 1.7.2

* Updated `.lintr` for `lintr` 3.1.1 (update `use_lintr()`)

# rdev 1.7.1

* Updated installation instructions in README and templates to use `remotes` instead of `devtools`
Expand Down
8 changes: 4 additions & 4 deletions R/ci.R
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ style_all <- function(path = ".",
#' Lint all files in a project. Implemented as a wrapper for [lintr::lint_dir()].
#'
#' @param pattern regex pattern for files, by default it will take files with any of the extensions
#' .R, .Rmd, .Rnw, .Rpres, .Rhtml, .Rrst, .Rtex, .Rtxt allowing for lowercase r (.r, ...)
#' .R, .Rmd, .qmd, .Rnw, .Rhtml, .Rpres, .Rrst, .Rtex, .Rtxt, ignoring case.
#'
#' @inheritParams lintr::lint_dir
#' @inheritDotParams lintr::lint_dir
Expand All @@ -62,8 +62,8 @@ style_all <- function(path = ".",
#' lint_all("analysis")
#' }
#' @export
lint_all <- function(path = ".", pattern = "\\.[Rr](?:|html|md|nw|pres|rst|tex|txt)$", ...) {
lintr::lint_dir(path = path, pattern = pattern, ...)
lint_all <- function(pattern = "(?i)[.](r|rmd|qmd|rnw|rhtml|rpres|rrst|rtex|rtxt)$", ...) {
lintr::lint_dir(pattern = pattern, ...)
}

print_tbl <- function(df) {
Expand Down Expand Up @@ -178,7 +178,7 @@ ci <- function(renv = TRUE, missing = TRUE, styler = NULL, lintr = TRUE, # nolin
writeLines('Setting env vars: NOT_CRAN="true", CI="true"')
writeLines('rcmdcheck::rcmdcheck(args = "--no-manual", error_on = "warning")')
withr::with_envvar(
new = c("NOT_CRAN" = "true", "CI" = "true"),
new = c(NOT_CRAN = "true", CI = "true"),
rcmdcheck::rcmdcheck(args = "--no-manual", error_on = "warning")
)
}
Expand Down
3 changes: 1 addition & 2 deletions R/setup.R
Original file line number Diff line number Diff line change
Expand Up @@ -447,9 +447,8 @@ use_rdev_package <- function(quiet = TRUE) {

#' Use Analysis Package Layout
#'
# nolint start: line_length_linter.
# nolint next: line_length_linter.
#' Add the [Analysis Package Layout](https://jabenninghoff.github.io/rdev/articles/analysis-package-layout.html)
# nolint end
#' to the current package.
#'
#' When run, `use_analysis_package()` creates analysis package directories, adds exclusions to
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -219,20 +219,20 @@ ci()
#> * creating vignettes ... OK
#> * checking for LF line-endings in source and make files and shell scripts
#> * checking for empty or unneeded directories
#> * building ‘rdev_1.7.1.tar.gz’
#> * building ‘rdev_1.7.2.tar.gz’
#>
#> ── R CMD check ─────────────────────────────────────────────────────────────────
#> * using log directory ‘/private/var/folders/vn/cw5f9gws42v9m8mdsds_zbl00000gp/T/RtmpeHfgB0/file17b2e38ad6f9f/rdev.Rcheck’
#> * using R version 4.3.1 (2023-06-16)
#> * using log directory ‘/private/var/folders/vn/cw5f9gws42v9m8mdsds_zbl00000gp/T/RtmpqdwUkp/file134fe7af49db9/rdev.Rcheck’
#> * using R version 4.3.2 (2023-10-31)
#> * using platform: x86_64-apple-darwin20 (64-bit)
#> * R was compiled by
#> Apple clang version 14.0.3 (clang-1403.0.22.14.1)
#> Apple clang version 14.0.0 (clang-1400.0.29.202)
#> GNU Fortran (GCC) 12.2.0
#> * running under: macOS Monterey 12.6.8
#> * running under: macOS Monterey 12.7.1
#> * using session charset: UTF-8
#> * using option ‘--no-manual’
#> * checking for file ‘rdev/DESCRIPTION’ ... OK
#> * this is package ‘rdev’ version ‘1.7.1
#> * this is package ‘rdev’ version ‘1.7.2
#> * package encoding: UTF-8
#> * checking package namespace information ... OK
#> * checking package dependencies ... OK
Expand Down Expand Up @@ -291,8 +291,8 @@ ci()
#> * DONE
#>
#> Status: OK
#> ── R CMD check results ───────────────────────────────────────── rdev 1.7.1 ────
#> Duration: 48.8s
#> ── R CMD check results ───────────────────────────────────────── rdev 1.7.2 ────
#> Duration: 54.7s
#>
#> 0 errors ✔ | 0 warnings ✔ | 0 notes ✔
```
2 changes: 1 addition & 1 deletion docs/404.html

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

2 changes: 1 addition & 1 deletion docs/LICENSE-text.html

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

2 changes: 1 addition & 1 deletion docs/LICENSE.html

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

2 changes: 1 addition & 1 deletion docs/TODO.html

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

2 changes: 1 addition & 1 deletion docs/articles/analysis-package-layout.html

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

2 changes: 1 addition & 1 deletion docs/articles/index.html

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

2 changes: 1 addition & 1 deletion docs/articles/style-guide.html

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

9 changes: 5 additions & 4 deletions docs/authors.html

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

18 changes: 9 additions & 9 deletions docs/index.html

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

6 changes: 5 additions & 1 deletion docs/news/index.html

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

4 changes: 2 additions & 2 deletions docs/pkgdown.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
pandoc: 3.1.7
pandoc: 3.1.9
pkgdown: 2.0.7
pkgdown_sha: ~
articles:
analysis-package-layout: analysis-package-layout.html
style-guide: style-guide.html
last_built: 2023-09-21T03:25Z
last_built: 2023-11-08T19:47Z
urls:
reference: https://jabenninghoff.github.io/rdev/reference
article: https://jabenninghoff.github.io/rdev/articles
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/build_analysis_site.html

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

2 changes: 1 addition & 1 deletion docs/reference/build_rdev_site.html

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

2 changes: 1 addition & 1 deletion docs/reference/check_renv.html

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

2 changes: 1 addition & 1 deletion docs/reference/ci.html

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

2 changes: 1 addition & 1 deletion docs/reference/create_github_repo.html

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

2 changes: 1 addition & 1 deletion docs/reference/deps_check.html

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

2 changes: 1 addition & 1 deletion docs/reference/get_license.html

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

2 changes: 1 addition & 1 deletion docs/reference/get_release.html

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

2 changes: 1 addition & 1 deletion docs/reference/html_url_check.html

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

Loading