Merge branch 'main' into contingency-autoset-input-files

Author: nmdefries

.github/workflows/r-ci.yml

@@ -48,10 +48,14 @@ jobs:
             ${{ runner.os }}-r-facebook-survey-
       - name: Install R dependencies
         run: |
+          if ( packageVersion("readr") != "1.4.0" ) {
+            install.packages("devtools")
+            devtools::install_version("readr", version = "1.4.0")
+          }
           install.packages("remotes")
           remotes::update_packages(c("rcmdcheck", "mockr"), upgrade="always")
           dependency_list <- remotes::dev_package_deps(dependencies=TRUE)
-          remotes::update_packages(dependency_list$package, upgrade="always")
+          remotes::update_packages(dependency_list$package[dependency_list$package != "readr"], upgrade="always")
         shell: Rscript {0}
       - name: Check
         run: |

ansible/templates/sir_complainsalot-params-prod.json.j2

@@ -46,6 +46,18 @@
       "max_age":6,
       "maintainers": ["U01AP8GSWG3","U01069KCRS7"],
       "retired-signals": ["raw_pct_negative","smoothed_pct_negative","raw_tests_per_device","smoothed_tests_per_device"]
+    },
+    "nchs-mortality": {
+      "max_age":16,
+      "maintainers": []
+    },
+    "covid-act-now": {
+      "max_age":5,
+      "maintainers": []
+    },
+    "hhs": {
+      "max_age":8,
+      "maintainers": []
     }
   }
 }

facebook/delphiFacebook/unit-tests/testthat/test-contingency-variables.R

@@ -24,7 +24,7 @@ test_that("testing create dir function", {
 
 test_that("testing read params when missing file", {
 
-  # expect error if missing file, since no template in test dir
+  # expect error if missing file, since no template in test dir
   tdir <- tempfile()
   expect_warning(expect_error(read_params(tdir)))
 })

facebook/delphiFacebook/unit-tests/testthat/test-utils.R

@@ -47,6 +47,18 @@
       "max_age":6,
       "maintainers": ["U01AP8GSWG3","U01069KCRS7"],
       "retired-signals": ["raw_pct_negative","smoothed_pct_negative","raw_tests_per_device","smoothed_tests_per_device"]
+    },
+    "nchs-mortality": {
+      "max_age":16,
+      "maintainers": []
+    },
+    "covid-act-now": {
+      "max_age":5,
+      "maintainers": []
+    },
+    "hhs": {
+      "max_age":8,
+      "maintainers": []
     }
   }
 }