Skip to content

Commit 8ab346f

Browse files
Merge pull request #321 from lorenzwalthert/lorenzwalthert-patch-1
- Auto-Convert to LF from CLF (#321).
2 parents 9b2184e + 5e3d25c commit 8ab346f

File tree

4 files changed

+50
-40
lines changed

4 files changed

+50
-40
lines changed

.github/workflows/R-CMD-check.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ jobs:
3131
# Windows
3232
- {os: windows-latest, r: 'release', installation_method: 'pip'}
3333
- {os: windows-latest, r: 'release', installation_method: 'conda'}
34+
- {os: windows-latest, r: 'devel', installation_method: 'conda'}
35+
3436
# Linux
3537
- {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" }
3638
- {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" }

NEWS.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,17 @@ includes switching to R based hook for `readme-rmd-render`, avoiding the
55
{usethis} dependency, integration tests via GitHub Actions, auto-updates for
66
used packages, roxygen snippet generation and more. In addition:
77

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

1820
# precommit v0.1.3.9012
1921

R/testing.R

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,11 @@ local_test_setup <- function(git = TRUE,
256256
}
257257
if (git) {
258258
git2r::init()
259+
git2r::config(
260+
user.name = "testthat",
261+
user.email = "[email protected]",
262+
core.autocrlf = "true"
263+
)
259264
withr::defer(fs::dir_delete(fs::path(dir, ".git")), envir = .local_envir)
260265
}
261266
if (use_precommit) {

inst/WORDLIST

Lines changed: 38 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,5 @@
1-
Affero
2-
CLI
3-
CMD
4-
Ctrl
5-
EOF
6-
Ei
7-
Eic
8-
Homebrew
9-
KernSmooth
10-
Lifecycle
11-
MERCHANTABILITY
12-
RData
13-
RStudio
14-
Rbuildignore
15-
Rdata
16-
Rds
17-
Renviron
18-
Resubmission
19-
Rhistory
20-
Rnw
21-
RoxygenNote
22-
Rprofile
23-
Rproj
24-
Rr
25-
Rscript
26-
SHA
27-
Sublicensing
28-
Sys
29-
Uninstallation
30-
Unstaged
31-
Upvote
32-
VignetteBuilder
33-
WIPO
34-
Walthert
35-
Za
361
ae
2+
Affero
373
api
384
appveyor
395
arg
@@ -47,7 +13,9 @@ bliblablupp
4713
cfe
4814
ci
4915
cli
16+
CLI
5017
cmd
18+
CMD
5119
codemeta
5220
codemetar
5321
codetools
@@ -60,21 +28,25 @@ copyrightable
6028
cp
6129
cran
6230
csv
31+
Ctrl
6332
dcf
6433
deps
6534
desc
6635
dev
6736
dir
6837
dirname
69-
docType
7038
docopt
7139
docsearch
40+
docType
7241
dontrun
7342
donttest
43+
Ei
44+
Eic
7445
elif
7546
emph
7647
entrypoint
7748
env
49+
EOF
7850
eval
7951
exlucded
8052
fi
@@ -90,6 +62,7 @@ gitignore
9062
grDevices
9163
grepl
9264
gsub
65+
Homebrew
9366
href
9467
http
9568
https
@@ -102,11 +75,14 @@ isAvailable
10275
isTRUE
10376
jpeg
10477
json
78+
KernSmooth
10579
knitr
10680
lang
10781
lapply
82+
LF
10883
lgpl
10984
licensors
85+
Lifecycle
11086
lintr
11187
loadCache
11288
lorenz
@@ -116,6 +92,7 @@ macOS
11692
magrittr
11793
maxkb
11894
md
95+
MERCHANTABILITY
11996
mgcv
12097
miniconda
12198
mis
@@ -147,41 +124,58 @@ precommithooks
147124
proj
148125
purrr
149126
py
150-
rR
127+
Rbuildignore
151128
rc
129+
Rdata
130+
RData
152131
rds
132+
Rds
153133
readLines
154134
readme
155135
recognised
156136
relicensing
157137
renv
138+
Renviron
158139
repo
159140
repos
141+
Resubmission
160142
reticulate
143+
Rhistory
161144
rlang
162145
rmarkdown
163146
rmd
164147
rnw
148+
Rnw
165149
roclet
166150
roclets
167151
ropenscilabs
168152
roxygen
169153
roxygenise
170154
roxygenize
155+
RoxygenNote
171156
rpart
157+
Rprofile
158+
Rproj
172159
rprojroot
160+
rR
161+
Rr
162+
Rscript
173163
rstudio
164+
RStudio
174165
rstudioapi
175166
saveCache
176167
seealso
177168
sep
178169
setdiff
170+
SHA
179171
stderr
180172
stdout
181173
sterr
182174
stopifnot
183175
styler
184176
sublicenses
177+
Sublicensing
178+
Sys
185179
tcltk
186180
tempfile
187181
testthat
@@ -192,16 +186,23 @@ travis
192186
tryCatch
193187
ubuntu
194188
uninitialised
189+
Uninstallation
195190
unlist
196191
unname
192+
Unstaged
193+
Upvote
197194
usethis
198195
usr
196+
VignetteBuilder
199197
walthert
198+
Walthert
200199
wd
200+
WIPO
201201
withr
202202
wordlist
203203
writeLines
204204
www
205205
yaml
206206
yihui
207207
yml
208+
Za

0 commit comments

Comments
 (0)