Merge branch 'main' into fb-package-automate-tests

Author: nmdefries

_delphi_utils_python/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.1.0
+current_version = 0.1.1
 commit = False
 tag = False
 tag_name = delphi-utils/v{new_version}

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

@@ -20,7 +20,7 @@
       "maintainers": ["U01AP8GSWG3","U01069KCRS7"]
     },
     "usa-facts": {
-      "max_age": 3,
+      "max_age": 5,
       "maintainers": ["U01AP8GSWG3","U01069KCRS7"]
     },
     "jhu-csse": {

facebook/Makefile

@@ -144,7 +144,8 @@ lint: coverage
 test: delphiFacebook_1.0.tar.gz
 	if [ ! -f params.json ]; then cp params.json.template params.json; fi
 	grep testthat params.json
-	R CMD check $<
+	R CMD check --test-dir=unit-tests $<
+	R CMD check --test-dir=integration-tests $<
 
 delphiFacebook_1.0.tar.gz: $(wildcard delphiFacebook/R/*.R)
 	R CMD build delphiFacebook