Skip to content

Commit

Permalink
Merge pull request #42 from hubverse-org/to-hubverse
Browse files Browse the repository at this point in the history
Change org name
  • Loading branch information
annakrystalli authored Jun 19, 2024
2 parents 3d8853d + c98ddff commit 97df47f
Show file tree
Hide file tree
Showing 23 changed files with 60 additions and 60 deletions.
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
10 changes: 5 additions & 5 deletions DESCRIPTION
Original file line number Diff line number Diff line change
@@ -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"),
Expand All @@ -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,
Expand All @@ -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
2 changes: 1 addition & 1 deletion NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
6 changes: 3 additions & 3 deletions README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ knitr::opts_chunk$set(
```


# hubData <a href="https://Infectious-Disease-Modeling-Hubs.github.io/hubData/"><img src="man/figures/logo.png" align="right" height="131" alt="hubData website" /></a>
# hubData <a href="https://hubverse-org.github.io/hubData/"><img src="man/figures/logo.png" align="right" height="131" alt="hubData website" /></a>

<!-- badges: start -->
[![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)
<!-- badges: end -->

The goal of hubData is to provide tools for accessing and working with hubverse Hub data.
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@

<!-- README.md is generated from README.Rmd. Please edit that file -->

# hubData <a href="https://Infectious-Disease-Modeling-Hubs.github.io/hubData/"><img src="man/figures/logo.png" align="right" height="131" alt="hubData website" /></a>
# hubData <a href="https://hubverse-org.github.io/hubData/"><img src="man/figures/logo.png" align="right" height="131" alt="hubData website" /></a>

<!-- badges: start -->

[![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)
<!-- badges: end -->

The goal of hubData is to provide tools for accessing and working with
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion _pkgdown.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
url: https://infectious-disease-modeling-hubs.github.io/hubData/
url: https://hubverse-org.github.io/hubData/
template:
package: hubStyle
2 changes: 1 addition & 1 deletion inst/config/tasks-comp-tid.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
2 changes: 1 addition & 1 deletion inst/config/tasks.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
32 changes: 16 additions & 16 deletions tests/_snaps/hub-connection.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand Down Expand Up @@ -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"
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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"
Expand All @@ -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
Expand Down Expand Up @@ -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"
Expand All @@ -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
Expand Down
Loading

0 comments on commit 97df47f

Please sign in to comment.