diff --git a/.github/workflows/pr_unittest.yaml b/.github/workflows/pr_unittest.yaml index 53c94a1..10ead7d 100644 --- a/.github/workflows/pr_unittest.yaml +++ b/.github/workflows/pr_unittest.yaml @@ -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 @@ -48,7 +48,7 @@ jobs: - name: Get changed files id: changed-files uses: tj-actions/changed-files@v2.1 - - 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, @@ -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, @@ -87,8 +87,8 @@ jobs: run: | rmarkdown::render("vignettes/covidHubUtils-overview.Rmd") shell: Rscript {0} - - - + + + diff --git a/.github/workflows/r_cmd_check.yaml b/.github/workflows/r_cmd_check.yaml index 16a93b2..855cc38 100644 --- a/.github/workflows/r_cmd_check.yaml +++ b/.github/workflows/r_cmd_check.yaml @@ -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 diff --git a/DESCRIPTION b/DESCRIPTION index 63478be..de5d08f 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -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, @@ -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 diff --git a/README.md b/README.md index 399e12e..a1d2f1f 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/vignettes/covidHubUtils-overview.Rmd b/vignettes/covidHubUtils-overview.Rmd index 8ca0f13..e1199cf 100644 --- a/vignettes/covidHubUtils-overview.Rmd +++ b/vignettes/covidHubUtils-overview.Rmd @@ -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) ```