Skip to content

Commit

Permalink
Merge pull request #400 from reichlab/nikosbosse-patch-1
Browse files Browse the repository at this point in the history
Issue #399: Point users to the CRAN version of scoringutils
  • Loading branch information
elray1 authored Jan 16, 2024
2 parents 088d1b3 + 26312b7 commit 2e4c5e9
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/pr_unittest.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- name: Install dependencies
run: |
install.packages(c("remotes","devtools", "rmarkdown","tidyverse","DT","here","RSocrata"))
devtools::install_github("epiforecasts/scoringutils")
devtools::install_github("epiforecasts/scoringutils@v1.2.2")
remotes::install_deps(dependencies = NA)
shell: Rscript {0}
- name: Install zoltr
Expand All @@ -48,7 +48,7 @@ jobs:
- name: Get changed files
id: changed-files
uses: tj-actions/[email protected]
- name: Checkout covidData when get_truth.R, aggregate_to_weekly.R or load_truth.R has changed
- name: Checkout covidData when get_truth.R, aggregate_to_weekly.R or load_truth.R has changed
if: >-
${{ contains(steps.changed-files.outputs.modified_files, 'R/get_truth.R') ||
contains(steps.changed-files.outputs.modified_files,
Expand All @@ -59,7 +59,7 @@ jobs:
with:
repository: reichlab/covidData
path: covidData
- name: Install covidData when get_truth.R, aggregate_to_weekly.R or load_truth.R has changed
- name: Install covidData when get_truth.R, aggregate_to_weekly.R or load_truth.R has changed
if: >-
${{ contains(steps.changed-files.outputs.modified_files, 'R/get_truth.R') ||
contains(steps.changed-files.outputs.modified_files,
Expand Down Expand Up @@ -87,8 +87,8 @@ jobs:
run: |
rmarkdown::render("vignettes/covidHubUtils-overview.Rmd")
shell: Rscript {0}





2 changes: 1 addition & 1 deletion .github/workflows/r_cmd_check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Install dependencies
run: |
install.packages(c("remotes","devtools","rmarkdown","tidyverse","DT","here","RSocrata"))
devtools::install_github("epiforecasts/scoringutils")
devtools::install_github("epiforecasts/scoringutils@v1.2.2")
remotes::install_deps(dependencies = NA)
shell: Rscript {0}
- name: Install zoltr
Expand Down
4 changes: 2 additions & 2 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ Imports:
MMWRweek (>= 0.1.1),
lubridate (>= 1.7.4),
purrr (>= 0.3.3),
scoringutils (>= 1.0.0),
scoringutils (>= 1.2.2),
ggplot2,
magrittr,
forcats,
Expand Down Expand Up @@ -93,7 +93,7 @@ Suggests:
rmarkdown
Remotes:
reichlab/zoltr,
epiforecasts/scoringutils
epiforecasts/scoringutils@v1.2.2
Depends:
R (>= 3.5.0)
URL: https://github.com/reichlab/covidHubUtils
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ The `covidHubUtils` package relies on a small number of packages, including many
```r
devtools::install_github("reichlab/zoltr")
```
Additional functionalities in `covidHubUtils` also rely on `scoringutils`. Because of new updates in `scoringutils` that uses functions not yet on the cran version, please install `scoringutils` from GitHub:
Additional functionalities in `covidHubUtils` also rely on `scoringutils`. Please install version 1.2.2 of `scoringutils` from github:
``` r
remotes::install_github("epiforecasts/scoringutils")
devtools::install_github("epiforecasts/scoringutils@v1.2.2")
```
Some additional functionalities in `covidHubUtils` also rely on `covidData`. Because there are daily data updates in `covidData`, please install the latest version of it before using related functions in `covidHubUtils`:
``` r
Expand Down
4 changes: 2 additions & 2 deletions vignettes/covidHubUtils-overview.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -431,9 +431,9 @@ To find the most recent weekly forecast evaluation summary, please visit the [ev
The inputs to the `scored_forecasts()` include a `forecasts` data frame created by `load_forecasts()` and a `truth` data frame created by `load_truth()`.


The `scoringutils` package provides a collection of metrics and proper scoring rules that make it simple to score forecasts against the true observed values. Please install and load the most up-to-date development version of `scoringutils` from GitHub:
The `scoringutils` package provides a collection of metrics and proper scoring rules that make it simple to score forecasts against the true observed values.
``` {r}
remotes::install_github("epiforecasts/scoringutils")
# devtools::install_github("epiforecasts/scoringutils@v1.2.2")
library(scoringutils)
```

Expand Down

0 comments on commit 2e4c5e9

Please sign in to comment.