fix dry run

Author: gsheni

download_analytics/main.py

@@ -2,11 +2,10 @@
 
 import logging
 
-import pandas as pd
-
 from download_analytics.metrics import compute_metrics
-from download_analytics.output import create_csv, get_path, load_csv
+from download_analytics.output import create_csv, get_path
 from download_analytics.pypi import get_pypi_downloads
+from download_analytics.summarize import get_previous_pypi_downloads
 
 LOGGER = logging.getLogger(__name__)
 
@@ -49,27 +48,28 @@ def collect_downloads(
     if not projects:
         raise ValueError('No projects have been passed')
 
-    LOGGER.info(f'Collecting downloads for projects={projects}')
+    LOGGER.info(f'Collecting new downloads for projects={projects}')
 
     csv_path = get_path(output_folder, 'pypi.csv')
-    read_csv_kwargs = {
-        'parse_dates': ['timestamp'],
-        'dtype': {
-            'country_code': pd.CategoricalDtype(),
-            'project': pd.CategoricalDtype(),
-            'version': pd.CategoricalDtype(),
-            'type': pd.CategoricalDtype(),
-            'installer_name': pd.CategoricalDtype(),
-            'implementation_name': pd.CategoricalDtype(),
-            'implementation_version': pd.CategoricalDtype(),
-            'distro_name': pd.CategoricalDtype(),
-            'distro_version': pd.CategoricalDtype(),
-            'system_name': pd.CategoricalDtype(),
-            'system_release': pd.CategoricalDtype(),
-            'cpu': pd.CategoricalDtype(),
-        },
-    }
-    previous = load_csv(csv_path, dry_run=dry_run, read_csv_kwargs=read_csv_kwargs)
+    # read_csv_kwargs = {
+    #     'parse_dates': ['timestamp'],
+    #     'dtype': {
+    #         'country_code': pd.CategoricalDtype(),
+    #         'project': pd.CategoricalDtype(),
+    #         'version': pd.CategoricalDtype(),
+    #         'type': pd.CategoricalDtype(),
+    #         'installer_name': pd.CategoricalDtype(),
+    #         'implementation_name': pd.CategoricalDtype(),
+    #         'implementation_version': pd.CategoricalDtype(),
+    #         'distro_name': pd.CategoricalDtype(),
+    #         'distro_version': pd.CategoricalDtype(),
+    #         'system_name': pd.CategoricalDtype(),
+    #         'system_release': pd.CategoricalDtype(),
+    #         'cpu': pd.CategoricalDtype(),
+    #     },
+    # }
+    previous = get_previous_pypi_downloads(input_file=None, output_folder=output_folder)
+    # previous = load_csv(csv_path, read_csv_kwargs=read_csv_kwargs)
 
     pypi_downloads = get_pypi_downloads(
         projects=projects,

download_analytics/summarize.py

@@ -76,7 +76,7 @@ def _sum_counts(base_count, dep_to_count, parent_to_count):
     return base_count + sum(parent_to_count.values()) + sum(dep_to_count.values())
 
 
-def get_previous_pypi_downloads(input_file, output_folder, dry_run):
+def get_previous_pypi_downloads(input_file, output_folder):
     """Read pypi.csv and return a DataFrame of the downloads."""
     csv_path = input_file or get_path(output_folder, 'pypi.csv')
     read_csv_kwargs = {
@@ -212,7 +212,7 @@ def summarize_downloads(
             `gdrive://{folder_id}`.
 
     """
-    downloads = get_previous_pypi_downloads(input_file, output_folder, dry_run)
+    downloads = get_previous_pypi_downloads(input_file, output_folder)
 
     vendor_df = pd.DataFrame.from_records(vendors)
     all_df = _create_all_df()