Fix: remove remaining usages of naive timestamps

Author: xsedla1o

tests/test_api/test_01_datapoints.py

@@ -6,6 +6,8 @@
 import common
 from common import ACCEPTED_ERROR_CODES
 
+from dp3.common.types import UTC
+
 
 class PushDatapoints(common.APITest):
     def test_invalid_payload(self):
@@ -68,7 +70,7 @@ def make_datapoint(data_type: str, value: Any) -> dict[str, Any]:
 
     def make_observation_datapoint(self, data_type: str, value: Any) -> dict[str, Any]:
         dp = self.make_datapoint(data_type, value)
-        dp["t1"] = datetime.utcnow().isoformat()
+        dp["t1"] = datetime.now(UTC).isoformat()
         return dp
 
     def helper_test_datatype_value(self, datapoint: dict, expected_codes: set[int]):

tests/test_example/dps_gen.py

@@ -1,20 +1,20 @@
 # Very simple datapoint generator for bus example config
 
-import datetime
 import json
 import random
+from datetime import datetime, timedelta, timezone
 
 
 class TimeContainer:
     def __init__(self):
-        self.time = datetime.datetime.utcnow() - datetime.timedelta(days=4)
+        self.time = datetime.now(timezone.utc) - timedelta(days=4)
 
     def add_minutes(self, minutes: int):
-        self.time += datetime.timedelta(minutes=minutes)
+        self.time += timedelta(minutes=minutes)
         return self.time
 
     def add_minutes_no_modify(self, minutes: int):
-        return self.time + datetime.timedelta(minutes=minutes)
+        return self.time + timedelta(minutes=minutes)
 
 
 time = TimeContainer()
@@ -129,7 +129,7 @@ def random_passenger_counts_3():
                     "back_out": random_passenger_counts_3(),
                 },
                 "t1": random_t1_local.isoformat(),
-                "t2": (random_t1_local + datetime.timedelta(minutes=30)).isoformat(),
+                "t2": (random_t1_local + timedelta(minutes=30)).isoformat(),
                 "src": "Bus counter",
             }
         )

tests/test_example/dps_gen_realtime.py

@@ -2,12 +2,14 @@
 
 import random
 from argparse import ArgumentParser
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from sys import stderr
 from time import sleep
 
 import requests
 
+UTC = timezone.utc
+
 
 def random_initial_location():
     latitude = random.uniform(39.0, 41.0)
@@ -22,11 +24,11 @@ def do_random_location_increment(current_location):
 
 
 def t1():
-    return datetime.utcnow()
+    return datetime.now(UTC)
 
 
 def random_t2():
-    return datetime.utcnow() + timedelta(minutes=random.randint(5, 15))
+    return datetime.now(UTC) + timedelta(minutes=random.randint(5, 15))
 
 
 def random_passenger_counts_3():