From 981d67d52a14797615f7bbb9d116522aa391d4d3 Mon Sep 17 00:00:00 2001 From: QX Teo <37101453+qx-teo@users.noreply.github.com> Date: Tue, 12 Oct 2021 15:01:23 -0400 Subject: [PATCH 1/5] Fix GS files not transferring Added in file extension check to GS files Moved delivery params up one level so that runner can parse delievery params --- _delphi_utils_python/delphi_utils/utils.py | 4 +++- ansible/templates/google_symptoms-params-prod.json.j2 | 6 +++--- google_symptoms/params.json.template | 6 +++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/_delphi_utils_python/delphi_utils/utils.py b/_delphi_utils_python/delphi_utils/utils.py index c98ab587c..36d87a2f6 100644 --- a/_delphi_utils_python/delphi_utils/utils.py +++ b/_delphi_utils_python/delphi_utils/utils.py @@ -4,6 +4,7 @@ from shutil import copyfile, move import os import sys +import string def read_params(): """Read a file named 'params.json' in the current working directory. @@ -95,4 +96,5 @@ def transfer_files(): delivery_dir = params["delivery"].get("delivery_dir", None) files_to_export = os.listdir(export_dir) for file_name in files_to_export: - move(os.path.join(export_dir, file_name), delivery_dir) + if file_name.endswith(".csv") or file_name.endswith(".CSV"): + move(os.path.join(export_dir, file_name), delivery_dir) diff --git a/ansible/templates/google_symptoms-params-prod.json.j2 b/ansible/templates/google_symptoms-params-prod.json.j2 index 86444bb86..41fd7a641 100644 --- a/ansible/templates/google_symptoms-params-prod.json.j2 +++ b/ansible/templates/google_symptoms-params-prod.json.j2 @@ -41,9 +41,9 @@ "sum_anosmia_ageusia_smoothed_search", "anosmia_smoothed_search" ] - }, - "delivery": { - "delivery_dir": "/common/covidcast/receiving/google-symptoms" } + }, + "delivery": { + "delivery_dir": "/common/covidcast/receiving/google-symptoms" } } diff --git a/google_symptoms/params.json.template b/google_symptoms/params.json.template index 4a8d171c4..ef0c46765 100644 --- a/google_symptoms/params.json.template +++ b/google_symptoms/params.json.template @@ -31,9 +31,9 @@ "sum_anosmia_ageusia_smoothed_search", "anosmia_smoothed_search" ] - }, - "delivery": { - "delivery_dir": "./receiving" } + }, + "delivery": { + "delivery_dir": "./receiving" } } From 999ee54b02cf00f9e1a5a10b03f971dfc2567aad Mon Sep 17 00:00:00 2001 From: QX Teo <37101453+qx-teo@users.noreply.github.com> Date: Tue, 12 Oct 2021 15:07:56 -0400 Subject: [PATCH 2/5] Fix Lint --- _delphi_utils_python/delphi_utils/utils.py | 1 - 1 file changed, 1 deletion(-) diff --git a/_delphi_utils_python/delphi_utils/utils.py b/_delphi_utils_python/delphi_utils/utils.py index 36d87a2f6..0504967bf 100644 --- a/_delphi_utils_python/delphi_utils/utils.py +++ b/_delphi_utils_python/delphi_utils/utils.py @@ -4,7 +4,6 @@ from shutil import copyfile, move import os import sys -import string def read_params(): """Read a file named 'params.json' in the current working directory. From a5b40eebc4b1a1d1ec2d2e78f016f57f2f2fc0c3 Mon Sep 17 00:00:00 2001 From: Katie Mazaitis Date: Tue, 12 Oct 2021 15:57:10 -0400 Subject: [PATCH 3/5] Temporarily list all CHNG signals as "retired" --- ansible/templates/sir_complainsalot-params-prod.json.j2 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ansible/templates/sir_complainsalot-params-prod.json.j2 b/ansible/templates/sir_complainsalot-params-prod.json.j2 index 0c1724408..b442264ab 100644 --- a/ansible/templates/sir_complainsalot-params-prod.json.j2 +++ b/ansible/templates/sir_complainsalot-params-prod.json.j2 @@ -13,7 +13,8 @@ }, "chng": { "max_age": 6, - "maintainers": ["U01AP8GSWG3","U01069KCRS7"] + "maintainers": ["U01AP8GSWG3","U01069KCRS7"], + "retired-signals": ["smoothed_outpatient_covid", "smoothed_adj_outpatient_covid", "smoothed_outpatient_cli", "smoothed_adj_outpatient_cli"] }, "google-symptoms": { "max_age": 6, From af9f67912123831824f484862de85959cbdfd725 Mon Sep 17 00:00:00 2001 From: Delphi Deploy Bot Date: Tue, 12 Oct 2021 21:31:57 +0000 Subject: [PATCH 4/5] chore: bump delphi_utils to 0.1.17 --- _delphi_utils_python/.bumpversion.cfg | 2 +- _delphi_utils_python/delphi_utils/__init__.py | 2 +- _delphi_utils_python/setup.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/_delphi_utils_python/.bumpversion.cfg b/_delphi_utils_python/.bumpversion.cfg index 098e51508..adb5daeea 100644 --- a/_delphi_utils_python/.bumpversion.cfg +++ b/_delphi_utils_python/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.1.16 +current_version = 0.1.17 commit = True message = chore: bump delphi_utils to {new_version} tag = False diff --git a/_delphi_utils_python/delphi_utils/__init__.py b/_delphi_utils_python/delphi_utils/__init__.py index e79aeef36..7492383b7 100644 --- a/_delphi_utils_python/delphi_utils/__init__.py +++ b/_delphi_utils_python/delphi_utils/__init__.py @@ -14,4 +14,4 @@ from .signal import add_prefix from .nancodes import Nans -__version__ = "0.1.16" +__version__ = "0.1.17" diff --git a/_delphi_utils_python/setup.py b/_delphi_utils_python/setup.py index c9e51fe84..9b3e17e5f 100644 --- a/_delphi_utils_python/setup.py +++ b/_delphi_utils_python/setup.py @@ -25,7 +25,7 @@ setup( name="delphi_utils", - version="0.1.16", + version="0.1.17", description="Shared Utility Functions for Indicators", long_description=long_description, long_description_content_type="text/markdown", From 3beb15d6f95345ff0b373c5315255ea74f476f5d Mon Sep 17 00:00:00 2001 From: Delphi Deploy Bot Date: Tue, 12 Oct 2021 21:31:57 +0000 Subject: [PATCH 5/5] chore: bump covidcast-indicators to 0.1.25 --- .bumpversion.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index a8385e139..3eed977b9 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.1.24 +current_version = 0.1.25 commit = True message = chore: bump covidcast-indicators to {new_version} tag = False