cleanup

Author: gsheni

pymetrics/anaconda.py

@@ -2,8 +2,7 @@
 
 import logging
 import os
-from datetime import datetime, timedelta
-from zoneinfo import ZoneInfo
+from datetime import timedelta
 
 import pandas as pd
 import requests
@@ -168,7 +167,7 @@ def collect_anaconda_downloads(
     previous = _get_previous_anaconda_downloads(output_folder, filename=PREVIOUS_ANACONDA_FILENAME)
     previous = previous.sort_values(TIME_COLUMN)
 
-    end_date = datetime.now(tz=ZoneInfo('UTC')).date()
+    end_date = get_current_utc().date()
     start_date = end_date - timedelta(days=max_days)
     LOGGER.info(f'Getting daily anaconda data for start_date>={start_date} to end_date<{end_date}')
     date_ranges = pd.date_range(start=start_date, end=end_date, freq='D')

pymetrics/pypi.py

@@ -1,11 +1,12 @@
 """Functions to get PyPI downloads from Google Big Query."""
 
 import logging
-from datetime import datetime, timedelta, timezone
+from datetime import timedelta
 
 import pandas as pd
 
 from pymetrics.bq import run_query
+from pymetrics.time_utils import get_current_utc
 
 LOGGER = logging.getLogger(__name__)
 
@@ -69,7 +70,7 @@ def _get_query(projects, start_date, end_date):
 
 
 def _get_query_dates(start_date, min_date, max_date, max_days, force=False):
-    end_date = datetime.now(timezone.utc).date()
+    end_date = get_current_utc().date()
     if start_date is None:
         start_date = end_date - timedelta(days=max_days)