-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into bugfix/agg_lt
- Loading branch information
Showing
4 changed files
with
43 additions
and
47 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,6 +7,8 @@ name: pkgdown | |
| jobs: | ||
| pkgdown: | ||
| runs-on: macOS-latest | ||
| env: | ||
| GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }} | ||
| steps: | ||
| - uses: actions/checkout@v2 | ||
|
|
||
|
|
@@ -18,25 +20,27 @@ jobs: | |
| run: | | ||
| install.packages('remotes') | ||
| saveRDS(remotes::dev_package_deps(dependencies = TRUE), ".github/depends.Rds", version = 2) | ||
| writeLines(sprintf("R-%i.%i", getRversion()$major, getRversion()$minor), ".github/R-version") | ||
| shell: Rscript {0} | ||
|
|
||
| - name: Cache R packages | ||
| uses: actions/cache@v1 | ||
| with: | ||
| path: ${{ env.R_LIBS_USER }} | ||
| key: macOS-r-4.0-1-${{ hashFiles('.github/depends.Rds') }} | ||
| restore-keys: macOS-r-4.0-1- | ||
| key: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1-${{ hashFiles('.github/depends.Rds') }} | ||
| restore-keys: ${{ runner.os }}-${{ hashFiles('.github/R-version') }}-1- | ||
|
|
||
| - name: Install dependencies | ||
| run: | | ||
| install.packages("remotes") | ||
| remotes::install_deps(dependencies = TRUE) | ||
| remotes::install_dev("pkgdown") | ||
| install.packages("pkgdown") | ||
| shell: Rscript {0} | ||
|
|
||
| - name: Install package | ||
| run: R CMD INSTALL . | ||
|
|
||
| - name: Deploy package | ||
| run: pkgdown::deploy_to_branch(new_process = FALSE) | ||
| shell: Rscript {0} | ||
| run: | | ||
| git config --local user.email "[email protected]" | ||
| git config --local user.name "GitHub Actions" | ||
| Rscript -e 'pkgdown::deploy_to_branch(new_process = FALSE)' | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,48 +5,35 @@ | |
| [](https://codecov.io/gh/ihmeuw-demographics/demCore?branch=master) | ||
| <!-- badges: end --> | ||
|
|
||
| Common core functions for demographic methods. Includes basic demography | ||
| calculations such as: | ||
| Common core functions for demographic methods. | ||
| Includes basic demography calculations such as: | ||
|
|
||
| * Mortality: life table composition | ||
| * Fertility: TFR, ASFR | ||
| * Population: CCMPP, Leslie matrices | ||
|
|
||
| Go [here](https://ihmeuw-demographics.github.io/demCore) for more documentation | ||
| and examples. | ||
| ## Installation | ||
|
|
||
| ### Authors | ||
|
|
||
| All of the following authors of this package are at the [Institute for Health | ||
| Metrics and Evaluation](http://www.healthdata.org/) at the University of | ||
| Washington. | ||
|
|
||
| | | | | ||
| |--------------------|-----------------| | ||
| | Katie Paulson | [email protected] | | ||
| | Charlton Callender | [email protected] | | ||
| | Spencer Pease | [email protected] | | ||
|
|
||
| ### Installation | ||
|
|
||
| This package has not yet been published on CRAN, but can be installed from | ||
| GitHub using the [remotes](https://remotes.r-lib.org/) package. Installation of | ||
| the [hierarchyUtils](https://github.com/ihmeuw-demographics/hierarchyUtils) | ||
| package is also required. | ||
| This package has not yet been published on CRAN, but can be installed from GitHub using the [remotes](https://remotes.r-lib.org/) package. | ||
| Installation of the [hierarchyUtils](https://github.com/ihmeuw-demographics/hierarchyUtils) package is also required. | ||
|
|
||
| ```r | ||
| remotes::install_github("ihmeuw-demographics/hierarchyUtils") | ||
| remotes::install_github("ihmeuw-demographics/demCore") | ||
| ``` | ||
|
|
||
| ### Getting help | ||
| ## Getting help | ||
|
|
||
| demCore function documentation and vignettes can be found at [https://ihmeuw-demographics.github.io/demCore/index.html](https://ihmeuw-demographics.github.io/demCore/index.html) | ||
|
|
||
| If you encounter a clear bug, missing documentation, or a feature you'd like to see implemented please file an issue on [github](https://github.com/ihmeuw-demographics/demCore/issues) with the information requested in the issue template. | ||
|
|
||
| ## Contributing | ||
|
|
||
| If you encounter a clear bug, please file a minimal reproducible example on [github](https://github.com/ihmeuw-demographics/demCore/issues). | ||
| See the [contributing guidelines](https://github.com/ihmeuw-demographics/.github/blob/master/contributing.md) for more information. | ||
|
|
||
| ### Additional resources | ||
| ## Additional resources | ||
|
|
||
| Much of the content in this package comes from well established demographic | ||
| methods, as reported in the following book: | ||
| Much of the content in this package comes from well established demographic methods, as reported in the following book: | ||
|
|
||
| *Preston Samuel H, Patrick H, Michel G. Demography: measuring and modeling | ||
| population processes. MA: Blackwell Publishing. 2001.* | ||
| *Preston Samuel H, Patrick H, Michel G. Demography: measuring and modeling population processes. MA: Blackwell Publishing. 2001.* | ||