Merge pull request #1823 from cmu-delphi/release/indicators_v0.3.35_utils_v0.3.12

Release covidcast-indicators 0.3.35

Author: krivard

.bumpversion.cfg

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

.github/workflows/create-release.yml

@@ -61,7 +61,7 @@ jobs:
           bump2version --list ${{ github.event.inputs.versionName }} | grep ^new_version | sed -r s,"^.*=",,
       - name: Copy version to indicator directory
         run: |
-          indicator_list=("changehc" "claims_hosp" "doctor_visits" "dsew_community_profile" "google_symptoms" "hhs_hosp" "jhu" "nchs_mortality" "nowcast" "quidel_covidtest" "sir_complainsalot")
+          indicator_list=("changehc" "claims_hosp" "doctor_visits" "dsew_community_profile" "google_symptoms" "hhs_hosp" "nchs_mortality" "nowcast" "quidel_covidtest" "sir_complainsalot")
           for path in ${indicator_list[@]}; do
             echo "current_version = ${{ steps.indicators.outputs.version }}" > $path/version.cfg
           done

.github/workflows/python-ci.yml

@@ -16,7 +16,7 @@ jobs:
     if: github.event.pull_request.draft == false
     strategy:
       matrix:
-        packages: [_delphi_utils_python, changehc, claims_hosp, doctor_visits, dsew_community_profile, google_symptoms, hhs_hosp, jhu, nchs_mortality, nowcast, quidel_covidtest, sir_complainsalot]
+        packages: [_delphi_utils_python, changehc, claims_hosp, doctor_visits, dsew_community_profile, google_symptoms, hhs_hosp, nchs_mortality, nowcast, quidel_covidtest, sir_complainsalot]
     defaults:
       run:
         working-directory: ${{ matrix.packages }}

Jenkinsfile

@@ -10,7 +10,7 @@
    - TODO: #527 Get this list automatically from python-ci.yml at runtime.
  */
 
-def indicator_list = ["backfill_corrections", "changehc", "claims_hosp", "google_symptoms", "hhs_hosp", "jhu", "nchs_mortality", "quidel_covidtest", "sir_complainsalot", "dsew_community_profile", "doctor_visits"]
+def indicator_list = ["backfill_corrections", "changehc", "claims_hosp", "google_symptoms", "hhs_hosp", "nchs_mortality", "quidel_covidtest", "sir_complainsalot", "dsew_community_profile", "doctor_visits"]
 def build_package_main = [:]
 def build_package_prod = [:]
 def deploy_staging = [:]

_delphi_utils_python/.bumpversion.cfg

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

_delphi_utils_python/delphi_utils/__init__.py

@@ -15,4 +15,4 @@
 from .nancodes import Nans
 from .weekday import Weekday
 
-__version__ = "0.3.11"
+__version__ = "0.3.12"

_delphi_utils_python/setup.py

@@ -14,7 +14,7 @@
     "mock",
     "moto",
     "numpy",
-    "pandas>=1.1.0",
+    "pandas>=1.1.0,<2",
     "pydocstyle",
     "pylint==2.8.3",
     "pytest",
@@ -26,7 +26,7 @@
 
 setup(
     name="delphi_utils",
-    version="0.3.11",
+    version="0.3.12",
     description="Shared Utility Functions for Indicators",
     long_description=long_description,
     long_description_content_type="text/markdown",

_delphi_utils_python/tests/test_geomap.py

@@ -275,6 +275,10 @@ def test_add_geocode(self, geomapper):
         new_data = geomapper.add_geocode(self.zip_data, "zip", "state_code")
         new_data2 = geomapper.add_geocode(new_data, "state_code", "nation")
         assert new_data2["nation"].unique()[0] == "us"
+        new_data = geomapper.replace_geocode(self.zip_data, "zip", "state_code")
+        new_data2 = geomapper.add_geocode(new_data, "state_code", "state_id", new_col="state")
+        new_data3 = geomapper.replace_geocode(new_data2, "state_code", "nation", new_col="geo_id")
+        assert "state" not in new_data3.columns
 
         # state_code -> hhs
         new_data = geomapper.add_geocode(self.zip_data, "zip", "state_code")

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

@@ -28,11 +28,6 @@
         "sum_anosmia_ageusia_smoothed_search"
       ]
     },
-    "jhu-csse": {
-      "max_age": 2,
-      "maintainers": ["U01AP8GSWG3","U01069KCRS7"],
-      "retired-signals": ["confirmed_7dav_cumulative_num", "confirmed_7dav_cumulative_prop", "deaths_7dav_cumulative_num", "deaths_7dav_cumulative_prop"]
-    },
     "quidel": {
       "max_age":6,
       "maintainers": ["U01AP8GSWG3","U01069KCRS7"],

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

@@ -1 +1 @@
-current_version = 0.3.34
+current_version = 0.3.35

changehc/version.cfg

@@ -1 +1 @@
-current_version = 0.3.34
+current_version = 0.3.35

claims_hosp/version.cfg

@@ -1 +1 @@
-current_version = 0.3.34
+current_version = 0.3.35

doctor_visits/version.cfg

@@ -1 +1 @@
-current_version = 0.3.34
+current_version = 0.3.35

dsew_community_profile/version.cfg

@@ -1 +1 @@
-current_version = 0.3.34
+current_version = 0.3.35

google_symptoms/version.cfg

@@ -1 +1 @@
-current_version = 0.3.34
+current_version = 0.3.35