more deprecated

Author: haraschax

laika/downloader.py

@@ -7,7 +7,7 @@
 import time
 import logging
 
-from datetime import datetime, timedelta
+from datetime import datetime, timedelta, timezone
 from urllib.parse import urlparse
 from io import BytesIO
 from ftplib import FTP_TLS, FTP
@@ -296,7 +296,7 @@ def download_nav(time: GPSTime, cache_dir, constellation: ConstellationId):
   if constellation not in CONSTELLATION_NASA_CHAR:
     return None
   c = CONSTELLATION_NASA_CHAR[constellation]
-  if GPSTime.from_datetime(datetime.utcnow()) - time > SECS_IN_DAY:
+  if GPSTime.from_datetime(datetime.now(timezone.utc)) - time > SECS_IN_DAY:
     url_bases = (
       mirror_url(CDDIS_BASE_URL, '/gnss/data/daily/'),
     )
@@ -339,9 +339,9 @@ def download_orbits_gps(time, cache_dir, ephem_types):
     }
 
     # Download filenames in order of quality. Final -> Rapid -> Ultra-Rapid(newest first)
-    if EphemerisType.FINAL_ORBIT in ephem_types and GPSTime.from_datetime(datetime.utcnow()) - time > 3 * SECS_IN_WEEK:
+    if EphemerisType.FINAL_ORBIT in ephem_types and GPSTime.from_datetime(datetime.now(timezone.utc)) - time > 3 * SECS_IN_WEEK:
       filenames.extend(ephem_strs[EphemerisType.FINAL_ORBIT])
-    if EphemerisType.RAPID_ORBIT in ephem_types and GPSTime.from_datetime(datetime.utcnow()) - time > 3 * SECS_IN_DAY:
+    if EphemerisType.RAPID_ORBIT in ephem_types and GPSTime.from_datetime(datetime.now(timezone.utc)) - time > 3 * SECS_IN_DAY:
       filenames.extend(ephem_strs[EphemerisType.RAPID_ORBIT])
     if EphemerisType.ULTRA_RAPID_ORBIT in ephem_types:
       filenames.extend(ephem_strs[EphemerisType.ULTRA_RAPID_ORBIT])

tests/test_ephemerides.py

@@ -1,7 +1,7 @@
 import numpy as np
 import unittest
 
-#from datetime import datetime
+#from datetime import datetime, timezone
 from laika.ephemeris import EphemerisType, read_prn_data
 from laika.gps_time import GPSTime
 #from laika.constants import SECS_IN_DAY
@@ -20,7 +20,7 @@ class TestAstroDog(unittest.TestCase):
   def test_nav_vs_orbit_now(self):
     dog_orbit = AstroDog(valid_ephem_types=EphemerisType.all_orbits())
     dog_nav = AstroDog(valid_ephem_types=EphemerisType.NAV)
-    gps_time = GPSTime.from_datetime(datetime.utcnow()) - SECS_IN_DAY*3
+    gps_time = GPSTime.from_datetime(datetime.now(timezone.utc)) - SECS_IN_DAY*3
     for svId in svIds:
       sat_info_nav = dog_nav.get_sat_info(svId, gps_time)
       assert sat_info_nav is not None, f"Failed to get sat info for {svId} at {gps_time}"