From d1232f1ff1f3d096ac8953194003cd654d850883 Mon Sep 17 00:00:00 2001 From: seabbs Date: Mon, 27 Sep 2021 11:52:46 +0000 Subject: [PATCH] update description, news and run tests --- .devcontainer/Dockerfile | 3 +- .devcontainer/devcontainer.json | 4 +- DESCRIPTION | 8 ++- NEWS.md | 5 +- inst/WORDLIST | 66 ++++++++++++++++++ .../testthat/custom_data/Estonia_level_1.rds | Bin 0 -> 3298 bytes 6 files changed, 80 insertions(+), 6 deletions(-) create mode 100644 tests/testthat/custom_data/Estonia_level_1.rds diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index a66ad0aa..75442281 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -38,7 +38,8 @@ RUN install2.r --error --skipinstalled --repos ${CRAN} --ncpus -1 \ RUN apt-get update \ && export DEBIAN_FRONTEND=noninteractive \ && apt-get -y install --no-install-recommends libgdal-dev \ - libudunits2-dev libharfbuzz-dev libfribidi-dev + libudunits2-dev libharfbuzz-dev libfribidi-dev \ + libjq-dev libprotobuf-dev # install dependencies COPY DESCRIPTION /tmp/package/DESCRIPTION diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index e2a87fc7..f4c1f7db 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -23,7 +23,9 @@ "extensions": [ "ikuyadeu.r", "reditorsupport.r-lsp", - "shan.code-settings-sync" + "shan.code-settings-sync", + "searking.preview-vscode", + "tht13.html-preview-vscode" ], // Use 'forwardPorts' to make a list of ports inside the container available locally. diff --git a/DESCRIPTION b/DESCRIPTION index 262c9961..20e44186 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: covidregionaldata Title: Subnational Data for COVID-19 Epidemiology -Version: 0.9.2.2000 +Version: 0.9.2.3000 Authors@R: c(person(given = "Joseph", family = "Palmer", @@ -55,6 +55,10 @@ Authors@R: family = "Gruson", role = "ctb", comment = c(ORCID = "0000-0002-4094-1476")), + person(given = "Vang", + family = "Le", + role = "ctb", + comment = c(URL = "https://github.com/biocyberman")), person(given = "Sebastian", family = "Funk", role = "aut", @@ -102,7 +106,7 @@ Imports: tidyselect, vroom, withr, - xml2, + xml2 Suggests: ggplot2, ggspatial, diff --git a/NEWS.md b/NEWS.md index 38acad4c..27fe3285 100644 --- a/NEWS.md +++ b/NEWS.md @@ -4,11 +4,12 @@ This release is currrently under development ## New data sets -- Support for level 1 region data in Estonia (thanks to @RichardMN). See `?Estonia` for details. +- Support for level 1 region data in Estonia (thanks to @RichardMN). See `?Estonia` for details. +- Support for level 1 region data in Vietnam (thanks to @biocyberman). See `?Vietname` for details. # covidregionaldata 0.9.2 -This release adds support for the Covid19 Data Hub which includes Google and Apple mobility data amongst a large range of other data sets, data from the European Commission's Joint Research Centre which is at both the regional and national level, and individual sources for regional data from several countries. Package updates have been made in line with a software review at the [Journal of Open Source Software](https://github.com/openjournals/joss-reviews/issues/3290). Finally, this release exposes more of the testing infrastructure to users and adds a package hexsticker. +This release adds support for the Covid19 Data Hub which includes Google and Apple mobility data amongst a large range of other data sets, data from the European Commission's Joint Research Centre which is at both the regional and national level, and individual sources for regional data from several countries. Package updates have been made in line with a software review at the [Journal of Open Source Software](https://github.com/openjournals/joss-reviews/issues/3290). Finally, this release exposes more of the testing infrastructure to users and adds a package hexsticker. Thanks to @joseph-palmer, @RichardMN, and @kathsherratt for contributions towards this release. diff --git a/inst/WORDLIST b/inst/WORDLIST index 94e9ecfe..e3fb521e 100644 --- a/inst/WORDLIST +++ b/inst/WORDLIST @@ -1,108 +1,174 @@ +abbott ac ACAPS afghanistan api APL apskritis +aut BB BBSRC +bevan +biocyberman +BugReports Bundesland +campbell cloneable CMD CMMID Codecov com +Config conuntry Cota countries’ +countrycode CoV covid Covid COVID +covidregionaldata +cre CSSE +ctb +currrently DataClass datahub dd DD documentaion doi +dplyr ec ECDC +epiforecasts Estados etc filepath +flavio +Flavio fns fromJSON +gb geocode geocoding +ggplot +ggspatial github Github GoogleData +Gruson Guidotti +hellewell +Hellewell hexsticker +httr ICD inegi INEGI Inf initalize Initalize +io IPC iso JHU +joe +joel +jonnie +Jonnie jrc JRC jsonlite jure +katharine +knitr Kreise Landkreis +LazyData +lifecycle linelist Linelist linelists +lshtm ltla +lubridate magrittr md +Meakin +meaking Meixco memoise metacran +msf MX Nam nhs nhsregions nr OpenDataZH +ORCID org OSP params +patrick +paul paulcampbell PHE +pkgdown PRs +purrr quickstart +rboyes rds +readxl recomended regioni reparameterise +rhul +RichardMN +rlang +rmarkdown +Roxygen +RoxygenNote +rvest RVIM +rworldmap +sam SARS savivaldybe SciELOPreprints +sebastian seperate shapefiles +sherratt +Sherratt +sophie SouthAfrica spi st +stringi +stringr subnationaldata subnationally supertracker +tessella testthat tibble tibbles +tidyr +tidyselect UCPM uk urls useMemoise +usethis utla +Vang +VignetteBuilder Wellcome wikipedia +withr yaml yyyy YYYY diff --git a/tests/testthat/custom_data/Estonia_level_1.rds b/tests/testthat/custom_data/Estonia_level_1.rds new file mode 100644 index 0000000000000000000000000000000000000000..7a285cf5506e359e9ad75e543c3a6343ff2ed047 GIT binary patch literal 3298 zcmaJ;dpy&7AFrp=ah%R+DkZ|NLT+VsN`!4Gw-85>lx<4os8fis4O<-vDNAn2?YM

s8 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 Kl4IfP*8Lk1A}PuM literal 0 HcmV?d00001