From 7a6fc24dd99c9710200b884563b3510abcad1fb7 Mon Sep 17 00:00:00 2001 From: minhkhul <118945681+minhkhul@users.noreply.github.com> Date: Mon, 2 Jun 2025 15:05:32 -0400 Subject: [PATCH 1/4] ignore combined signals (#2148) --- ansible/templates/sir_complainsalot-params-prod.json.j2 | 6 +++++- sir_complainsalot/params.json.template | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ansible/templates/sir_complainsalot-params-prod.json.j2 b/ansible/templates/sir_complainsalot-params-prod.json.j2 index 7bb2d179a..8a63276dc 100644 --- a/ansible/templates/sir_complainsalot-params-prod.json.j2 +++ b/ansible/templates/sir_complainsalot-params-prod.json.j2 @@ -44,7 +44,11 @@ }, "nssp": { "max_age":19, - "maintainers": [] + "maintainers": [], + "retired-signals": [ + "pct_ed_visits_combined", + "smoothed_pct_ed_visits_combined" + ] }, "nhsn": { "max_age":19, diff --git a/sir_complainsalot/params.json.template b/sir_complainsalot/params.json.template index 64c4bee17..65c0498e3 100644 --- a/sir_complainsalot/params.json.template +++ b/sir_complainsalot/params.json.template @@ -44,7 +44,11 @@ }, "nssp": { "max_age":19, - "maintainers": [] + "maintainers": [], + "retired-signals": [ + "pct_ed_visits_combined", + "smoothed_pct_ed_visits_combined" + ] } } } From 662736816ac89526648637c01121397ab33b8e4b Mon Sep 17 00:00:00 2001 From: minhkhul <118945681+minhkhul@users.noreply.github.com> Date: Thu, 12 Jun 2025 11:58:22 -0400 Subject: [PATCH 2/4] Remove NSSP retired signals (#2149) * RemoveNSSP retired signals * fix test_full_patch_code --- nssp/delphi_nssp/constants.py | 2 -- nssp/tests/test_patch.py | 12 ++++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/nssp/delphi_nssp/constants.py b/nssp/delphi_nssp/constants.py index 4aa5695d8..fde27c3d0 100644 --- a/nssp/delphi_nssp/constants.py +++ b/nssp/delphi_nssp/constants.py @@ -15,11 +15,9 @@ "percent_visits_covid": "pct_ed_visits_covid", "percent_visits_influenza": "pct_ed_visits_influenza", "percent_visits_rsv": "pct_ed_visits_rsv", - "percent_visits_combined": "pct_ed_visits_combined", "percent_visits_smoothed_covid": "smoothed_pct_ed_visits_covid", "percent_visits_smoothed_1": "smoothed_pct_ed_visits_influenza", "percent_visits_smoothed_rsv": "smoothed_pct_ed_visits_rsv", - "percent_visits_smoothed": "smoothed_pct_ed_visits_combined", } SIGNALS = [val for (key, val) in SIGNALS_MAP.items()] diff --git a/nssp/tests/test_patch.py b/nssp/tests/test_patch.py index fb40e8d2b..c73385d75 100644 --- a/nssp/tests/test_patch.py +++ b/nssp/tests/test_patch.py @@ -259,14 +259,14 @@ def test_full_patch_code(self, mock_read_params, mock_get_structured_logger): # Make sure issue_20210103 has latest weekly data (data from 20210109 instead of 20210108) df_20210108 = pd.read_csv('source_dir/20210108.csv.gz') - df_20210108_nation_combined = df_20210108['percent_visits_combined'].iloc[0] + df_20210108_nation_covid = df_20210108['percent_visits_covid'].iloc[0] df_20210109 = pd.read_csv('source_dir/20210109.csv.gz') - df_20210109_nation_combined = df_20210109['percent_visits_combined'].iloc[0] - assert df_20210108_nation_combined != df_20210109_nation_combined + df_20210109_nation_covid = df_20210109['percent_visits_covid'].iloc[0] + assert df_20210108_nation_covid != df_20210109_nation_covid - df_issue_20210103 = pd.read_csv('patch_dir/issue_20210103/nssp/weekly_202040_nation_pct_ed_visits_combined.csv') - df_issue_20210103_nation_combined = df_issue_20210103['val'].iloc[0] - assert df_20210109_nation_combined == df_issue_20210103_nation_combined + df_issue_20210103 = pd.read_csv('patch_dir/issue_20210103/nssp/weekly_202040_nation_pct_ed_visits_covid.csv') + df_issue_20210103_nation_covid = df_issue_20210103['val'].iloc[0] + assert df_20210109_nation_covid == df_issue_20210103_nation_covid # Clean up the created directories after the test shutil.rmtree(mock_read_params.return_value["patch"]["patch_dir"]) \ No newline at end of file From 3ddb6dafba327b5a41d1849680c88db0a398c4d1 Mon Sep 17 00:00:00 2001 From: Delphi Deploy Bot Date: Thu, 12 Jun 2025 19:11:12 +0000 Subject: [PATCH 3/4] chore: bump covidcast-indicators to 0.3.64 --- .bumpversion.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index afb32eb67..cca846f0d 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.3.63 +current_version = 0.3.64 commit = True message = chore: bump covidcast-indicators to {new_version} tag = False From 7171ef7eb579ab71a9853d29febee7055b0912eb Mon Sep 17 00:00:00 2001 From: melange396 Date: Thu, 12 Jun 2025 19:11:13 +0000 Subject: [PATCH 4/4] [create-pull-request] automated change --- changehc/version.cfg | 2 +- claims_hosp/version.cfg | 2 +- doctor_visits/version.cfg | 2 +- google_symptoms/version.cfg | 2 +- hhs_hosp/version.cfg | 2 +- nchs_mortality/version.cfg | 2 +- nssp/version.cfg | 2 +- quidel_covidtest/version.cfg | 2 +- sir_complainsalot/version.cfg | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/changehc/version.cfg b/changehc/version.cfg index 5436c4101..7b016a2bd 100644 --- a/changehc/version.cfg +++ b/changehc/version.cfg @@ -1 +1 @@ -current_version = 0.3.63 +current_version = 0.3.64 diff --git a/claims_hosp/version.cfg b/claims_hosp/version.cfg index 5436c4101..7b016a2bd 100644 --- a/claims_hosp/version.cfg +++ b/claims_hosp/version.cfg @@ -1 +1 @@ -current_version = 0.3.63 +current_version = 0.3.64 diff --git a/doctor_visits/version.cfg b/doctor_visits/version.cfg index 5436c4101..7b016a2bd 100644 --- a/doctor_visits/version.cfg +++ b/doctor_visits/version.cfg @@ -1 +1 @@ -current_version = 0.3.63 +current_version = 0.3.64 diff --git a/google_symptoms/version.cfg b/google_symptoms/version.cfg index 5436c4101..7b016a2bd 100644 --- a/google_symptoms/version.cfg +++ b/google_symptoms/version.cfg @@ -1 +1 @@ -current_version = 0.3.63 +current_version = 0.3.64 diff --git a/hhs_hosp/version.cfg b/hhs_hosp/version.cfg index 5436c4101..7b016a2bd 100644 --- a/hhs_hosp/version.cfg +++ b/hhs_hosp/version.cfg @@ -1 +1 @@ -current_version = 0.3.63 +current_version = 0.3.64 diff --git a/nchs_mortality/version.cfg b/nchs_mortality/version.cfg index 5436c4101..7b016a2bd 100644 --- a/nchs_mortality/version.cfg +++ b/nchs_mortality/version.cfg @@ -1 +1 @@ -current_version = 0.3.63 +current_version = 0.3.64 diff --git a/nssp/version.cfg b/nssp/version.cfg index 5436c4101..7b016a2bd 100644 --- a/nssp/version.cfg +++ b/nssp/version.cfg @@ -1 +1 @@ -current_version = 0.3.63 +current_version = 0.3.64 diff --git a/quidel_covidtest/version.cfg b/quidel_covidtest/version.cfg index 5436c4101..7b016a2bd 100644 --- a/quidel_covidtest/version.cfg +++ b/quidel_covidtest/version.cfg @@ -1 +1 @@ -current_version = 0.3.63 +current_version = 0.3.64 diff --git a/sir_complainsalot/version.cfg b/sir_complainsalot/version.cfg index 5436c4101..7b016a2bd 100644 --- a/sir_complainsalot/version.cfg +++ b/sir_complainsalot/version.cfg @@ -1 +1 @@ -current_version = 0.3.63 +current_version = 0.3.64