Skip to content

Commit

Permalink
Merge branch 'september-2024' into gpooh_cup
Browse files Browse the repository at this point in the history
  • Loading branch information
Jennit07 committed Jul 2, 2024
2 parents a989b3f + 4e761ec commit 1d2562d
Show file tree
Hide file tree
Showing 150 changed files with 1,935 additions and 473 deletions.
1 change: 1 addition & 0 deletions .github/actions/spelling/allow.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ Moohan
Scougal
Tayside
Zihao
ubuntu
2 changes: 2 additions & 0 deletions .github/actions/spelling/excludes.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
\.psd$
\.pyc$
\.s$
\.sps$
\.svgz?$
\.tar$
\.tiff?$
Expand All @@ -57,4 +58,5 @@
^\Q.github/workflows/spelling.yml\E$
^\Q/tmp/check-spelling/Public-Health-Scotland/source-linkage-files/commits/f13483ca341940e8549dc23c930da2f23dd0ac43.message\E$
^\Q/tmp/check-spelling/Public-Health-Scotland/source-linkage-files/pull-request/613/summary.txt\E$
^\Qinst/WORDLIST\E$
ignore$
121 changes: 86 additions & 35 deletions .github/actions/spelling/expect.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
acc
accom
ACa
Accom
Admissio
admloc
admtype
adpe
adtf
alstr
arrivalmode
arth
atlassian
Expand All @@ -16,6 +18,7 @@ birthtime
bloodbfo
bodyloc
boxi
CAK
callr
canx
carehome
Expand All @@ -26,24 +29,25 @@ ccyy
cdn
cennum
CEREBROVASC
CHC
chd
chp
chpstart
cij
classificat
cls
Classificat
cmh
cnws
codecov
comhairle
commhosp
congen
copd
costincdnas
costinc
costmonthnum
costsfy
covr
cph
CPN
createslf
customise
cvd
Expand All @@ -57,124 +61,159 @@ datetime
daycase
dbconnect
dbplyr
deathdate
deathdiag
demog
dependant
devhints
dfc
diagramme
Diagramme
disch
dischloc
dischto
discondition
disdest
DMe
dminutes
dna
dontrun
dotdash
downup
dplyr
Drugsand
dsn
dtplyr
Dunkeld
dvprod
endomet
envir
eol
fcase
feb
Fhelper
fifelse
fileext
finalise
Finalise
fnc
Fraility
fst
ftm
furrr
fyear
fyyear
geogs
ggplot
GIC
github
GLS

Check failure on line 107 in .github/actions/spelling/expect.txt

View workflow job for this annotation

GitHub Actions / Check Spelling

`GLS` is ignored by check spelling because another more general variant is also in expect. (ignored-expect-variant)
gls
glsrecord
gms
gpoo
GPOo
gpooh
gpprac
gss
gtsave
hbnames
hbp
hbpraccode
hbrescode
hbtreatcode
hbtreatname
hci
hcp
HCP
hefailure
hhg
hiw
hjust
hms
homecare
homev
hri
HSCDIIP

Check failure on line 132 in .github/actions/spelling/expect.txt

View workflow job for this annotation

GitHub Actions / Check Spelling

`HSCDIIP` is ignored by check spelling because another more general variant is also in expect. (ignored-expect-variant)
hscdiip
hscp
hscpnames
htmltools
htmlwidgets
idpc
infyyear
httr
IDPC
img
improvementservice
incdn
incdnas
integerish
intzone
ipdc
isdscotland
issuenumber
itle
iwalk
jaccard
jan
javascript
jennifer
jul
JXz
keydate
keyring
keytime
keytimex
kis
lazydt
knitr
lcap
lcho
lgl
linetype
lintr
los
ltc
ltd
lubridate
magrittr
markdownguide
matern
mcbride
mcmahon
microsoft
MIU
mmmyy
MMMYY
momths
monthflag
mpat
multiarch
multiday
multisession
multistaff
na
NAs
netlify
newcons
nhs
nhshosp
noptions
noreply
nrs
nsu
nwtgck
odbc
oldtadm
opendata
openxl
openxlsx
orcid
outfile
ORCID
overcounting
pandoc
parkinsons
patflow
pattype
pcec
PCEC
PERTH
PHIBCS
phs
phsmethods
phsopendata
Physicaland
pkgdown
placeinc
plics
pms
PLICS
popluation
Posix
postcodes
ppas
prac
Expand All @@ -183,10 +222,9 @@ ptypes
purrr
quickstart
rankdir
rbuildignore
rcmdcheck
rdd
rds
rdname
reabl
reablement
readcode
Expand All @@ -197,18 +235,26 @@ recid
refailure
reflectoring
refsource
reftype
relaint
renviron
returnsthe
rlang
rmarkdown
Rnw
ROBERM
roxygen
rprofile
rscript
roxygenise
Roxygenize
Rprofile
Rscript
rspm
rstudio
rstudioapi
rtype
sco
scoial
scotp
SCTASK
SDcols
seealso
selfharm
Expand All @@ -224,37 +270,42 @@ slfhelper
smr
smra
smrtype
sourcedev
sparra
spd
SPSS

Check failure on line 276 in .github/actions/spelling/expect.txt

View workflow job for this annotation

GitHub Actions / Check Spelling

`SPSS` is ignored by check spelling because another more general variant is also in expect. (ignored-expect-variant)
spss
stadm
starwars
stefanzweifel
stopwords
stringdist
stringr
submis
sysmis
tac
tadm
tarchetypes
tbl
telecare
testthat
thom
tibble
tidyr
tidyselect
todo
tidyverse
totalnodncontacts
uid
ungroup
unicode
unrecognised
updown
upi
vline
URx
usethis
workflows
xintercept
xlsx
yearstay
yml
yyyyqx
Zihao
YYYYQX
zihao
zsav
zstd
5 changes: 5 additions & 0 deletions .github/actions/spelling/patterns.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,8 @@

# uuid:
\b[0-9a-fA-F]{8}-(?:[0-9a-fA-F]{4}-){3}[0-9a-fA-F]{12}\b

# Automatically suggested patterns
# hit-count: 27 file-count: 17
# version suffix <word>v#
(?:(?<=[A-Z]{2})V|(?<=[a-z]{2}|[A-Z]{2})v)\d+(?:\b|(?=[a-zA-Z_]))
2 changes: 1 addition & 1 deletion .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
strategy:
fail-fast: false
matrix:
r_version: ['3.6', '4.0.2', '4.1.2', 'release']
r_version: ['4.0.2', '4.1.2', 'release']

env:
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/spelling.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,13 +72,13 @@ jobs:
with:
suppress_push_for_open_pull_request: 1
checkout: true
check_file_names: 1
check_file_names: 0
spell_check_this: check-spelling/spell-check-this@prerelease
post_comment: 0
use_magic_file: 1
experimental_apply_changes_via_bot: 1
use_sarif: 0
only_check_changed_files: 1
only_check_changed_files: 0
extra_dictionary_limit: 10
extra_dictionaries:
cspell:r/src/r.txt
Expand Down
Loading

0 comments on commit 1d2562d

Please sign in to comment.