Skip to content

Commit 2877a28

Browse files
authored
Merge pull request #467 from cmu-delphi/dev
Bump main
2 parents e2f6331 + 71aa520 commit 2877a28

File tree

254 files changed

+12361
-7498
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

254 files changed

+12361
-7498
lines changed

.Rbuildignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,5 @@
2020
^doc$
2121
^Meta$
2222
^.lintr$
23-
^.venv$
23+
^.venv$
24+
^inst/templates$

.github/workflows/doc-preview.yaml

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
on:
2+
issue_comment:
3+
types: [created]
4+
5+
name: doc-preview.yaml
6+
7+
permissions: read-all
8+
9+
jobs:
10+
preview:
11+
if: ${{ github.event.issue.pull_request && (github.event.comment.author_association == 'COLLABORATOR' || github.event.comment.author_association == 'CONTRIBUTOR' || github.event.comment.author_association == 'MEMBER' || github.event.comment.author_association == 'OWNER') && startsWith(github.event.comment.body, '/preview-docs') }}
12+
13+
runs-on: ubuntu-latest
14+
permissions:
15+
# Needed to write a comment on the PR
16+
pull-requests: write
17+
# Needed to read the PR branch
18+
contents: read
19+
steps:
20+
- uses: actions/checkout@v4
21+
with:
22+
# Checkout the PR branch
23+
ref: refs/pull/${{ github.event.issue.number }}/head
24+
25+
- uses: r-lib/actions/setup-pandoc@v2
26+
27+
- uses: r-lib/actions/setup-r@v2
28+
with:
29+
use-public-rspm: true
30+
31+
- uses: r-lib/actions/setup-r-dependencies@v2
32+
with:
33+
extra-packages: any::pkgdown, local::.
34+
needs: website
35+
36+
- name: Build site
37+
run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE)
38+
shell: Rscript {0}
39+
40+
- name: Deploy to Netlify
41+
uses: nwtgck/[email protected]
42+
with:
43+
# Standard config
44+
github-token: ${{ secrets.GITHUB_TOKEN }}
45+
deploy-message: "Deploy from GitHub Actions"
46+
# 'docs/' is the default directory for pkgdown::build_site()
47+
# we add 'dev' because _pkgdown.yml has 'development: mode: devel'
48+
publish-dir: './docs/dev'
49+
# Development deploys only
50+
production-deploy: false
51+
# Enable pull request comment (default)
52+
enable-pull-request-comment: true
53+
# Overwrite the pull request comment with updated link (default)
54+
overwrites-pull-request-comment: true
55+
# Don't deploy to GitHub
56+
enable-github-deployment: false
57+
# Don't update the status of the commit
58+
enable-commit-status: false
59+
# Don't comment on the commit
60+
enable-commit-comment: false
61+
env:
62+
# Netlify credentials (currently from Dmitry's account)
63+
NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
64+
NETLIFY_SITE_ID: ${{ secrets.NETLIFY_SITE_ID }}
65+
timeout-minutes: 1

.github/workflows/pr-commands.yaml

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
2+
# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
3+
on:
4+
issue_comment:
5+
types: [created]
6+
7+
name: pr-commands.yaml
8+
9+
permissions: read-all
10+
11+
jobs:
12+
document:
13+
if: ${{ github.event.issue.pull_request && (github.event.comment.author_association == 'COLLABORATOR' || github.event.comment.author_association == 'CONTRIBUTOR' || github.event.comment.author_association == 'MEMBER' || github.event.comment.author_association == 'OWNER') && startsWith(github.event.comment.body, '/document') }}
14+
name: document
15+
runs-on: ubuntu-latest
16+
env:
17+
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
18+
permissions:
19+
contents: write
20+
steps:
21+
- uses: actions/checkout@v4
22+
23+
- uses: r-lib/actions/pr-fetch@v2
24+
with:
25+
repo-token: ${{ secrets.GITHUB_TOKEN }}
26+
27+
- uses: r-lib/actions/setup-r@v2
28+
with:
29+
use-public-rspm: true
30+
31+
- uses: r-lib/actions/setup-r-dependencies@v2
32+
with:
33+
extra-packages: any::roxygen2
34+
needs: pr-document
35+
36+
- name: Document
37+
run: roxygen2::roxygenise()
38+
shell: Rscript {0}
39+
40+
- name: commit
41+
run: |
42+
git config --local user.name "$GITHUB_ACTOR"
43+
git config --local user.email "[email protected]"
44+
git add man/\* NAMESPACE
45+
git commit -m 'Document'
46+
47+
- uses: r-lib/actions/pr-push@v2
48+
with:
49+
repo-token: ${{ secrets.GITHUB_TOKEN }}
50+
51+
style:
52+
if: ${{ github.event.issue.pull_request && (github.event.comment.author_association == 'COLLABORATOR' || github.event.comment.author_association == 'CONTRIBUTOR' || github.event.comment.author_association == 'MEMBER' || github.event.comment.author_association == 'OWNER') && startsWith(github.event.comment.body, '/style') }}
53+
name: style
54+
runs-on: ubuntu-latest
55+
env:
56+
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
57+
permissions:
58+
contents: write
59+
steps:
60+
- uses: actions/checkout@v4
61+
62+
- uses: r-lib/actions/pr-fetch@v2
63+
with:
64+
repo-token: ${{ secrets.GITHUB_TOKEN }}
65+
66+
- uses: r-lib/actions/setup-r@v2
67+
68+
- name: Install dependencies
69+
run: install.packages("styler")
70+
shell: Rscript {0}
71+
72+
- name: Style
73+
run: styler::style_pkg()
74+
shell: Rscript {0}
75+
76+
- name: commit
77+
run: |
78+
git config --local user.name "$GITHUB_ACTOR"
79+
git config --local user.email "[email protected]"
80+
git add \*.R
81+
git commit -m 'Style'
82+
83+
- uses: r-lib/actions/pr-push@v2
84+
with:
85+
repo-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/styler.yml

Lines changed: 0 additions & 81 deletions
This file was deleted.

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,4 @@ inst/doc
1010
.Rprofile
1111
renv.lock
1212
renv/
13+
.Renviron

DESCRIPTION

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
Package: epipredict
22
Title: Basic epidemiology forecasting methods
3-
Version: 0.1.0
3+
Version: 0.2.0
44
Authors@R: c(
55
person("Daniel J.", "McDonald", , "[email protected]", role = c("aut", "cre")),
66
person("Ryan", "Tibshirani", , "[email protected]", role = "aut"),
7-
person("Dmitry", "Shemetov", email = "[email protected]", role = "aut"),
8-
person("David", "Weber", email = "[email protected]", role = "aut"),
7+
person("Dmitry", "Shemetov", , "[email protected]", role = "aut"),
8+
person("David", "Weber", , "[email protected]", role = "aut"),
99
person("Delphi Research Group", role = c("cph", "fnd")),
1010
person("Logan", "Brooks", role = "aut"),
1111
person("Rachel", "Lobay", role = "aut"),
@@ -24,21 +24,22 @@ URL: https://github.com/cmu-delphi/epipredict/,
2424
https://cmu-delphi.github.io/epipredict
2525
BugReports: https://github.com/cmu-delphi/epipredict/issues/
2626
Depends:
27-
epiprocess (>= 0.9.0),
27+
epidatasets,
2828
parsnip (>= 1.0.0),
2929
R (>= 3.5.0)
3030
Imports:
3131
checkmate,
3232
cli,
33-
distributional,
3433
dplyr,
34+
epiprocess (>= 0.11.2),
3535
generics,
3636
ggplot2,
3737
glue,
38-
hardhat (>= 1.3.0),
38+
hardhat (>= 1.4.1),
3939
lifecycle,
40+
lubridate,
4041
magrittr,
41-
recipes (>= 1.0.4),
42+
recipes (>= 1.1.1),
4243
rlang (>= 1.1.0),
4344
stats,
4445
tibble,
@@ -48,18 +49,18 @@ Imports:
4849
vctrs,
4950
workflows (>= 1.0.0)
5051
Suggests:
51-
covidcast,
5252
data.table,
5353
epidatr (>= 1.0.0),
5454
fs,
5555
grf,
56+
here,
5657
knitr,
57-
lubridate,
5858
poissonreg,
5959
purrr,
6060
quantreg,
6161
ranger,
6262
RcppRoll,
63+
readr,
6364
rmarkdown,
6465
smoothqr,
6566
testthat (>= 3.0.0),
@@ -69,12 +70,12 @@ VignetteBuilder:
6970
knitr
7071
Remotes:
7172
cmu-delphi/delphidocs,
73+
cmu-delphi/epidatasets,
7274
cmu-delphi/epidatr,
7375
cmu-delphi/epiprocess,
7476
dajmcdon/smoothqr
75-
Config/testthat/edition: 3
7677
Config/Needs/website: cmu-delphi/delphidocs
78+
Config/testthat/edition: 3
7779
Encoding: UTF-8
78-
LazyData: true
7980
Roxygen: list(markdown = TRUE)
8081
RoxygenNote: 7.3.2

0 commit comments

Comments
 (0)