Remove unnecessary usage of pytz

Signed-off-by: Leandro Lucarella <[email protected]>

Author: llucax

src/frequenz/sdk/power_distribution/power_distributor.py

@@ -9,9 +9,9 @@
 MIT
 """
 import asyncio
-import datetime as dt
 import logging
 from asyncio.tasks import ALL_COMPLETED
+from datetime import datetime, timezone
 from typing import (  # pylint: disable=unused-import
     Any,
     Dict,
@@ -24,7 +24,6 @@
 )
 
 import grpc
-import pytz
 from frequenz.channels import BidirectionalHandle, Peekable, Receiver
 from google.protobuf.empty_pb2 import Empty  # pylint: disable=no-name-in-module
 
@@ -528,7 +527,7 @@ def _is_component_data_valid(
             )
             return False
 
-        now = dt.datetime.now(tz=pytz.UTC)
+        now = datetime.now(timezone.utc)
         time_delta = now - component_data.timestamp
         if time_delta.total_seconds() > self.component_data_timeout_sec:
             _logger.warning(

src/frequenz/sdk/timeseries/resampler.py

@@ -10,11 +10,9 @@
 
 import logging
 from collections import deque
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from typing import Callable, Deque, Dict, Generator, Optional, Sequence, Tuple
 
-import pytz
-
 from ..data_pipeline import Sample
 
 logger = logging.Logger(__name__)
@@ -88,7 +86,7 @@ def resample(self) -> Optional[float]:
         """
         # It might be better to provide `now` from the outside so that all
         # individual resamplers use the same `now`
-        now = datetime.now(tz=pytz.UTC)
+        now = datetime.now(timezone.utc)
         threshold = now - timedelta(
             seconds=self._max_data_age_in_periods * self._resampling_period_s
         )
@@ -182,6 +180,6 @@ def resample(self) -> Generator[Tuple[str, Sample], None, None]:
         Yields:
             iterator of time series ids and their newly resampled samples
         """
-        now = datetime.now(tz=pytz.UTC)
+        now = datetime.now(timezone.utc)
         for time_series_id, resampler in self._resamplers.items():
             yield time_series_id, Sample(timestamp=now, value=resampler.resample())

tests/timeseries/test_resampling.py

@@ -8,10 +8,9 @@
 MIT
 """
 
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from typing import Sequence
 
-import pytz
 import time_machine
 
 from frequenz.sdk.data_pipeline import Sample
@@ -51,7 +50,7 @@ def test_component_metric_resampler_remove_outdated_samples() -> None:
         resampling_function=resampling_function_sum,
     )
 
-    timestamp = datetime.now(tz=pytz.UTC)
+    timestamp = datetime.now(timezone.utc)
     sample1 = Sample(timestamp, value=5.0)
     sample2 = Sample(timestamp + timedelta(seconds=1), value=12.0)
     resampler.add_sample(sample1)
@@ -73,7 +72,7 @@ def test_component_metric_resampler_resample() -> None:
         resampling_function=resampling_function_sum,
     )
 
-    timestamp = datetime.now(tz=pytz.UTC) - timedelta(seconds=0.5)
+    timestamp = datetime.now(timezone.utc) - timedelta(seconds=0.5)
 
     value1 = 5.0
     value2 = 15.0
@@ -98,7 +97,7 @@ def test_component_metric_resampler_resample_with_outdated_samples() -> None:
         resampling_function=resampling_function_sum,
     )
 
-    timestamp = datetime.now(tz=pytz.UTC)
+    timestamp = datetime.now(timezone.utc)
 
     value3 = 100.0
     value1 = 5.0
@@ -132,7 +131,7 @@ def test_component_metric_group_resampler() -> None:
     resampler.add_time_series(time_series_id=time_series_id_1)
     resampler.add_time_series(time_series_id=time_series_id_2)
 
-    timestamp = datetime.now(tz=pytz.UTC)
+    timestamp = datetime.now(timezone.utc)
 
     value1 = 5.0
     value2 = 15.0