From f13b6eafacf9cf822ce9da77fe34fef9ade6e911 Mon Sep 17 00:00:00 2001 From: Rob Ashton Date: Fri, 15 Mar 2024 10:57:53 +0000 Subject: [PATCH] Bump version number --- .github/workflows/R-CMD-check.yaml | 2 +- DESCRIPTION | 2 +- NEWS.md | 6 +++++- tests/testthat/Rplots.pdf | Bin 11830 -> 0 bytes 4 files changed, 7 insertions(+), 3 deletions(-) delete mode 100644 tests/testthat/Rplots.pdf diff --git a/.github/workflows/R-CMD-check.yaml b/.github/workflows/R-CMD-check.yaml index 87c3af0..0c42ded 100644 --- a/.github/workflows/R-CMD-check.yaml +++ b/.github/workflows/R-CMD-check.yaml @@ -46,7 +46,7 @@ jobs: - uses: actions/checkout@master with: - name: mrc-ide/shiny90_sample_files + repository: mrc-ide/shiny90_sample_files ## ${{ github.token }} is scoped to the current repository, so we ## need to provide our own PAT token: ${{ secrets.SAMPLE_FILES_GH_PAT }} diff --git a/DESCRIPTION b/DESCRIPTION index 1fb7a01..18a3906 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,5 +1,5 @@ Package: first90 -Version: 1.6.9 +Version: 1.6.10 Title: The first90 model Description: Implements the Shiny90 model for estimating progress towards the UNAIDS "first 90" target for HIV awareness of status in sub-Saharan Africa. Authors@R: diff --git a/NEWS.md b/NEWS.md index 4352059..39dc33b 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,7 @@ +# first90 1.6.10 + +* Qualify package names, fix some R CMD warnings and notes + # first90 1.6.9 * Bug fix: account for end-year net migration in the ART population in the first year of ART start (implemented in v1.6.0). @@ -122,7 +126,7 @@ Updates for 2022 UNAIDS estimates: # first90 1.4.3 -* Patch: in function `add_ss_indices()`, add argument `utils::type.convert(..., as.is = TRUE)` +* Patch: in function `add_ss_indices()`, add argument `type.convert(..., as.is = TRUE)` to suppress R 4.0 warning. * Bugfix: remove duplicate declaration of `double incrate_g[NG];` in `EPP_DIRECTINCID` incidence option. This did not affect any results because this option is not used in Shiny90 application; diff --git a/tests/testthat/Rplots.pdf b/tests/testthat/Rplots.pdf deleted file mode 100644 index 6b077ad6346af3a6b8365a5feb4cc8d3bba99a3d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 11830 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 A(*OVf