Skip to content

Commit 5994794

Browse files
committed
Apply suggestions from review
1 parent 6da3598 commit 5994794

File tree

1 file changed

+7
-9
lines changed
  • combo_cases_and_deaths/delphi_combo_cases_and_deaths

1 file changed

+7
-9
lines changed

combo_cases_and_deaths/delphi_combo_cases_and_deaths/run.py

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
from .handle_wip_signal import add_prefix
1919

2020

21-
def check_not_none(data_frame, label, date_range):
22-
"""Exit gracefully if a data frame we attempted to retrieve is empty"""
21+
def check_none_data_frame(data_frame, label, date_range):
22+
"""Log and return True when a data frame is None."""
2323
if data_frame is None:
24-
print(f"{label} not available in range {date_range}")
25-
return False
26-
return True
24+
print(f"{label} completely unavailable in range {date_range}")
25+
return True
26+
return False
2727

2828
def maybe_append(df1, df2):
2929
"""
@@ -50,9 +50,9 @@ def combine_usafacts_and_jhu(signal, geo, date_range, fetcher=covidcast.signal):
5050
print("Fetching jhu-csse...")
5151
jhu_df = fetcher("jhu-csse", signal, date_range[0], date_range[1], geo)
5252

53-
if (not check_not_none(usafacts_df, "USA-FACTS", date_range)) and \
53+
if check_none_data_frame(usafacts_df, "USA-FACTS", date_range) and \
5454
(geo not in ('state', 'county') or \
55-
(not check_not_none(jhu_df, "JHU", date_range))):
55+
check_none_data_frame(jhu_df, "JHU", date_range)):
5656
return pd.DataFrame({}, columns=COLUMN_MAPPING.values())
5757

5858
# State level
@@ -161,8 +161,6 @@ def run_module():
161161
params = configure(variants)
162162
for metric, geo_res, sensor_name, signal in variants:
163163
df = combine_usafacts_and_jhu(signal, geo_res, extend_raw_date_range(params, sensor_name)) # pylint: disable=invalid-name
164-
165-
df = df.copy() # pylint: disable=invalid-name
166164
df["timestamp"] = pd.to_datetime(df["timestamp"])
167165
start_date = pd.to_datetime(params['export_start_date'])
168166
export_dir = params["export_dir"]

0 commit comments

Comments
 (0)