Skip to content

Auto-Convert to LF from CLF #321

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

Merged
merged 5 commits into from
Nov 26, 2021
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: 2 additions & 0 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ jobs:
# Windows
- {os: windows-latest, r: 'release', installation_method: 'pip'}
- {os: windows-latest, r: 'release', installation_method: 'conda'}
- {os: windows-latest, r: 'devel', installation_method: 'conda'}

# Linux
- {os: ubuntu-18.04, r: 'release', installation_method: 'pip', rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest", http-user-agent: "R/4.0.0 (ubuntu-18.04) R (4.0.0 x86_64-pc-linux-gnu x86_64 linux-gnu) on GitHub Actions" }
- {os: ubuntu-18.04, r: 'release', installation_method: 'conda', rspm: "https://packagemanager.rstudio.com/cran/__linux__/bionic/latest", http-user-agent: "R/4.0.0 (ubuntu-18.04) R (4.0.0 x86_64-pc-linux-gnu x86_64 linux-gnu) on GitHub Actions" }
Expand Down
8 changes: 5 additions & 3 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,17 @@ includes switching to R based hook for `readme-rmd-render`, avoiding the
{usethis} dependency, integration tests via GitHub Actions, auto-updates for
used packages, roxygen snippet generation and more. In addition:

* New option `precommit.block_install_hooks` (defaults to `FALSE`) governs
if `use_precommit(..., install_hooks = TRUE)` should be blocking until
hooks are installed or not.
* `use_precommit(..., install_hooks = TRUE)` is no longer blocking by default.
New option `precommit.block_install_hooks` (defaults to `FALSE`) governs the
behavior (#312).
* Always sort `inst/WORDLIST` (#303).
* rename default branch to *main* (#307).
* `style-files` hook gains an argument `--cache-root` that is passed to
`options(styler.cache_root = ...)` (#305).
* Use dev version of {lintr} to reduce total dependencies from 71 to 59 that
brings down install time.
* Use LF line endings in git config to ensure passing tests on Windows for R
devel (#321).

# precommit v0.1.3.9012

Expand Down
5 changes: 5 additions & 0 deletions R/testing.R
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,11 @@ local_test_setup <- function(git = TRUE,
}
if (git) {
git2r::init()
git2r::config(
user.name = "testthat",
user.email = "[email protected]",
core.autocrlf = "true"
)
withr::defer(fs::dir_delete(fs::path(dir, ".git")), envir = .local_envir)
}
if (use_precommit) {
Expand Down
75 changes: 38 additions & 37 deletions inst/WORDLIST
Original file line number Diff line number Diff line change
@@ -1,39 +1,5 @@
Affero
CLI
CMD
Ctrl
EOF
Ei
Eic
Homebrew
KernSmooth
Lifecycle
MERCHANTABILITY
RData
RStudio
Rbuildignore
Rdata
Rds
Renviron
Resubmission
Rhistory
Rnw
RoxygenNote
Rprofile
Rproj
Rr
Rscript
SHA
Sublicensing
Sys
Uninstallation
Unstaged
Upvote
VignetteBuilder
WIPO
Walthert
Za
ae
Affero
api
appveyor
arg
Expand All @@ -47,7 +13,9 @@ bliblablupp
cfe
ci
cli
CLI
cmd
CMD
codemeta
codemetar
codetools
Expand All @@ -60,21 +28,25 @@ copyrightable
cp
cran
csv
Ctrl
dcf
deps
desc
dev
dir
dirname
docType
docopt
docsearch
docType
dontrun
donttest
Ei
Eic
elif
emph
entrypoint
env
EOF
eval
exlucded
fi
Expand All @@ -90,6 +62,7 @@ gitignore
grDevices
grepl
gsub
Homebrew
href
http
https
Expand All @@ -102,11 +75,14 @@ isAvailable
isTRUE
jpeg
json
KernSmooth
knitr
lang
lapply
LF
lgpl
licensors
Lifecycle
lintr
loadCache
lorenz
Expand All @@ -116,6 +92,7 @@ macOS
magrittr
maxkb
md
MERCHANTABILITY
mgcv
miniconda
mis
Expand Down Expand Up @@ -147,41 +124,58 @@ precommithooks
proj
purrr
py
rR
Rbuildignore
rc
Rdata
RData
rds
Rds
readLines
readme
recognised
relicensing
renv
Renviron
repo
repos
Resubmission
reticulate
Rhistory
rlang
rmarkdown
rmd
rnw
Rnw
roclet
roclets
ropenscilabs
roxygen
roxygenise
roxygenize
RoxygenNote
rpart
Rprofile
Rproj
rprojroot
rR
Rr
Rscript
rstudio
RStudio
rstudioapi
saveCache
seealso
sep
setdiff
SHA
stderr
stdout
sterr
stopifnot
styler
sublicenses
Sublicensing
Sys
tcltk
tempfile
testthat
Expand All @@ -192,16 +186,23 @@ travis
tryCatch
ubuntu
uninitialised
Uninstallation
unlist
unname
Unstaged
Upvote
usethis
usr
VignetteBuilder
walthert
Walthert
wd
WIPO
withr
wordlist
writeLines
www
yaml
yihui
yml
Za