From 6e0e2b03a06d88c42ab2c815c4c72650add88092 Mon Sep 17 00:00:00 2001 From: Dmitry Shemetov Date: Wed, 28 Jun 2023 15:27:55 -0700 Subject: [PATCH 01/23] ci: make dependabot assign reviewers --- .github/workflows/dependabot-assignments.yml | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/workflows/dependabot-assignments.yml diff --git a/.github/workflows/dependabot-assignments.yml b/.github/workflows/dependabot-assignments.yml new file mode 100644 index 000000000..5afa8c093 --- /dev/null +++ b/.github/workflows/dependabot-assignments.yml @@ -0,0 +1,17 @@ +name: Dependabot auto-assign reviewer +on: pull_request + +permissions: + pull-requests: write + +jobs: + dependabot: + runs-on: ubuntu-latest + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + if: ${{ github.actor == 'dependabot[bot]' }} + steps: + - name: Assign team to PR + run: gh pr edit "$PR_URL" --add-reviewer "cmu-delphi/code-reviewers" + env: + PR_URL: ${{github.event.pull_request.html_url}} \ No newline at end of file From 7fbb72a7c3f1716422d257f9275c7d1276fef267 Mon Sep 17 00:00:00 2001 From: lneurei1 Date: Fri, 30 Jun 2023 15:36:39 -0400 Subject: [PATCH 02/23] draft pr for header authentication --- .../delphi_utils/validator/datafetcher.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/_delphi_utils_python/delphi_utils/validator/datafetcher.py b/_delphi_utils_python/delphi_utils/validator/datafetcher.py index e214cc708..3af0b5ac2 100644 --- a/_delphi_utils_python/delphi_utils/validator/datafetcher.py +++ b/_delphi_utils_python/delphi_utils/validator/datafetcher.py @@ -12,10 +12,15 @@ import covidcast from .errors import APIDataFetchError, ValidationFailure +from .. import read_params FILENAME_REGEX = re.compile( r'^(?P\d{8})_(?P\w+?)_(?P\w+)\.csv$') +params = read_params() +assert "validation" in params +password = params["validation"]["common"]["api_credentials"] +username = "none" def make_date_filter(start_date, end_date): """ @@ -111,7 +116,8 @@ def get_geo_signal_combos(data_source): Cross references based on combinations reported available by COVIDcast metadata. """ # Maps data_source name with what's in the API, lists used in case of multiple names - meta_response = requests.get("https://api.covidcast.cmu.edu/epidata/covidcast/meta") + meta_response = requests.get("https://api.covidcast.cmu.edu/epidata/covidcast/meta", + auth=(username, password)) meta_response.raise_for_status() source_signal_mappings = {i['source']:i['db_source'] for i in meta_response.json()} @@ -139,7 +145,7 @@ def get_geo_signal_combos(data_source): elif geo_status == "unknown": epidata_signal = requests.get( "https://api.covidcast.cmu.edu/epidata/covidcast/meta", - params={'signal': f"{src}:{sig}"}) + params={'signal': f"{src}:{sig}"}, auth = (username, password)) epidata_signal.raise_for_status() # Not an active signal active_status = [val['active'] for i in epidata_signal.json() From a2af7072049e8b4b8ff027bec2dc46354763299e Mon Sep 17 00:00:00 2001 From: minhkhul Date: Tue, 11 Jul 2023 20:21:21 -0400 Subject: [PATCH 03/23] add auth --- .../delphi_utils/validator/datafetcher.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/_delphi_utils_python/delphi_utils/validator/datafetcher.py b/_delphi_utils_python/delphi_utils/validator/datafetcher.py index 3af0b5ac2..21a4bc35c 100644 --- a/_delphi_utils_python/delphi_utils/validator/datafetcher.py +++ b/_delphi_utils_python/delphi_utils/validator/datafetcher.py @@ -9,18 +9,14 @@ import requests import pandas as pd import numpy as np - +import os import covidcast from .errors import APIDataFetchError, ValidationFailure -from .. import read_params FILENAME_REGEX = re.compile( r'^(?P\d{8})_(?P\w+?)_(?P\w+)\.csv$') -params = read_params() -assert "validation" in params -password = params["validation"]["common"]["api_credentials"] -username = "none" +API_KEY = os.environ.get("COVIDCAST_INDICATORS_KEY") def make_date_filter(start_date, end_date): """ @@ -116,8 +112,7 @@ def get_geo_signal_combos(data_source): Cross references based on combinations reported available by COVIDcast metadata. """ # Maps data_source name with what's in the API, lists used in case of multiple names - meta_response = requests.get("https://api.covidcast.cmu.edu/epidata/covidcast/meta", - auth=(username, password)) + meta_response = requests.get("https://api.covidcast.cmu.edu/epidata/covidcast/meta", auth=API_KEY) meta_response.raise_for_status() source_signal_mappings = {i['source']:i['db_source'] for i in meta_response.json()} @@ -145,7 +140,7 @@ def get_geo_signal_combos(data_source): elif geo_status == "unknown": epidata_signal = requests.get( "https://api.covidcast.cmu.edu/epidata/covidcast/meta", - params={'signal': f"{src}:{sig}"}, auth = (username, password)) + params={'signal': f"{src}:{sig}"}, auth=API_KEY) epidata_signal.raise_for_status() # Not an active signal active_status = [val['active'] for i in epidata_signal.json() From 77504abeb1a19b20a29bf1c23c3a00707a8e8b92 Mon Sep 17 00:00:00 2001 From: minhkhul Date: Tue, 11 Jul 2023 21:02:00 -0400 Subject: [PATCH 04/23] add secret to ci --- .github/workflows/python-ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml index 4d376ea5b..18828d0c6 100644 --- a/.github/workflows/python-ci.yml +++ b/.github/workflows/python-ci.yml @@ -12,6 +12,8 @@ on: jobs: build: + env: + COVIDCAST_INDICATORS_KEY: ${{ secrets.COVIDCAST_INDICATORS_KEY }} runs-on: ubuntu-20.04 if: github.event.pull_request.draft == false strategy: From 1579fb7affb60bed895f96fa00116a2c447b3190 Mon Sep 17 00:00:00 2001 From: minhkhul Date: Wed, 12 Jul 2023 11:34:48 -0400 Subject: [PATCH 05/23] secret api key name changed --- .github/workflows/python-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml index 18828d0c6..061cd18e9 100644 --- a/.github/workflows/python-ci.yml +++ b/.github/workflows/python-ci.yml @@ -13,7 +13,7 @@ on: jobs: build: env: - COVIDCAST_INDICATORS_KEY: ${{ secrets.COVIDCAST_INDICATORS_KEY }} + COVIDCAST_INDICATORS_KEY: ${{ secrets.DELPHI_GITHUB_ACTIONS_EPIDATA_API_KEY }} runs-on: ubuntu-20.04 if: github.event.pull_request.draft == false strategy: From 3c66d0b56cafff10d4f733c89597209081f5ca55 Mon Sep 17 00:00:00 2001 From: minhkhul Date: Wed, 12 Jul 2023 11:50:45 -0400 Subject: [PATCH 06/23] lint --- _delphi_utils_python/delphi_utils/validator/datafetcher.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/_delphi_utils_python/delphi_utils/validator/datafetcher.py b/_delphi_utils_python/delphi_utils/validator/datafetcher.py index 21a4bc35c..78edca190 100644 --- a/_delphi_utils_python/delphi_utils/validator/datafetcher.py +++ b/_delphi_utils_python/delphi_utils/validator/datafetcher.py @@ -3,13 +3,13 @@ import re import threading +import os from os import listdir from os.path import isfile, join import warnings import requests import pandas as pd import numpy as np -import os import covidcast from .errors import APIDataFetchError, ValidationFailure @@ -112,7 +112,8 @@ def get_geo_signal_combos(data_source): Cross references based on combinations reported available by COVIDcast metadata. """ # Maps data_source name with what's in the API, lists used in case of multiple names - meta_response = requests.get("https://api.covidcast.cmu.edu/epidata/covidcast/meta", auth=API_KEY) + meta_response = requests.get("https://api.covidcast.cmu.edu/epidata/covidcast/meta", + auth=API_KEY) meta_response.raise_for_status() source_signal_mappings = {i['source']:i['db_source'] for i in meta_response.json()} From 5ab7cf6a6d127ac7ef6e1a51e23f03542f3f7c84 Mon Sep 17 00:00:00 2001 From: minhkhul Date: Wed, 12 Jul 2023 12:27:35 -0400 Subject: [PATCH 07/23] lint --- _delphi_utils_python/delphi_utils/validator/datafetcher.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_delphi_utils_python/delphi_utils/validator/datafetcher.py b/_delphi_utils_python/delphi_utils/validator/datafetcher.py index 78edca190..3ea8b347d 100644 --- a/_delphi_utils_python/delphi_utils/validator/datafetcher.py +++ b/_delphi_utils_python/delphi_utils/validator/datafetcher.py @@ -112,7 +112,7 @@ def get_geo_signal_combos(data_source): Cross references based on combinations reported available by COVIDcast metadata. """ # Maps data_source name with what's in the API, lists used in case of multiple names - meta_response = requests.get("https://api.covidcast.cmu.edu/epidata/covidcast/meta", + meta_response = requests.get("https://api.covidcast.cmu.edu/epidata/covidcast/meta", auth=API_KEY) meta_response.raise_for_status() source_signal_mappings = {i['source']:i['db_source'] for i in From e48ca92d62e3f277be016c39d8901ba5846a40e3 Mon Sep 17 00:00:00 2001 From: minhkhul Date: Wed, 12 Jul 2023 12:48:09 -0400 Subject: [PATCH 08/23] fix env location --- .github/workflows/python-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml index 061cd18e9..6a94307da 100644 --- a/.github/workflows/python-ci.yml +++ b/.github/workflows/python-ci.yml @@ -10,10 +10,11 @@ on: types: [ opened, synchronize, reopened, ready_for_review ] branches: [ main, prod ] +env: + COVIDCAST_INDICATORS_KEY: ${{ secrets.DELPHI_GITHUB_ACTIONS_EPIDATA_API_KEY }} + jobs: build: - env: - COVIDCAST_INDICATORS_KEY: ${{ secrets.DELPHI_GITHUB_ACTIONS_EPIDATA_API_KEY }} runs-on: ubuntu-20.04 if: github.event.pull_request.draft == false strategy: From c9f9d7b7cc26594aa703a5122be1b44bff61c5e3 Mon Sep 17 00:00:00 2001 From: minhkhul Date: Wed, 12 Jul 2023 15:21:52 -0400 Subject: [PATCH 09/23] fix unit test --- _delphi_utils_python/tests/validator/test_datafetcher.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_delphi_utils_python/tests/validator/test_datafetcher.py b/_delphi_utils_python/tests/validator/test_datafetcher.py index 9e74f7cce..f4ff0a1f5 100644 --- a/_delphi_utils_python/tests/validator/test_datafetcher.py +++ b/_delphi_utils_python/tests/validator/test_datafetcher.py @@ -43,7 +43,7 @@ def raise_for_status(self): if len(kwargs) == 0: return MockResponse([{'source': 'chng', 'db_source': 'chng'}, {'source': 'covid-act-now', 'db_source': 'covid-act-now'}], 200) - elif kwargs["params"] == {'signal': 'chng:inactive'}: + elif "params" in kwargs.keys() and kwargs["params"] == {'signal': 'chng:inactive'}: return MockResponse([{"signals": [{"active": False}]}], 200) else: return MockResponse([{"signals": [{"active": True}]}], 200) From fb0f932c8d5fca8978a63bd0b591bb906ec0ba93 Mon Sep 17 00:00:00 2001 From: minhkhul Date: Wed, 12 Jul 2023 19:18:32 -0400 Subject: [PATCH 10/23] fix test_get_geo_signal_combos --- _delphi_utils_python/tests/validator/test_datafetcher.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/_delphi_utils_python/tests/validator/test_datafetcher.py b/_delphi_utils_python/tests/validator/test_datafetcher.py index f4ff0a1f5..a04de6c6c 100644 --- a/_delphi_utils_python/tests/validator/test_datafetcher.py +++ b/_delphi_utils_python/tests/validator/test_datafetcher.py @@ -40,7 +40,7 @@ def json(self): def raise_for_status(self): if self.status_code != 200: raise HTTPError() - if len(kwargs) == 0: + if len(kwargs) == 0 or list(kwargs.keys())==["auth"]: return MockResponse([{'source': 'chng', 'db_source': 'chng'}, {'source': 'covid-act-now', 'db_source': 'covid-act-now'}], 200) elif "params" in kwargs.keys() and kwargs["params"] == {'signal': 'chng:inactive'}: @@ -78,7 +78,6 @@ def test_get_geo_signal_combos(self, mock_metadata, mock_get): "hrr", "msa", "msa", "state"] }) - assert set(get_geo_signal_combos("chng")) == set( [("state", "smoothed_outpatient_cli"), ("state", "smoothed_outpatient_covid"), From f528484c3e12c0942cfbcbf8ec52eb235366dc5c Mon Sep 17 00:00:00 2001 From: minhkhul Date: Wed, 12 Jul 2023 19:23:48 -0400 Subject: [PATCH 11/23] fix api_key format --- _delphi_utils_python/delphi_utils/validator/datafetcher.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_delphi_utils_python/delphi_utils/validator/datafetcher.py b/_delphi_utils_python/delphi_utils/validator/datafetcher.py index 3ea8b347d..c76c90a40 100644 --- a/_delphi_utils_python/delphi_utils/validator/datafetcher.py +++ b/_delphi_utils_python/delphi_utils/validator/datafetcher.py @@ -16,7 +16,7 @@ FILENAME_REGEX = re.compile( r'^(?P\d{8})_(?P\w+?)_(?P\w+)\.csv$') -API_KEY = os.environ.get("COVIDCAST_INDICATORS_KEY") +API_KEY = ("api_key",os.environ.get("COVIDCAST_INDICATORS_KEY")) def make_date_filter(start_date, end_date): """ From 9ccbf0aa1b3ce2f5f2278bb0badb25c37a7ed3c1 Mon Sep 17 00:00:00 2001 From: Dmitry Shemetov Date: Wed, 12 Jul 2023 18:10:30 -0700 Subject: [PATCH 12/23] bug(ci): fix dependabot reviewer assignment --- .github/workflows/dependabot-assignments.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dependabot-assignments.yml b/.github/workflows/dependabot-assignments.yml index 5afa8c093..97bbd061e 100644 --- a/.github/workflows/dependabot-assignments.yml +++ b/.github/workflows/dependabot-assignments.yml @@ -8,7 +8,7 @@ jobs: dependabot: runs-on: ubuntu-latest env: - GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + GH_TOKEN: ${{ secrets.CMU_DELPHI_AUTOMATION_MACHINE_DEPENDABOT_PAT }} if: ${{ github.actor == 'dependabot[bot]' }} steps: - name: Assign team to PR From 7158ff9300308637d1fa4955423815a385fbce6a Mon Sep 17 00:00:00 2001 From: minhkhul <118945681+minhkhul@users.noreply.github.com> Date: Thu, 13 Jul 2023 13:20:30 -0400 Subject: [PATCH 13/23] Update _delphi_utils_python/tests/validator/test_datafetcher.py Co-authored-by: melange396 --- _delphi_utils_python/tests/validator/test_datafetcher.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_delphi_utils_python/tests/validator/test_datafetcher.py b/_delphi_utils_python/tests/validator/test_datafetcher.py index a04de6c6c..2d8a4e1c1 100644 --- a/_delphi_utils_python/tests/validator/test_datafetcher.py +++ b/_delphi_utils_python/tests/validator/test_datafetcher.py @@ -43,7 +43,7 @@ def raise_for_status(self): if len(kwargs) == 0 or list(kwargs.keys())==["auth"]: return MockResponse([{'source': 'chng', 'db_source': 'chng'}, {'source': 'covid-act-now', 'db_source': 'covid-act-now'}], 200) - elif "params" in kwargs.keys() and kwargs["params"] == {'signal': 'chng:inactive'}: + elif "params" in kwargs and kwargs["params"] == {'signal': 'chng:inactive'}: return MockResponse([{"signals": [{"active": False}]}], 200) else: return MockResponse([{"signals": [{"active": True}]}], 200) From c24f67e15c1b00c4488285438cd81abf482314bd Mon Sep 17 00:00:00 2001 From: minhkhul <118945681+minhkhul@users.noreply.github.com> Date: Thu, 13 Jul 2023 13:21:34 -0400 Subject: [PATCH 14/23] Update _delphi_utils_python/delphi_utils/validator/datafetcher.py Co-authored-by: melange396 --- _delphi_utils_python/delphi_utils/validator/datafetcher.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_delphi_utils_python/delphi_utils/validator/datafetcher.py b/_delphi_utils_python/delphi_utils/validator/datafetcher.py index c76c90a40..c12279990 100644 --- a/_delphi_utils_python/delphi_utils/validator/datafetcher.py +++ b/_delphi_utils_python/delphi_utils/validator/datafetcher.py @@ -16,7 +16,7 @@ FILENAME_REGEX = re.compile( r'^(?P\d{8})_(?P\w+?)_(?P\w+)\.csv$') -API_KEY = ("api_key",os.environ.get("COVIDCAST_INDICATORS_KEY")) +API_KEY = ("epidata", os.environ.get("COVIDCAST_INDICATORS_KEY")) def make_date_filter(start_date, end_date): """ From 2e4e06baf9550804622865fcfe72a135d1dafb74 Mon Sep 17 00:00:00 2001 From: minhkhul Date: Thu, 13 Jul 2023 15:10:21 -0400 Subject: [PATCH 15/23] remove env --- .github/workflows/python-ci.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/python-ci.yml b/.github/workflows/python-ci.yml index 6a94307da..4d376ea5b 100644 --- a/.github/workflows/python-ci.yml +++ b/.github/workflows/python-ci.yml @@ -10,9 +10,6 @@ on: types: [ opened, synchronize, reopened, ready_for_review ] branches: [ main, prod ] -env: - COVIDCAST_INDICATORS_KEY: ${{ secrets.DELPHI_GITHUB_ACTIONS_EPIDATA_API_KEY }} - jobs: build: runs-on: ubuntu-20.04 From 51dd68f20c17f97e0bbbe4556bbdc5c64dfac807 Mon Sep 17 00:00:00 2001 From: minhkhul Date: Thu, 13 Jul 2023 15:17:31 -0400 Subject: [PATCH 16/23] correct api_key location to be params.json --- _delphi_utils_python/delphi_utils/validator/datafetcher.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/_delphi_utils_python/delphi_utils/validator/datafetcher.py b/_delphi_utils_python/delphi_utils/validator/datafetcher.py index c12279990..3f93134dd 100644 --- a/_delphi_utils_python/delphi_utils/validator/datafetcher.py +++ b/_delphi_utils_python/delphi_utils/validator/datafetcher.py @@ -11,12 +11,15 @@ import pandas as pd import numpy as np import covidcast +from .. import read_params from .errors import APIDataFetchError, ValidationFailure FILENAME_REGEX = re.compile( r'^(?P\d{8})_(?P\w+?)_(?P\w+)\.csv$') -API_KEY = ("epidata", os.environ.get("COVIDCAST_INDICATORS_KEY")) +params = read_params() +assert "validation" in params +API_KEY = ("epidata", params["validation"]["common"]["api_credentials"]) def make_date_filter(start_date, end_date): """ From 3ecdd642c4c0c70ce7d2516df2409bc0056a924c Mon Sep 17 00:00:00 2001 From: minhkhul Date: Thu, 13 Jul 2023 15:22:16 -0400 Subject: [PATCH 17/23] lint --- _delphi_utils_python/delphi_utils/validator/datafetcher.py | 1 - 1 file changed, 1 deletion(-) diff --git a/_delphi_utils_python/delphi_utils/validator/datafetcher.py b/_delphi_utils_python/delphi_utils/validator/datafetcher.py index 3f93134dd..5f5678cdb 100644 --- a/_delphi_utils_python/delphi_utils/validator/datafetcher.py +++ b/_delphi_utils_python/delphi_utils/validator/datafetcher.py @@ -3,7 +3,6 @@ import re import threading -import os from os import listdir from os.path import isfile, join import warnings From 51dd3d8f68788c35b3c12f670a392fddbefcae0f Mon Sep 17 00:00:00 2001 From: minhkhul Date: Thu, 13 Jul 2023 17:49:18 -0400 Subject: [PATCH 18/23] add fake key to test --- _delphi_utils_python/tests/params.json.template | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/_delphi_utils_python/tests/params.json.template b/_delphi_utils_python/tests/params.json.template index ee17a288c..5e20cf574 100644 --- a/_delphi_utils_python/tests/params.json.template +++ b/_delphi_utils_python/tests/params.json.template @@ -1,3 +1,8 @@ { - "test": "yes" + "test": "yes", + "validation": { + "common": { + "api_credentials": "fake_key" + } + } } From 3c989f64cacea9be6f923967b981841c35f74915 Mon Sep 17 00:00:00 2001 From: minhkhul Date: Thu, 13 Jul 2023 17:57:50 -0400 Subject: [PATCH 19/23] some re-organizing of code for readability --- .../delphi_utils/validator/datafetcher.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/_delphi_utils_python/delphi_utils/validator/datafetcher.py b/_delphi_utils_python/delphi_utils/validator/datafetcher.py index 5f5678cdb..fde60b135 100644 --- a/_delphi_utils_python/delphi_utils/validator/datafetcher.py +++ b/_delphi_utils_python/delphi_utils/validator/datafetcher.py @@ -16,10 +16,6 @@ FILENAME_REGEX = re.compile( r'^(?P\d{8})_(?P\w+?)_(?P\w+)\.csv$') -params = read_params() -assert "validation" in params -API_KEY = ("epidata", params["validation"]["common"]["api_credentials"]) - def make_date_filter(start_date, end_date): """ Create a function to filter dates in the specified date range (inclusive). @@ -113,9 +109,14 @@ def get_geo_signal_combos(data_source): Cross references based on combinations reported available by COVIDcast metadata. """ + + params = read_params() + assert "validation" in params + api_key = ("epidata", params["validation"]["common"]["api_credentials"]) + # Maps data_source name with what's in the API, lists used in case of multiple names meta_response = requests.get("https://api.covidcast.cmu.edu/epidata/covidcast/meta", - auth=API_KEY) + auth=api_key) meta_response.raise_for_status() source_signal_mappings = {i['source']:i['db_source'] for i in meta_response.json()} @@ -143,7 +144,7 @@ def get_geo_signal_combos(data_source): elif geo_status == "unknown": epidata_signal = requests.get( "https://api.covidcast.cmu.edu/epidata/covidcast/meta", - params={'signal': f"{src}:{sig}"}, auth=API_KEY) + params={'signal': f"{src}:{sig}"}, auth=api_key) epidata_signal.raise_for_status() # Not an active signal active_status = [val['active'] for i in epidata_signal.json() From edd6dbd0c88bf5b87af2151b49bad6108703bce3 Mon Sep 17 00:00:00 2001 From: minhkhul Date: Thu, 13 Jul 2023 18:19:17 -0400 Subject: [PATCH 20/23] lint --- _delphi_utils_python/delphi_utils/validator/datafetcher.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/_delphi_utils_python/delphi_utils/validator/datafetcher.py b/_delphi_utils_python/delphi_utils/validator/datafetcher.py index fde60b135..9e302d822 100644 --- a/_delphi_utils_python/delphi_utils/validator/datafetcher.py +++ b/_delphi_utils_python/delphi_utils/validator/datafetcher.py @@ -109,11 +109,9 @@ def get_geo_signal_combos(data_source): Cross references based on combinations reported available by COVIDcast metadata. """ - params = read_params() assert "validation" in params api_key = ("epidata", params["validation"]["common"]["api_credentials"]) - # Maps data_source name with what's in the API, lists used in case of multiple names meta_response = requests.get("https://api.covidcast.cmu.edu/epidata/covidcast/meta", auth=api_key) From 7d0db2116be9e97f17302f49ebc3fc8a6e4d0be5 Mon Sep 17 00:00:00 2001 From: Delphi Deploy Bot Date: Wed, 19 Jul 2023 19:06:02 +0000 Subject: [PATCH 21/23] chore: bump delphi_utils to 0.3.18 --- _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 717385689..a54d86d02 100644 --- a/_delphi_utils_python/.bumpversion.cfg +++ b/_delphi_utils_python/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.3.17 +current_version = 0.3.18 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 28bc48331..00259dc5a 100644 --- a/_delphi_utils_python/delphi_utils/__init__.py +++ b/_delphi_utils_python/delphi_utils/__init__.py @@ -15,4 +15,4 @@ from .nancodes import Nans from .weekday import Weekday -__version__ = "0.3.17" +__version__ = "0.3.18" diff --git a/_delphi_utils_python/setup.py b/_delphi_utils_python/setup.py index 224046e31..1668a34f6 100644 --- a/_delphi_utils_python/setup.py +++ b/_delphi_utils_python/setup.py @@ -27,7 +27,7 @@ setup( name="delphi_utils", - version="0.3.17", + version="0.3.18", description="Shared Utility Functions for Indicators", long_description=long_description, long_description_content_type="text/markdown", From 721f671126749e51fbd5830e9b8bc32ef1d54541 Mon Sep 17 00:00:00 2001 From: Delphi Deploy Bot Date: Wed, 19 Jul 2023 19:06:02 +0000 Subject: [PATCH 22/23] chore: bump covidcast-indicators to 0.3.43 --- .bumpversion.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 90d21efae..8b614a846 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.3.42 +current_version = 0.3.43 commit = True message = chore: bump covidcast-indicators to {new_version} tag = False From 2cb16dff8efef99023d89454caf3edfb07ac5d53 Mon Sep 17 00:00:00 2001 From: dshemetov Date: Wed, 19 Jul 2023 19:06:04 +0000 Subject: [PATCH 23/23] [create-pull-request] automated change --- changehc/version.cfg | 2 +- claims_hosp/version.cfg | 2 +- doctor_visits/version.cfg | 2 +- dsew_community_profile/version.cfg | 2 +- google_symptoms/version.cfg | 2 +- hhs_hosp/version.cfg | 2 +- nchs_mortality/version.cfg | 2 +- nowcast/version.cfg | 2 +- quidel_covidtest/version.cfg | 2 +- sir_complainsalot/version.cfg | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/changehc/version.cfg b/changehc/version.cfg index ae19058ed..8d2332969 100644 --- a/changehc/version.cfg +++ b/changehc/version.cfg @@ -1 +1 @@ -current_version = 0.3.42 +current_version = 0.3.43 diff --git a/claims_hosp/version.cfg b/claims_hosp/version.cfg index ae19058ed..8d2332969 100644 --- a/claims_hosp/version.cfg +++ b/claims_hosp/version.cfg @@ -1 +1 @@ -current_version = 0.3.42 +current_version = 0.3.43 diff --git a/doctor_visits/version.cfg b/doctor_visits/version.cfg index ae19058ed..8d2332969 100644 --- a/doctor_visits/version.cfg +++ b/doctor_visits/version.cfg @@ -1 +1 @@ -current_version = 0.3.42 +current_version = 0.3.43 diff --git a/dsew_community_profile/version.cfg b/dsew_community_profile/version.cfg index ae19058ed..8d2332969 100644 --- a/dsew_community_profile/version.cfg +++ b/dsew_community_profile/version.cfg @@ -1 +1 @@ -current_version = 0.3.42 +current_version = 0.3.43 diff --git a/google_symptoms/version.cfg b/google_symptoms/version.cfg index ae19058ed..8d2332969 100644 --- a/google_symptoms/version.cfg +++ b/google_symptoms/version.cfg @@ -1 +1 @@ -current_version = 0.3.42 +current_version = 0.3.43 diff --git a/hhs_hosp/version.cfg b/hhs_hosp/version.cfg index ae19058ed..8d2332969 100644 --- a/hhs_hosp/version.cfg +++ b/hhs_hosp/version.cfg @@ -1 +1 @@ -current_version = 0.3.42 +current_version = 0.3.43 diff --git a/nchs_mortality/version.cfg b/nchs_mortality/version.cfg index ae19058ed..8d2332969 100644 --- a/nchs_mortality/version.cfg +++ b/nchs_mortality/version.cfg @@ -1 +1 @@ -current_version = 0.3.42 +current_version = 0.3.43 diff --git a/nowcast/version.cfg b/nowcast/version.cfg index ae19058ed..8d2332969 100644 --- a/nowcast/version.cfg +++ b/nowcast/version.cfg @@ -1 +1 @@ -current_version = 0.3.42 +current_version = 0.3.43 diff --git a/quidel_covidtest/version.cfg b/quidel_covidtest/version.cfg index ae19058ed..8d2332969 100644 --- a/quidel_covidtest/version.cfg +++ b/quidel_covidtest/version.cfg @@ -1 +1 @@ -current_version = 0.3.42 +current_version = 0.3.43 diff --git a/sir_complainsalot/version.cfg b/sir_complainsalot/version.cfg index ae19058ed..8d2332969 100644 --- a/sir_complainsalot/version.cfg +++ b/sir_complainsalot/version.cfg @@ -1 +1 @@ -current_version = 0.3.42 +current_version = 0.3.43