Merge pull request #265 from cmu-delphi/dev

v1.1.1 release

Author: dshemetov

.Rbuildignore

@@ -20,4 +20,7 @@
 ^.venv$
 ^env$
 ^.env$
+^README\.Rmd$
 ^CRAN-SUBMISSION$
+^LICENSE\.md$
+^revdep$

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.0.0
+current_version = 1.0.0.9000
 commit = False
 tag = False
 

.github/CODEOWNERS

@@ -1 +1 @@
-* @dshemetov @brookslogan @dsweber2
+* @dshemetov @brookslogan @dsweber2 @nmdefries

.github/pull_request_template.md

@@ -0,0 +1,22 @@
+### Checklist
+
+Please:
+
+- [ ] Make sure this PR is against "dev", not "main" (unless this is a release
+      PR).
+- [ ] Request a review from one of the current epidatr main reviewers:
+      brookslogan, dshemetov, nmdefries, dsweber2.
+- [ ] Makes sure to bump the version number in `DESCRIPTION`. Always increment
+      the patch version number (the third number), unless you are making a
+      release PR from dev to main, in which case increment the minor version
+      number (the second number).
+- [ ] Describe changes made in NEWS.md, making sure breaking changes
+      (backwards-incompatible changes to the documented interface) are noted.
+      Collect the changes under the next release number (e.g. if you are on
+      1.7.2, then write your changes under the 1.8 heading).
+
+### Change explanations for reviewer
+
+### Magic GitHub syntax to mark associated Issue(s) as resolved when this is merged into the default branch
+
+- Resolves #{issue number}

.github/workflows/R-CMD-check.yaml

@@ -5,6 +5,7 @@ on:
     branches: [main, dev]
   pull_request:
     branches: [main, dev]
+  workflow_dispatch:
 
 name: R-CMD-check
 

.github/workflows/create_release.yml

@@ -2,7 +2,8 @@
 # Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
 on:
   push:
-    paths: ["R/**"]
+    paths: ["R/**", "README.Rmd"]
+  workflow_dispatch:
 
 name: Document
 
@@ -26,17 +27,25 @@ jobs:
       - name: Install dependencies
         uses: r-lib/actions/setup-r-dependencies@v2
         with:
-          extra-packages: any::roxygen2
-          needs: roxygen2
+          extra-packages: |
+            any::devtools
+            any::roxygen2
+          needs: |
+            devtools
+            roxygen2
 
       - name: Document
         run: roxygen2::roxygenise()
         shell: Rscript {0}
 
+      - name: Build README.md from README.Rmd
+        run: Rscript -e 'devtools::build_readme()'
+
       - name: Commit and push changes
         run: |
           git config --local user.name "$GITHUB_ACTOR"
           git config --local user.email "[email protected]"
+          git add README.md
           git add man/\* NAMESPACE DESCRIPTION
           git commit -m "docs: document (GHA)" || echo "No changes to commit"
           git pull --rebase

.github/workflows/document.yaml

@@ -5,6 +5,7 @@ on:
     branches: [main, dev]
   pull_request:
     branches: [main, dev]
+  workflow_dispatch:
 
 name: lint
 

.github/workflows/lint.yaml

@@ -5,9 +5,9 @@
 # update the documentation web site on pushes to `dev` branch.
 on:
   push:
-    branches: [main]
+    branches: [main, dev]
   pull_request:
-    branches: [main]
+    branches: [main, dev]
   release:
     types: [published]
   workflow_dispatch:
@@ -23,7 +23,7 @@ jobs:
       group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }}
     env:
       GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
-      DELPHI_EPIDATA_KEY: ${{ secrets.DELPHI_GITHUB_ACTIONS_EPIDATA_API_KEY }}
+      DELPHI_EPIDATA_KEY: ${{ secrets.SECRET_EPIDATR_GHACTIONS_DELPHI_EPIDATA_KEY }}
     steps:
       - uses: actions/checkout@v3
 
@@ -35,13 +35,29 @@ jobs:
 
       - uses: r-lib/actions/setup-r-dependencies@v2
         with:
-          extra-packages: any::pkgdown, local::.
+          extra-packages: any::pkgdown, local::., any::cli
           needs: website
 
       - name: Build site
-        env:
-          DELPHI_EPIDATA_KEY: ${{ secrets.SECRET_EPIDATR_GHACTIONS_DELPHI_EPIDATA_KEY }}
-        run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE)
+        run: |
+          override <- if (startsWith("${{ github.event_name }}", "pull_request")) {
+              if ("${{ github.base_ref }}" == "main") {
+                list(development = list(mode = "release", version_label = "light"))
+              } else {
+                list(development = list(mode = "devel", version_label = "success"))
+              }
+          } else {
+              if ("${{ github.ref_name }}" == "main") {
+                list(development = list(mode = "release", version_label = "light"))
+              } else {
+                list(development = list(mode = "devel", version_label = "success"))
+              }
+          }
+          pkg <- pkgdown::as_pkgdown(".", override = override)
+          cli::cli_rule("Cleaning files from old site...")
+          pkgdown::clean_site(pkg)
+          pkgdown::build_site(pkg, preview = FALSE, install = FALSE, new_process = FALSE)
+          pkgdown:::build_github_pages(pkg)
         shell: Rscript {0}
 
       - name: Deploy to GitHub pages 🚀

.github/workflows/pkgdown.yaml

@@ -10,6 +10,7 @@ on:
         "**.[rR]nw",
         "**.[rR]profile",
       ]
+    workflow_dispatch:
 
 name: Style
 

.github/workflows/release_helper.yml

@@ -17,3 +17,6 @@ env
 /Meta/
 .secrets
 epidatr.Rproj
+renv.lock
+renv/
+.Rprofile

.github/workflows/style.yaml

@@ -3,3 +3,7 @@ linters: linters_with_defaults(
   cyclocomp_linter = NULL,
   object_length_linter(length = 40L)
   )
+exclusions: list(
+  "renv",
+  "venv"
+  )

.gitignore

@@ -1,3 +1,3 @@
-Version: 1.0.0
-Date: 2023-09-12 08:00:50 UTC
-SHA: 52436eb250eab1f9c70b250bf4ca1ab25cc48316
+Version: 1.1.0
+Date: 2024-02-27 20:25:04 UTC
+SHA: 693c04bd80d3ffe0b3c012281303c4878de08c70

.lintr

@@ -1,9 +1,8 @@
 Package: epidatr
 Type: Package
 Title: Client for Delphi's 'Epidata' API
-Version: 1.0.0
-Date: 2023-09-11
-Authors@R: 
+Version: 1.1.1
+Authors@R:
   c(
     person("Logan", "Brooks", email = "[email protected]", role = c("aut")),
     person("Dmitry", "Shemetov", email = "[email protected]", role = c("aut")),
@@ -35,22 +34,26 @@ Imports:
     MMWRweek,
     purrr,
     openssl,
+    rappdirs,
     readr,
     tibble,
+    usethis,
     xml2
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.1
 Suggests:
     dplyr,
     ggplot2,
     knitr,
+    maps,
+    mapproj,
     rmarkdown,
     rlang,
     testthat (>= 3.1.5),
     withr
 VignetteBuilder: knitr
 Language: en-US
 Config/testthat/edition: 3
-Collate: 
+Collate:
     'auth.R'
     'avail_endpoints.R'
     'cache.R'