Skip to content

Commit

Permalink
Merge branch 'master' into d01_2_zihao
Browse files Browse the repository at this point in the history
  • Loading branch information
lizihao-anu committed Jul 25, 2023
2 parents a954611 + 4eb6b93 commit a2521c6
Show file tree
Hide file tree
Showing 90 changed files with 1,497 additions and 956 deletions.
23 changes: 22 additions & 1 deletion .github/actions/spelling/expect.txt
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ cmh
CNWs
commhosp
congen
costincdnas
costmonthnum
costsfy
covr
Expand All @@ -45,6 +46,7 @@ dbconnect
dbplyr
deathdiag
demog
dfc
disch
dischloc
dischto
Expand All @@ -70,6 +72,7 @@ fyyear
geogs
ggplot
GLS
gls
gms
GPOo
gpprac
Expand All @@ -86,31 +89,40 @@ hhg
hjust
hms
homecare
homev
hscp
hscpnames
IDPC
infyyear
ipdc
itle
iwalk
jaccard
jan
jennifer
jul
keydate
keyring
keytime
keytimex
kis
lgl
kis
los
ltc
ltcs
lubridate
magrittr
Mcbride
mcmahon
MMMYY
monthflag
mpat
multiday
multisession
multistaff
NAs
newcons
nhs
nhshosp
NRS
Expand All @@ -123,6 +135,7 @@ openxl
openxlsx
ORCID
outfile
pandoc
patflow
pattype
phs
Expand All @@ -140,7 +153,10 @@ ptypes
purrr
quickstart
Rbuildignore
rcmdcheck
rdd
rds
reabl
reablement
readcode
readr
Expand All @@ -157,8 +173,12 @@ rspm
RStudio
rstudioapi
Rtype
SDcols
seealso
selfharm
setkeyv
setnafill
setnames
Siar
sigfac
simd
Expand Down Expand Up @@ -193,10 +213,11 @@ Unicode
updown
upi
vline
workflows
xintercept
xlsx
yearstay
YYYYQX
zihao
zsav
zstd
zstd
4 changes: 2 additions & 2 deletions .github/workflows/R-CMD-check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [main-R]
branches: [master, main, main-R]
pull_request:
branches: [main-R]
branches: [master, main, main-R]

name: R-CMD-check

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint-changed-files.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
pull_request:
branches: [main-R, master]
branches: [main-R, master, main]

name: lint-changed-files

Expand Down
36 changes: 0 additions & 36 deletions .github/workflows/lint.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/pkgdown.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [main-R]
branches: [master]
issue_comment:
types: [created]
release:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
on:
push:
branches: [main-R]
branches: [master, main, main-R]
pull_request:
branches: [main-R]
branches: [master, main, main-R]

name: test-coverage

Expand Down
3 changes: 3 additions & 0 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ Imports:
dtplyr (>= 1.3.0),
fs (>= 1.6.1),
fst (>= 0.9.8),
future (>= 1.33.0),
future.callr (>= 0.8.1),
glue (>= 1.6.2),
haven (>= 2.5.2),
hms (>= 1.1.0),
Expand All @@ -41,6 +43,7 @@ Imports:
phsmethods (>= 0.2.2),
phsopendata (>= 0.0.1.0),
purrr (>= 1.0.1),
qs (>= 0.25.5),
R.utils (>= 2.12.2),
readr (>= 2.1.0),
rlang (>= 1.1.0),
Expand Down
2 changes: 2 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,14 @@ export(get_source_extract_path)
export(get_sparra_path)
export(get_spd_path)
export(get_year_dir)
export(gzip_files)
export(is_date_in_fyyear)
export(is_missing)
export(la_code_lookup)
export(last_date_month)
export(latest_cost_year)
export(latest_update)
export(make_lowercase_ext)
export(midpoint_fy)
export(next_fy)
export(phs_db_connection)
Expand Down
Loading

0 comments on commit a2521c6

Please sign in to comment.