Merge pull request #516 from sgsmob/archive

Migrate quidel to use delphi_utils.create_export_csv

Author: krivard

quidel/delphi_quidel/__init__.py

@@ -11,6 +11,5 @@
 from . import geo_maps
 from . import data_tools
 from . import generate_sensor
-from . import export
 from . import pull
 from . import run

quidel/delphi_quidel/export.py

@@ -7,14 +7,13 @@
 from os.path import join
 
 import pandas as pd
-from delphi_utils import read_params, add_prefix
+from delphi_utils import read_params, add_prefix, create_export_csv
 
 from .geo_maps import geo_map
 from .pull import (pull_quidel_data,
                    check_export_start_date,
                    check_export_end_date,
                    update_cache_file)
-from .export import export_csv
 from .generate_sensor import (generate_sensor_for_states,
                               generate_sensor_for_other_geores)
 from .constants import (END_FROM_TODAY_MINUS, EXPORT_DAY_RANGE,
@@ -61,9 +60,9 @@ def run_module():
             state_groups, smooth=SENSORS[sensor][1],
             device=SENSORS[sensor][0], first_date=first_date,
             last_date=last_date)
-        export_csv(state_df, "state", sensor, receiving_dir=export_dir,
-                   start_date=export_start_dates[test_type],
-                   end_date=export_end_dates[test_type])
+        create_export_csv(state_df, geo_res="state", sensor=sensor, export_dir=export_dir,
+                          start_date=export_start_dates[test_type],
+                          end_date=export_end_dates[test_type])
 
         # County/HRR/MSA level
         for geo_res in GEO_RESOLUTIONS:
@@ -74,9 +73,10 @@ def run_module():
                 state_groups, data, res_key, smooth=SENSORS[sensor][1],
                 device=SENSORS[sensor][0], first_date=first_date,
                 last_date=last_date)
-            export_csv(res_df, geo_res, sensor, receiving_dir=export_dir,
-                       start_date=export_start_dates[test_type],
-                       end_date=export_end_dates[test_type])
+            create_export_csv(res_df, geo_res=geo_res, sensor=sensor, export_dir=export_dir,
+                              start_date=export_start_dates[test_type],
+                              end_date=export_end_dates[test_type],
+                              remove_null_samples=True)
 
     # Export the cache file if the pipeline runs successfully.
     # Otherwise, don't update the cache file