diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 8503ea0..0d34f80 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/hubEnsembles", 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/hubEnsembles", 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/.github/workflows/update-example-hub.yaml b/.github/workflows/update-example-hub.yaml index 0f231f0..acccaf7 100644 --- a/.github/workflows/update-example-hub.yaml +++ b/.github/workflows/update-example-hub.yaml @@ -22,7 +22,7 @@ jobs: - name: Checkout example-simple-forecast-hub uses: actions/checkout@v3 with: - repository: 'Infectious-Disease-Modeling-Hubs/example-simple-forecast-hub' + repository: 'hubverse-org/example-simple-forecast-hub' ref: 'main' path: './inst/example-data/example-simple-forecast-hub' @@ -35,6 +35,6 @@ jobs: git add inst/example-data/example-simple-forecast-hub git commit -m "Github Actions build update example-simple-forecast-hub: $GITHUB_RUN_NUMBER" echo "Pushing files..." - git push https://${GITHUB_TOKEN}@github.com/Infectious-Disease-Modeling-Hubs/hubEnsembles.git HEAD:update_example_simple_forecast_hub + git push https://${GITHUB_TOKEN}@github.com/hubverse-org/hubEnsembles.git HEAD:update_example_simple_forecast_hub echo "Submitting pull request..." gh pr create --fill --base main --head update_example_simple_forecast_hub diff --git a/.gitignore b/.gitignore index d2ad873..0c88ba9 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,7 @@ /Meta/ docs .secrets +scrap code.r +hubEnsembles.code-workspace +.Rprofile +Rplot.png diff --git a/DESCRIPTION b/DESCRIPTION index 84554ee..65b0dbc 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: hubEnsembles Title: Ensemble methods for combining hub model outputs -Version: 0.1.2 +Version: 0.1.3 Authors@R: c( person(given = "Evan L", family = "Ray", @@ -40,9 +40,9 @@ Config/testthat/edition: 3 Encoding: UTF-8 Roxygen: list(markdown = TRUE) RoxygenNote: 7.3.1 -URL: https://github.com/Infectious-Disease-Modeling-Hubs/hubEnsembles, - https://infectious-disease-modeling-hubs.github.io/hubEnsembles/ -BugReports: https://github.com/Infectious-Disease-Modeling-Hubs/hubEnsembles/issues +URL: https://github.com/hubverse-org/hubEnsembles, + https://hubverse-org.github.io/hubEnsembles/ +BugReports: https://github.com/hubverse-org/hubEnsembles/issues Imports: cli, distfromq (>= 1.0.2), @@ -55,12 +55,12 @@ Imports: tidyr, tidyselect Remotes: - Infectious-Disease-Modeling-Hubs/hubData, - Infectious-Disease-Modeling-Hubs/hubExamples, - Infectious-Disease-Modeling-Hubs/hubUtils, - Infectious-Disease-Modeling-Hubs/hubVis, + hubverse-org/hubData, + hubverse-org/hubExamples, + hubverse-org/hubUtils, + hubverse-org/hubVis, reichlab/distfromq -Config/Needs/website: Infectious-Disease-Modeling-Hubs/hubStyle +Config/Needs/website: hubverse-org/hubStyle Depends: R (>= 2.10) LazyData: true diff --git a/README.Rmd b/README.Rmd index bba09c2..efe8dea 100644 --- a/README.Rmd +++ b/README.Rmd @@ -18,17 +18,17 @@ knitr::opts_chunk$set( [![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/hubEnsembles)](https://CRAN.R-project.org/package=hubEnsembles) -[![R-CMD-check](https://github.com/Infectious-Disease-Modeling-Hubs/hubEnsembles/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/Infectious-Disease-Modeling-Hubs/hubEnsembles/actions/workflows/R-CMD-check.yaml) +[![R-CMD-check](https://github.com/hubverse-org/hubEnsembles/actions/workflows/R-CMD-check.yaml/badge.svg)](https://github.com/hubverse-org/hubEnsembles/actions/workflows/R-CMD-check.yaml) -The goal of hubEnsembles is to provide standard implementations of commonly used methods for ensembling model outputs. The hubEnsembles package is part of [the hubverse project](https://hubdocs.readthedocs.io/en/latest/) and expects all input data to the key functions to be formatted as an object of a [`model_out_tbl` class](https://infectious-disease-modeling-hubs.github.io/hubUtils/reference/as_model_out_tbl.html). +The goal of hubEnsembles is to provide standard implementations of commonly used methods for ensembling model outputs. The hubEnsembles package is part of [the hubverse project](https://hubdocs.readthedocs.io/en/latest/) and expects all input data to the key functions to be formatted as an object of a [`model_out_tbl` class](https://hubverse-org.github.io/hubUtils/reference/as_model_out_tbl.html). ## Installation You can install the development version of hubEnsembles using this code: ``` r -remotes::install_github("infectious-disease-modeling-hubs/hubEnsembles") +remotes::install_github("hubverse-org/hubEnsembles") ``` diff --git a/_pkgdown.yml b/_pkgdown.yml index e8ce277..1db5e99 100644 --- a/_pkgdown.yml +++ b/_pkgdown.yml @@ -1,3 +1,3 @@ -url: https://infectious-disease-modeling-hubs.github.io/hubEnsembles/ +url: https://hubverse-org.github.io/hubEnsembles/ template: package: hubStyle