Merge branch 'main' into final-wave-12-changes

Author: nmdefries

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.1.22
+current_version = 0.2.9
 commit = True
 message = chore: bump covidcast-indicators to {new_version}
 tag = False

.github/workflows/r-ci.yml

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

Jenkinsfile

@@ -9,7 +9,7 @@
    - Keep in sync with '.github/workflows/python-ci.yml'.
    - TODO: #527 Get this list automatically from python-ci.yml at runtime.
  */
-def indicator_list = ["cdc_covidnet", "changehc", "claims_hosp", "combo_cases_and_deaths", "covid_act_now", "facebook", "google_symptoms", "hhs_hosp", "jhu", "nchs_mortality", "quidel", "quidel_covidtest", "safegraph_patterns", "sir_complainsalot", "usafacts"]
+def indicator_list = ["changehc", "claims_hosp", "covid_act_now", "facebook", "google_symptoms", "hhs_hosp", "jhu", "nchs_mortality", "quidel", "quidel_covidtest", "safegraph_patterns", "sir_complainsalot", "usafacts"]
 def build_package = [:]
 def deploy_staging = [:]
 def deploy_production = [:]

_delphi_utils_python/.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.1.16
+current_version = 0.2.6
 commit = True
 message = chore: bump delphi_utils to {new_version}
 tag = False

_delphi_utils_python/.pylintrc

@@ -12,9 +12,9 @@ disable=logging-format-interpolation,
 [BASIC]
 
 # Allow arbitrarily short-named variables.
-variable-rgx=[a-z_][a-z0-9_]*
-argument-rgx=[a-z_][a-z0-9_]*
-attr-rgx=[a-z_][a-z0-9_]*
+variable-rgx=([a-z_][a-z0-9_]*|[a-zA-Z])
+argument-rgx=([a-z_][a-z0-9_]*|[a-zA-Z])
+attr-rgx=([a-z_][a-z0-9_]*|[a-zA-Z])
 
 [DESIGN]