diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index bb6454a..795a1df 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -18,7 +18,7 @@ Our procedures for contributing bigger changes, code in particular, generally fo ### Pull request process -* Fork the package and clone onto your computer. If you haven't done this before, we recommend using `usethis::create_from_github("Infectious-Disease-Modeling-Hubs/hubData", fork = TRUE)`. +* Fork the package and clone onto your computer. If you haven't done this before, we recommend using `usethis::create_from_github("hubverse-org/hubData", fork = TRUE)`. * Install all development dependencies with `devtools::install_dev_deps()`, and then make sure the package passes R CMD check by running `devtools::check()`. If R CMD check doesn't pass cleanly, it's a good idea to ask for help before continuing. diff --git a/DESCRIPTION b/DESCRIPTION index 3388f18..bc3db99 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: hubData -Title: Tools for accessing and working with hubverse Hub data +Title: Tools for accessing and working with hubverse data Version: 0.2.0 Authors@R: c(person("Anna", "Krystalli", , "annakrystalli@googlemail.com", role = c("aut", "cre"), @@ -17,8 +17,8 @@ Encoding: UTF-8 Roxygen: list(markdown = TRUE) RoxygenNote: 7.3.1 Config/testthat/edition: 3 -URL: https://github.com/Infectious-Disease-Modeling-Hubs/hubData -BugReports: https://github.com/Infectious-Disease-Modeling-Hubs/hubData/issues +URL: https://github.com/hubverse-org/hubData +BugReports: https://github.com/hubverse-org/hubData/issues Imports: arrow (>= 12.0.0), checkmate, @@ -44,9 +44,9 @@ Suggests: rmarkdown, testthat (>= 3.2.0) Remotes: - Infectious-Disease-Modeling-Hubs/hubUtils@enhancement/v3-utils, + hubverse-org/hubUtils@enhancement/v3-utils, apache/arrow/r@apache-arrow-15.0.2 -Config/Needs/website: Infectious-Disease-Modeling-Hubs/hubStyle +Config/Needs/website: hubverse-org/hubStyle Depends: R (>= 2.10) VignetteBuilder: knitr diff --git a/NEWS.md b/NEWS.md index 88ed30e..1493c88 100644 --- a/NEWS.md +++ b/NEWS.md @@ -10,4 +10,4 @@ # hubData 0.0.1 -* Initial package release resulting from split of `hubUtils` package. See [`hubUtils` NEWS.md](https://github.com/Infectious-Disease-Modeling-Hubs/hubUtils/blob/main/NEWS.md) for details including previous release notes. +* Initial package release resulting from split of `hubUtils` package. See [`hubUtils` NEWS.md](https://github.com/hubverse-org/hubUtils/blob/main/NEWS.md) for details including previous release notes. diff --git a/README.Rmd b/README.Rmd index 38a6792..0e45243 100644 --- a/README.Rmd +++ b/README.Rmd @@ -14,12 +14,12 @@ knitr::opts_chunk$set( ``` -# hubData hubData website +# hubData hubData website [![Lifecycle: experimental](https://img.shields.io/badge/lifecycle-experimental-orange.svg)](https://lifecycle.r-lib.org/articles/stages.html#experimental) [![CRAN status](https://www.r-pkg.org/badges/version/hubData)](https://CRAN.R-project.org/package=hubData) -[![R-CMD-check](https://github.com/Infectious-Disease-Modeling-Hubs/hubData/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/Infectious-Disease-Modeling-Hubs/hubData/actions/workflows/R-CMD-check.yaml) +[![R-CMD-check](https://github.com/hubverse-org/hubData/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/hubverse-org/hubData/actions/workflows/R-CMD-check.yaml) The goal of hubData is to provide tools for accessing and working with hubverse Hub data. @@ -32,7 +32,7 @@ You can install the development version of hubData from [GitHub](https://github. ``` r # install.packages("remotes") -remotes::install_github("Infectious-Disease-Modeling-Hubs/hubData") +remotes::install_github("hubverse-org/hubData") ``` > ##### 💡 TIP diff --git a/README.md b/README.md index 62d2f62..1d4e79b 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ -# hubData hubData website +# hubData hubData website @@ -9,7 +9,7 @@ experimental](https://img.shields.io/badge/lifecycle-experimental-orange.svg)](https://lifecycle.r-lib.org/articles/stages.html#experimental) [![CRAN status](https://www.r-pkg.org/badges/version/hubData)](https://CRAN.R-project.org/package=hubData) -[![R-CMD-check](https://github.com/Infectious-Disease-Modeling-Hubs/hubData/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/Infectious-Disease-Modeling-Hubs/hubData/actions/workflows/R-CMD-check.yaml) +[![R-CMD-check](https://github.com/hubverse-org/hubData/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/hubverse-org/hubData/actions/workflows/R-CMD-check.yaml) The goal of hubData is to provide tools for accessing and working with @@ -27,7 +27,7 @@ You can install the development version of hubData from ``` r # install.packages("remotes") -remotes::install_github("Infectious-Disease-Modeling-Hubs/hubData") +remotes::install_github("hubverse-org/hubData") ``` > ##### 💡 TIP diff --git a/_pkgdown.yml b/_pkgdown.yml index e4aaf21..c07bf9d 100644 --- a/_pkgdown.yml +++ b/_pkgdown.yml @@ -1,3 +1,3 @@ -url: https://infectious-disease-modeling-hubs.github.io/hubData/ +url: https://hubverse-org.github.io/hubData/ template: package: hubStyle diff --git a/inst/config/tasks-comp-tid.json b/inst/config/tasks-comp-tid.json index 282c96b..9db3068 100644 --- a/inst/config/tasks-comp-tid.json +++ b/inst/config/tasks-comp-tid.json @@ -1,5 +1,5 @@ { - "schema_version": "https://raw.githubusercontent.com/Infectious-Disease-Modeling-Hubs/schemas/main/v3.0.0/tasks-schema.json", + "schema_version": "https://raw.githubusercontent.com/hubverse-org/schemas/main/v3.0.0/tasks-schema.json", "rounds": [{ "round_id_from_variable": true, "round_id": "forecast_date", diff --git a/inst/config/tasks.json b/inst/config/tasks.json index 63e189c..1f6d4db 100644 --- a/inst/config/tasks.json +++ b/inst/config/tasks.json @@ -1,5 +1,5 @@ { - "schema_version": "https://raw.githubusercontent.com/Infectious-Disease-Modeling-Hubs/schemas/main/v3.0.0/tasks-schema.json", + "schema_version": "https://raw.githubusercontent.com/hubverse-org/schemas/main/v3.0.0/tasks-schema.json", "rounds": [{ "round_id_from_variable": true, "round_id": "forecast_date", diff --git a/tests/_snaps/hub-connection.md b/tests/_snaps/hub-connection.md index ac782c0..ff47ad8 100644 --- a/tests/_snaps/hub-connection.md +++ b/tests/_snaps/hub-connection.md @@ -32,13 +32,13 @@ - attr(*, "hub_path")= chr "test/hub_path" - attr(*, "model_output_dir")= chr "test/model_output_dir" - attr(*, "config_admin")=List of 8 - ..$ schema_version: chr "https://raw.githubusercontent.com/Infectious-Disease-Modeling-Hubs/schemas/main/v2.0.0/admin-schema.json" + ..$ schema_version: chr "https://raw.githubusercontent.com/hubverse-org/schemas/main/v2.0.0/admin-schema.json" ..$ name : chr "Simple Forecast Hub" ..$ maintainer : chr "Consortium of Infectious Disease Modeling Hubs" ..$ contact :List of 2 .. ..$ name : chr "Joe Bloggs" .. ..$ email: chr "j.bloggs@cidmh.com" - ..$ repository_url: chr "https://github.com/Infectious-Disease-Modeling-Hubs/example-simple-forecast-hub" + ..$ repository_url: chr "https://github.com/hubverse-org/example-simple-forecast-hub" ..$ hub_models :List of 1 .. ..$ :List of 3 .. .. ..$ team_abbr : chr "simple_hub" @@ -47,7 +47,7 @@ ..$ file_format : chr [1:3] "csv" "parquet" "arrow" ..$ timezone : chr "US/Eastern" - attr(*, "config_tasks")=List of 2 - ..$ schema_version: chr "https://raw.githubusercontent.com/Infectious-Disease-Modeling-Hubs/schemas/main/v2.0.0/tasks-schema.json" + ..$ schema_version: chr "https://raw.githubusercontent.com/hubverse-org/schemas/main/v2.0.0/tasks-schema.json" ..$ rounds :List of 2 .. ..$ :List of 4 .. .. ..$ round_id_from_variable: logi TRUE @@ -184,13 +184,13 @@ - attr(*, "hub_path")= chr "test/hub_path" - attr(*, "model_output_dir")= chr "test/model_output_dir" - attr(*, "config_admin")=List of 8 - ..$ schema_version: chr "https://raw.githubusercontent.com/Infectious-Disease-Modeling-Hubs/schemas/main/v2.0.0/admin-schema.json" + ..$ schema_version: chr "https://raw.githubusercontent.com/hubverse-org/schemas/main/v2.0.0/admin-schema.json" ..$ name : chr "Simple Forecast Hub" ..$ maintainer : chr "Consortium of Infectious Disease Modeling Hubs" ..$ contact :List of 2 .. ..$ name : chr "Joe Bloggs" .. ..$ email: chr "j.bloggs@cidmh.com" - ..$ repository_url: chr "https://github.com/Infectious-Disease-Modeling-Hubs/example-simple-forecast-hub" + ..$ repository_url: chr "https://github.com/hubverse-org/example-simple-forecast-hub" ..$ hub_models :List of 1 .. ..$ :List of 3 .. .. ..$ team_abbr : chr "simple_hub" @@ -199,7 +199,7 @@ ..$ file_format : chr [1:3] "csv" "parquet" "arrow" ..$ timezone : chr "US/Eastern" - attr(*, "config_tasks")=List of 2 - ..$ schema_version: chr "https://raw.githubusercontent.com/Infectious-Disease-Modeling-Hubs/schemas/main/v2.0.0/tasks-schema.json" + ..$ schema_version: chr "https://raw.githubusercontent.com/hubverse-org/schemas/main/v2.0.0/tasks-schema.json" ..$ rounds :List of 2 .. ..$ :List of 4 .. .. ..$ round_id_from_variable: logi TRUE @@ -363,7 +363,7 @@ - attr(*, "hub_path")= chr "flusight" - attr(*, "model_output_dir")= chr "forecasts" - attr(*, "config_admin")=List of 9 - ..$ schema_version : chr "https://raw.githubusercontent.com/Infectious-Disease-Modeling-Hubs/schemas/main/v2.0.0/admin-schema.json" + ..$ schema_version : chr "https://raw.githubusercontent.com/hubverse-org/schemas/main/v2.0.0/admin-schema.json" ..$ name : chr "US CDC FluSight" ..$ maintainer : chr "US CDC" ..$ contact :List of 2 @@ -375,7 +375,7 @@ ..$ timezone : chr "US/Eastern" ..$ model_output_dir: chr "forecasts" - attr(*, "config_tasks")=List of 2 - ..$ schema_version: chr "https://raw.githubusercontent.com/Infectious-Disease-Modeling-Hubs/schemas/main/v2.0.0/tasks-schema.json" + ..$ schema_version: chr "https://raw.githubusercontent.com/hubverse-org/schemas/main/v2.0.0/tasks-schema.json" ..$ rounds :List of 1 .. ..$ :List of 4 .. .. ..$ round_id_from_variable: logi TRUE @@ -509,7 +509,7 @@ - attr(*, "hub_path")= chr "test/hub_path" - attr(*, "model_output_dir")= chr "test/model_output_dir" - attr(*, "config_admin")=List of 9 - ..$ schema_version : chr "https://raw.githubusercontent.com/Infectious-Disease-Modeling-Hubs/schemas/main/v2.0.0/admin-schema.json" + ..$ schema_version : chr "https://raw.githubusercontent.com/hubverse-org/schemas/main/v2.0.0/admin-schema.json" ..$ name : chr "US CDC FluSight" ..$ maintainer : chr "US CDC" ..$ contact :List of 2 @@ -521,7 +521,7 @@ ..$ timezone : chr "US/Eastern" ..$ model_output_dir: chr "forecasts" - attr(*, "config_tasks")=List of 2 - ..$ schema_version: chr "https://raw.githubusercontent.com/Infectious-Disease-Modeling-Hubs/schemas/main/v2.0.0/tasks-schema.json" + ..$ schema_version: chr "https://raw.githubusercontent.com/hubverse-org/schemas/main/v2.0.0/tasks-schema.json" ..$ rounds :List of 1 .. ..$ :List of 4 .. .. ..$ round_id_from_variable: logi TRUE @@ -799,13 +799,13 @@ - attr(*, "hub_path")= chr "test/hub_path" - attr(*, "model_output_dir")= chr "test/model_output_dir" - attr(*, "config_admin")=List of 8 - ..$ schema_version: chr "https://raw.githubusercontent.com/Infectious-Disease-Modeling-Hubs/schemas/main/v2.0.0/admin-schema.json" + ..$ schema_version: chr "https://raw.githubusercontent.com/hubverse-org/schemas/main/v2.0.0/admin-schema.json" ..$ name : chr "Simple Forecast Hub" ..$ maintainer : chr "Consortium of Infectious Disease Modeling Hubs" ..$ contact :List of 2 .. ..$ name : chr "Joe Bloggs" .. ..$ email: chr "j.bloggs@cidmh.com" - ..$ repository_url: chr "https://github.com/Infectious-Disease-Modeling-Hubs/example-simple-forecast-hub" + ..$ repository_url: chr "https://github.com/hubverse-org/example-simple-forecast-hub" ..$ hub_models :List of 1 .. ..$ :List of 3 .. .. ..$ team_abbr : chr "simple_hub" @@ -814,7 +814,7 @@ ..$ file_format : chr [1:3] "csv" "parquet" "arrow" ..$ timezone : chr "US/Eastern" - attr(*, "config_tasks")=List of 2 - ..$ schema_version: chr "https://raw.githubusercontent.com/Infectious-Disease-Modeling-Hubs/schemas/main/v2.0.0/tasks-schema.json" + ..$ schema_version: chr "https://raw.githubusercontent.com/hubverse-org/schemas/main/v2.0.0/tasks-schema.json" ..$ rounds :List of 2 .. ..$ :List of 4 .. .. ..$ round_id_from_variable: logi TRUE @@ -1022,13 +1022,13 @@ - attr(*, "hub_path")= chr "test/hub_path" - attr(*, "model_output_dir")= chr "test/model_output_dir" - attr(*, "config_admin")=List of 8 - ..$ schema_version: chr "https://raw.githubusercontent.com/Infectious-Disease-Modeling-Hubs/schemas/main/v2.0.0/admin-schema.json" + ..$ schema_version: chr "https://raw.githubusercontent.com/hubverse-org/schemas/main/v2.0.0/admin-schema.json" ..$ name : chr "Simple Forecast Hub" ..$ maintainer : chr "Consortium of Infectious Disease Modeling Hubs" ..$ contact :List of 2 .. ..$ name : chr "Joe Bloggs" .. ..$ email: chr "j.bloggs@cidmh.com" - ..$ repository_url: chr "https://github.com/Infectious-Disease-Modeling-Hubs/example-simple-forecast-hub" + ..$ repository_url: chr "https://github.com/hubverse-org/example-simple-forecast-hub" ..$ hub_models :List of 1 .. ..$ :List of 3 .. .. ..$ team_abbr : chr "simple_hub" @@ -1037,7 +1037,7 @@ ..$ file_format : chr [1:3] "csv" "parquet" "arrow" ..$ timezone : chr "US/Eastern" - attr(*, "config_tasks")=List of 2 - ..$ schema_version: chr "https://raw.githubusercontent.com/Infectious-Disease-Modeling-Hubs/schemas/main/v2.0.0/tasks-schema.json" + ..$ schema_version: chr "https://raw.githubusercontent.com/hubverse-org/schemas/main/v2.0.0/tasks-schema.json" ..$ rounds :List of 2 .. ..$ :List of 4 .. .. ..$ round_id_from_variable: logi TRUE diff --git a/tests/testthat/_snaps/hub-connection.md b/tests/testthat/_snaps/hub-connection.md index 2cec897..3eec850 100644 --- a/tests/testthat/_snaps/hub-connection.md +++ b/tests/testthat/_snaps/hub-connection.md @@ -32,13 +32,13 @@ - attr(*, "hub_path")= chr "test/hub_path" - attr(*, "model_output_dir")= chr "test/model_output_dir" - attr(*, "config_admin")=List of 8 - ..$ schema_version: chr "https://raw.githubusercontent.com/Infectious-Disease-Modeling-Hubs/schemas/main/v2.0.0/admin-schema.json" + ..$ schema_version: chr "https://raw.githubusercontent.com/hubverse-org/schemas/main/v2.0.0/admin-schema.json" ..$ name : chr "Simple Forecast Hub" ..$ maintainer : chr "Consortium of Infectious Disease Modeling Hubs" ..$ contact :List of 2 .. ..$ name : chr "Joe Bloggs" .. ..$ email: chr "j.bloggs@cidmh.com" - ..$ repository_url: chr "https://github.com/Infectious-Disease-Modeling-Hubs/example-simple-forecast-hub" + ..$ repository_url: chr "https://github.com/hubverse-org/example-simple-forecast-hub" ..$ hub_models :List of 1 .. ..$ :List of 3 .. .. ..$ team_abbr : chr "simple_hub" @@ -47,7 +47,7 @@ ..$ file_format : chr [1:3] "csv" "parquet" "arrow" ..$ timezone : chr "US/Eastern" - attr(*, "config_tasks")=List of 2 - ..$ schema_version: chr "https://raw.githubusercontent.com/Infectious-Disease-Modeling-Hubs/schemas/main/v2.0.0/tasks-schema.json" + ..$ schema_version: chr "https://raw.githubusercontent.com/hubverse-org/schemas/main/v2.0.0/tasks-schema.json" ..$ rounds :List of 2 .. ..$ :List of 4 .. .. ..$ round_id_from_variable: logi TRUE @@ -184,13 +184,13 @@ - attr(*, "hub_path")= chr "test/hub_path" - attr(*, "model_output_dir")= chr "test/model_output_dir" - attr(*, "config_admin")=List of 8 - ..$ schema_version: chr "https://raw.githubusercontent.com/Infectious-Disease-Modeling-Hubs/schemas/main/v2.0.0/admin-schema.json" + ..$ schema_version: chr "https://raw.githubusercontent.com/hubverse-org/schemas/main/v2.0.0/admin-schema.json" ..$ name : chr "Simple Forecast Hub" ..$ maintainer : chr "Consortium of Infectious Disease Modeling Hubs" ..$ contact :List of 2 .. ..$ name : chr "Joe Bloggs" .. ..$ email: chr "j.bloggs@cidmh.com" - ..$ repository_url: chr "https://github.com/Infectious-Disease-Modeling-Hubs/example-simple-forecast-hub" + ..$ repository_url: chr "https://github.com/hubverse-org/example-simple-forecast-hub" ..$ hub_models :List of 1 .. ..$ :List of 3 .. .. ..$ team_abbr : chr "simple_hub" @@ -199,7 +199,7 @@ ..$ file_format : chr [1:3] "csv" "parquet" "arrow" ..$ timezone : chr "US/Eastern" - attr(*, "config_tasks")=List of 2 - ..$ schema_version: chr "https://raw.githubusercontent.com/Infectious-Disease-Modeling-Hubs/schemas/main/v2.0.0/tasks-schema.json" + ..$ schema_version: chr "https://raw.githubusercontent.com/hubverse-org/schemas/main/v2.0.0/tasks-schema.json" ..$ rounds :List of 2 .. ..$ :List of 4 .. .. ..$ round_id_from_variable: logi TRUE @@ -363,7 +363,7 @@ - attr(*, "hub_path")= chr "flusight" - attr(*, "model_output_dir")= chr "forecasts" - attr(*, "config_admin")=List of 9 - ..$ schema_version : chr "https://raw.githubusercontent.com/Infectious-Disease-Modeling-Hubs/schemas/main/v2.0.0/admin-schema.json" + ..$ schema_version : chr "https://raw.githubusercontent.com/hubverse-org/schemas/main/v2.0.0/admin-schema.json" ..$ name : chr "US CDC FluSight" ..$ maintainer : chr "US CDC" ..$ contact :List of 2 @@ -375,7 +375,7 @@ ..$ timezone : chr "US/Eastern" ..$ model_output_dir: chr "forecasts" - attr(*, "config_tasks")=List of 2 - ..$ schema_version: chr "https://raw.githubusercontent.com/Infectious-Disease-Modeling-Hubs/schemas/main/v2.0.0/tasks-schema.json" + ..$ schema_version: chr "https://raw.githubusercontent.com/hubverse-org/schemas/main/v2.0.0/tasks-schema.json" ..$ rounds :List of 1 .. ..$ :List of 4 .. .. ..$ round_id_from_variable: logi TRUE @@ -509,7 +509,7 @@ - attr(*, "hub_path")= chr "test/hub_path" - attr(*, "model_output_dir")= chr "test/model_output_dir" - attr(*, "config_admin")=List of 9 - ..$ schema_version : chr "https://raw.githubusercontent.com/Infectious-Disease-Modeling-Hubs/schemas/main/v2.0.0/admin-schema.json" + ..$ schema_version : chr "https://raw.githubusercontent.com/hubverse-org/schemas/main/v2.0.0/admin-schema.json" ..$ name : chr "US CDC FluSight" ..$ maintainer : chr "US CDC" ..$ contact :List of 2 @@ -521,7 +521,7 @@ ..$ timezone : chr "US/Eastern" ..$ model_output_dir: chr "forecasts" - attr(*, "config_tasks")=List of 2 - ..$ schema_version: chr "https://raw.githubusercontent.com/Infectious-Disease-Modeling-Hubs/schemas/main/v2.0.0/tasks-schema.json" + ..$ schema_version: chr "https://raw.githubusercontent.com/hubverse-org/schemas/main/v2.0.0/tasks-schema.json" ..$ rounds :List of 1 .. ..$ :List of 4 .. .. ..$ round_id_from_variable: logi TRUE @@ -799,13 +799,13 @@ - attr(*, "hub_path")= chr "test/hub_path" - attr(*, "model_output_dir")= chr "test/model_output_dir" - attr(*, "config_admin")=List of 8 - ..$ schema_version: chr "https://raw.githubusercontent.com/Infectious-Disease-Modeling-Hubs/schemas/main/v2.0.0/admin-schema.json" + ..$ schema_version: chr "https://raw.githubusercontent.com/hubverse-org/schemas/main/v2.0.0/admin-schema.json" ..$ name : chr "Simple Forecast Hub" ..$ maintainer : chr "Consortium of Infectious Disease Modeling Hubs" ..$ contact :List of 2 .. ..$ name : chr "Joe Bloggs" .. ..$ email: chr "j.bloggs@cidmh.com" - ..$ repository_url: chr "https://github.com/Infectious-Disease-Modeling-Hubs/example-simple-forecast-hub" + ..$ repository_url: chr "https://github.com/hubverse-org/example-simple-forecast-hub" ..$ hub_models :List of 1 .. ..$ :List of 3 .. .. ..$ team_abbr : chr "simple_hub" @@ -814,7 +814,7 @@ ..$ file_format : chr [1:3] "csv" "parquet" "arrow" ..$ timezone : chr "US/Eastern" - attr(*, "config_tasks")=List of 2 - ..$ schema_version: chr "https://raw.githubusercontent.com/Infectious-Disease-Modeling-Hubs/schemas/main/v2.0.0/tasks-schema.json" + ..$ schema_version: chr "https://raw.githubusercontent.com/hubverse-org/schemas/main/v2.0.0/tasks-schema.json" ..$ rounds :List of 2 .. ..$ :List of 4 .. .. ..$ round_id_from_variable: logi TRUE diff --git a/tests/testthat/testdata/configs/both_null_tasks.json b/tests/testthat/testdata/configs/both_null_tasks.json index 4330d7a..6ab9f9d 100644 --- a/tests/testthat/testdata/configs/both_null_tasks.json +++ b/tests/testthat/testdata/configs/both_null_tasks.json @@ -1,5 +1,5 @@ { - "schema_version": "https://raw.githubusercontent.com/Infectious-Disease-Modeling-Hubs/schemas/main/v2.0.0/tasks-schema.json", + "schema_version": "https://raw.githubusercontent.com/hubverse-org/schemas/main/v2.0.0/tasks-schema.json", "rounds": [ { "round_id_from_variable": true, diff --git a/tests/testthat/testdata/configs/both_null_tasks_all.json b/tests/testthat/testdata/configs/both_null_tasks_all.json index 60e333d..037ac13 100644 --- a/tests/testthat/testdata/configs/both_null_tasks_all.json +++ b/tests/testthat/testdata/configs/both_null_tasks_all.json @@ -1,5 +1,5 @@ { - "schema_version": "https://raw.githubusercontent.com/Infectious-Disease-Modeling-Hubs/schemas/main/v2.0.0/tasks-schema.json", + "schema_version": "https://raw.githubusercontent.com/hubverse-org/schemas/main/v2.0.0/tasks-schema.json", "rounds": [ { "round_id_from_variable": true, diff --git a/tests/testthat/testdata/configs/both_null_tasks_swap.json b/tests/testthat/testdata/configs/both_null_tasks_swap.json index e0ba611..3a47b14 100644 --- a/tests/testthat/testdata/configs/both_null_tasks_swap.json +++ b/tests/testthat/testdata/configs/both_null_tasks_swap.json @@ -1,5 +1,5 @@ { - "schema_version": "https://raw.githubusercontent.com/Infectious-Disease-Modeling-Hubs/schemas/main/v2.0.0/tasks-schema.json", + "schema_version": "https://raw.githubusercontent.com/hubverse-org/schemas/main/v2.0.0/tasks-schema.json", "rounds": [ { "round_id_from_variable": true, diff --git a/tests/testthat/testdata/configs/tasks-samples-2mt.json b/tests/testthat/testdata/configs/tasks-samples-2mt.json index 99fc9fe..875ab0f 100644 --- a/tests/testthat/testdata/configs/tasks-samples-2mt.json +++ b/tests/testthat/testdata/configs/tasks-samples-2mt.json @@ -1,5 +1,5 @@ { - "schema_version": "https://raw.githubusercontent.com/Infectious-Disease-Modeling-Hubs/schemas/main/v3.0.0/tasks-schema.json", + "schema_version": "https://raw.githubusercontent.com/hubverse-org/schemas/main/v3.0.0/tasks-schema.json", "rounds": [{ "round_id_from_variable": true, "round_id": "forecast_date", diff --git a/tests/testthat/testdata/configs/tasks-samples-expand-grid.json b/tests/testthat/testdata/configs/tasks-samples-expand-grid.json index a1e076f..5d949a8 100644 --- a/tests/testthat/testdata/configs/tasks-samples-expand-grid.json +++ b/tests/testthat/testdata/configs/tasks-samples-expand-grid.json @@ -1,5 +1,5 @@ { - "schema_version": "https://raw.githubusercontent.com/Infectious-Disease-Modeling-Hubs/schemas/main/v3.0.0/tasks-schema.json", + "schema_version": "https://raw.githubusercontent.com/hubverse-org/schemas/main/v3.0.0/tasks-schema.json", "rounds": [{ "round_id_from_variable": true, "round_id": "forecast_date", diff --git a/tests/testthat/testdata/configs/tasks-samples-old-schema.json b/tests/testthat/testdata/configs/tasks-samples-old-schema.json index 6f0306b..dacd25b 100644 --- a/tests/testthat/testdata/configs/tasks-samples-old-schema.json +++ b/tests/testthat/testdata/configs/tasks-samples-old-schema.json @@ -1,5 +1,5 @@ { - "schema_version": "https://raw.githubusercontent.com/Infectious-Disease-Modeling-Hubs/schemas/main/v3.0.0/tasks-schema.json", + "schema_version": "https://raw.githubusercontent.com/hubverse-org/schemas/main/v3.0.0/tasks-schema.json", "rounds": [{ "round_id_from_variable": true, "round_id": "forecast_date", diff --git a/tests/testthat/testdata/configs/tasks-samples-pass.json b/tests/testthat/testdata/configs/tasks-samples-pass.json index 3193728..84a441c 100644 --- a/tests/testthat/testdata/configs/tasks-samples-pass.json +++ b/tests/testthat/testdata/configs/tasks-samples-pass.json @@ -1,5 +1,5 @@ { - "schema_version": "https://raw.githubusercontent.com/Infectious-Disease-Modeling-Hubs/schemas/main/v3.0.0/tasks-schema.json", + "schema_version": "https://raw.githubusercontent.com/hubverse-org/schemas/main/v3.0.0/tasks-schema.json", "rounds": [{ "round_id_from_variable": true, "round_id": "forecast_date", diff --git a/tests/testthat/testdata/configs/tasks-samples-tid-from-sample.json b/tests/testthat/testdata/configs/tasks-samples-tid-from-sample.json index cdb8494..368ce85 100644 --- a/tests/testthat/testdata/configs/tasks-samples-tid-from-sample.json +++ b/tests/testthat/testdata/configs/tasks-samples-tid-from-sample.json @@ -1,5 +1,5 @@ { - "schema_version": "https://raw.githubusercontent.com/Infectious-Disease-Modeling-Hubs/schemas/main/v3.0.0/tasks-schema.json", + "schema_version": "https://raw.githubusercontent.com/hubverse-org/schemas/main/v3.0.0/tasks-schema.json", "rounds": [{ "round_id_from_variable": true, "round_id": "forecast_date", diff --git a/tests/testthat/testdata/error_file/hub-config/admin.json b/tests/testthat/testdata/error_file/hub-config/admin.json index e3d1901..aaaa405 100644 --- a/tests/testthat/testdata/error_file/hub-config/admin.json +++ b/tests/testthat/testdata/error_file/hub-config/admin.json @@ -1,12 +1,12 @@ { - "schema_version": "https://raw.githubusercontent.com/Infectious-Disease-Modeling-Hubs/schemas/main/v2.0.0/admin-schema.json", + "schema_version": "https://raw.githubusercontent.com/hubverse-org/schemas/main/v2.0.0/admin-schema.json", "name": "Simple Forecast Hub", "maintainer": "Consortium of Infectious Disease Modeling Hubs", "contact": { "name": "Joe Bloggs", "email": "j.bloggs@cidmh.com" }, - "repository_url": "https://github.com/Infectious-Disease-Modeling-Hubs/example-simple-forecast-hub", + "repository_url": "https://github.com/hubverse-org/example-simple-forecast-hub", "hub_models": [{ "team_abbr": "simple_hub", "model_abbr": "baseline", diff --git a/tests/testthat/testdata/error_file/hub-config/tasks.json b/tests/testthat/testdata/error_file/hub-config/tasks.json index 32349fe..03dc1e6 100644 --- a/tests/testthat/testdata/error_file/hub-config/tasks.json +++ b/tests/testthat/testdata/error_file/hub-config/tasks.json @@ -1,5 +1,5 @@ { - "schema_version": "https://raw.githubusercontent.com/Infectious-Disease-Modeling-Hubs/schemas/main/v2.0.0/tasks-schema.json", + "schema_version": "https://raw.githubusercontent.com/hubverse-org/schemas/main/v2.0.0/tasks-schema.json", "rounds": [{ "round_id_from_variable": true, "round_id": "origin_date", diff --git a/tests/testthat/testdata/error_hub/hub-config/admin.json b/tests/testthat/testdata/error_hub/hub-config/admin.json index ad8a33e..0443d85 100644 --- a/tests/testthat/testdata/error_hub/hub-config/admin.json +++ b/tests/testthat/testdata/error_hub/hub-config/admin.json @@ -1,12 +1,12 @@ { - "schema_version": "https://raw.githubusercontent.com/Infectious-Disease-Modeling-Hubs/schemas/main/v2.0.0/admin-schema.json", + "schema_version": "https://raw.githubusercontent.com/hubverse-org/schemas/main/v2.0.0/admin-schema.json", "name": "Simple Forecast Hub", "maintainer": "Consortium of Infectious Disease Modeling Hubs", "contact": { "name": "Joe Bloggs", "email": "j.bloggs@cidmh.com" }, - "repository_url": "https://github.com/Infectious-Disease-Modeling-Hubs/example-simple-forecast-hub", + "repository_url": "https://github.com/hubverse-org/example-simple-forecast-hub", "hub_models": [{ "team_abbr": "simple_hub", "model_abbr": "baseline", diff --git a/tests/testthat/testdata/error_hub/hub-config/tasks.json b/tests/testthat/testdata/error_hub/hub-config/tasks.json index dda3978..6dc88c8 100644 --- a/tests/testthat/testdata/error_hub/hub-config/tasks.json +++ b/tests/testthat/testdata/error_hub/hub-config/tasks.json @@ -1,5 +1,5 @@ { - "schema_version": "https://raw.githubusercontent.com/Infectious-Disease-Modeling-Hubs/schemas/main/v2.0.0/tasks-schema.json", + "schema_version": "https://raw.githubusercontent.com/hubverse-org/schemas/main/v2.0.0/tasks-schema.json", "rounds": [{ "round_id_from_variable": true, "round_id": "origin_date", diff --git a/vignettes/articles/connect_hub.Rmd b/vignettes/articles/connect_hub.Rmd index 443e0f0..f5a48b9 100644 --- a/vignettes/articles/connect_hub.Rmd +++ b/vignettes/articles/connect_hub.Rmd @@ -21,7 +21,7 @@ All data returned from connecting to and querying hubs can be read or validated - `value`: a numeric variable that provides the information about the model's prediction. - `...` : other columns will be present depending on modeling tasks defined by the individual modeling hub. These columns are referred to in hubverse terminology as the `task-ID` variables. -Other hubverse tools, designed for data validation, [ensemble building](https://infectious-disease-modeling-hubs.github.io/hubEnsembles/), [visualization](https://github.com/Infectious-Disease-Modeling-Hubs/hubVis), etc..., all are designed with the "promises" implicit in the data format specified by `model_out_tbl`. For example, [the `hubEnsembles::linear_pool()` function ](https://infectious-disease-modeling-hubs.github.io/hubEnsembles/reference/linear_pool.html) both accepts as input and returns as output `model_out_tbl` objects. +Other hubverse tools, designed for data validation, [ensemble building](https://hubverse-org.github.io/hubEnsembles/), [visualization](https://github.com/hubverse-org/hubVis), etc..., all are designed with the "promises" implicit in the data format specified by `model_out_tbl`. For example, [the `hubEnsembles::linear_pool()` function ](https://hubverse-org.github.io/hubEnsembles/reference/linear_pool.html) both accepts as input and returns as output `model_out_tbl` objects. # Hub connections