refactor: bundle covidcast==0.2.2 in delphi_utils

_delphi_utils_python/delphi_utils/validator/datafetcher.py

@@ -3,13 +3,15 @@
 
 import re
 import threading
+import warnings
 from os import listdir
 from os.path import isfile, join
-import warnings
-import requests
-import pandas as pd
+
 import numpy as np
-import covidcast
+import pandas as pd
+import requests
+
+from .. import covidcast_port as covidcast
 from .errors import APIDataFetchError, ValidationFailure
 
 FILENAME_REGEX = re.compile(

_delphi_utils_python/delphi_utils/validator/dynamic.py

@@ -1,14 +1,17 @@
 """Dynamic file checks."""
+
+import re
 from dataclasses import dataclass
 from datetime import date, timedelta
 from typing import Dict, Set
-import re
-import pandas as pd
+
 import numpy as np
-import covidcast
-from .errors import ValidationFailure
+import pandas as pd
+
+from .. import covidcast_port as covidcast
 from .datafetcher import get_geo_signal_combos, threaded_api_calls
-from .utils import relative_difference_by_min, TimeWindow, lag_converter
+from .errors import ValidationFailure
+from .utils import TimeWindow, lag_converter, relative_difference_by_min
 
 
 class DynamicValidator:

_delphi_utils_python/delphi_utils/validator/run.py

@@ -5,8 +5,9 @@
 when the module is run with `python -m delphi_utils.validator`.
 """
 import argparse as ap
-import covidcast
-from .. import read_params, get_structured_logger
+
+from .. import covidcast_port as covidcast
+from .. import get_structured_logger, read_params
 from .validate import Validator
 
 

_delphi_utils_python/setup.py

@@ -6,9 +6,9 @@
 
 required = [
     "boto3",
-    "covidcast",
     "cvxpy",
     "darker[isort]~=2.1.1",
+    "delphi-epidata==4.1.20",
     "epiweeks",
     "freezegun",
     "gitpython",

_delphi_utils_python/tests/validator/test_datafetcher.py

@@ -48,7 +48,7 @@ def raise_for_status(self):
         else:
             return MockResponse([{"signals": [{"active": True}]}], 200)
 
-    # the `kw` approach is needed here because otherwise pytest thinks the 
+    # the `kw` approach is needed here because otherwise pytest thinks the
     # requests_mock arg is supposed to be a fixture
     @requests_mock.Mocker(kw="mock_requests")
     def test_bad_api_key(self, **kwargs):
@@ -57,7 +57,7 @@ def test_bad_api_key(self, **kwargs):
             get_geo_signal_combos("chng", api_key="")
 
     @mock.patch('requests.get', side_effect=mocked_requests_get)
-    @mock.patch("covidcast.metadata")
+    @mock.patch("delphi_utils.covidcast_port.metadata")
     def test_get_geo_signal_combos(self, mock_metadata, mock_get):
         """Test that the geo signal combos are correctly pulled from the covidcast metadata."""
         # Need to use actual data_source and signal names since we reference the API
@@ -87,7 +87,7 @@ def test_get_geo_signal_combos(self, mock_metadata, mock_get):
              ("msa", "pcr_specimen_positivity_rate"),
              ("msa", "pcr_specimen_total_tests")])
 
-    @mock.patch("covidcast.signal")
+    @mock.patch("delphi_utils.covidcast_port.signal")
     def test_threaded_api_calls(self, mock_signal):
         """Test that calls to the covidcast API are made."""
 

google_symptoms/delphi_google_symptoms/run.py

@@ -5,20 +5,16 @@
 when the module is run with `python -m delphi_google_symptoms`.
 """
 import time
-from datetime import datetime, date
+from datetime import date, datetime
 from itertools import product
-import covidcast
 
+import delphi_utils.covidcast_port as covidcast
 import numpy as np
-from pandas import to_datetime
-from delphi_utils import (
-    create_export_csv,
-    get_structured_logger
-)
+from delphi_utils import create_export_csv, get_structured_logger
 from delphi_utils.validator.utils import lag_converter
+from pandas import to_datetime
 
-from .constants import (COMBINED_METRIC,
-                        GEO_RESOLUTIONS, SMOOTHERS, SMOOTHERS_MAP)
+from .constants import COMBINED_METRIC, GEO_RESOLUTIONS, SMOOTHERS, SMOOTHERS_MAP
 from .geo import geo_map
 from .pull import pull_gs_data
 

sir_complainsalot/delphi_sir_complainsalot/check_source.py

@@ -4,10 +4,10 @@
 from datetime import datetime, timedelta
 from typing import List
 
-import covidcast
+import delphi_utils.covidcast_port as covidcast
 import pandas as pd
 
-covidcast.covidcast._ASYNC_CALL = True  # pylint: disable=protected-access
+covidcast._ASYNC_CALL = True  # pylint: disable=protected-access
 
 @dataclass
 class Complaint:

sir_complainsalot/delphi_sir_complainsalot/run.py

@@ -8,7 +8,7 @@
 import time
 from itertools import groupby
 
-import covidcast
+import delphi_utils.covidcast_port as covidcast
 from delphi_utils import SlackNotifier
 from delphi_utils import get_structured_logger
 from delphi_utils import read_params

testing_utils/indicator_validation.py

@@ -2,7 +2,7 @@
 from os.path import isfile, join, basename
 from datetime import datetime
 
-import covidcast
+import delphi_utils.covidcast_port as covidcast
 from joblib import Memory
 import nest_asyncio
 from numpy.core.numeric import NaN