hhs whitespace

Author: krivard

hhs_hosp/delphi_hhs/run.py

@@ -103,7 +103,7 @@ def run_module(params):
                                     "state_code",
                                     from_col="state")
         if sensor.endswith("_prop"):
-            df=pop_proportion(df,geo_mapper)
+            df=pop_proportion(df, geo_mapper)
         df = make_geo(df, geo, geo_mapper)
         df = smooth_values(df, smoother[0])
         if df.empty:
@@ -142,7 +142,7 @@ def smooth_values(df, smoother):
 def pop_proportion(df,geo_mapper):
     """Get the population-proportionate variants as the dataframe val."""
     pop_val=geo_mapper.add_population_column(df, "state_code")
-    df["val"]=round(df["val"]/pop_val["population"]*100000,7)
+    df["val"]=round(df["val"]/pop_val["population"]*100000, 7)
     pop_val.drop("population", axis=1, inplace=True)
     return df
 

hhs_hosp/tests/test_run.py

@@ -6,7 +6,7 @@
 
 from delphi_hhs.run import _date_to_int, int_date_to_previous_day_datetime, generate_date_ranges, \
     make_signal, make_geo, run_module, pop_proportion
-from delphi_hhs.constants import CONFIRMED, SUM_CONF_SUSP, SMOOTHERS, GEOS, SIGNALS,CONFIRMED_PROP, SUM_CONF_SUSP_PROP
+from delphi_hhs.constants import CONFIRMED, SUM_CONF_SUSP, SMOOTHERS, GEOS, SIGNALS, CONFIRMED_PROP, SUM_CONF_SUSP_PROP
 from delphi_utils.geomap import GeoMapper
 from freezegun import freeze_time
 import numpy as np
@@ -83,29 +83,29 @@ def test_pop_proportion():
     geo_mapper = GeoMapper()
     test_df = pd.DataFrame({  
         'state': ['PA'],
-        'state_code':[42],
+        'state_code': [42],
         'timestamp': [datetime(year=2020, month=1, day=1)],
         'val': [15.],})
     pd.testing.assert_frame_equal(
-        pop_proportion(test_df,geo_mapper),
+        pop_proportion(test_df, geo_mapper),
         pd.DataFrame({
             'state': ['PA'],
-            'state_code':[42],
+            'state_code': [42],
             'timestamp': [datetime(year=2020, month=1, day=1)],
             'val': [0.1171693],})
     )
 
     test_df= pd.DataFrame({  
         'state': ['WV'],
-        'state_code':[54],
+        'state_code': [54],
         'timestamp': [datetime(year=2020, month=1, day=1)],
         'val': [150.],})
 
     pd.testing.assert_frame_equal(
-        pop_proportion(test_df,geo_mapper),
+        pop_proportion(test_df, geo_mapper),
         pd.DataFrame({
             'state': ['WV'],
-            'state_code':[54],
+            'state_code': [54],
             'timestamp': [datetime(year=2020, month=1, day=1)],
             'val': [8.3698491],})
     )