From 82f24ccea3e18897b184d2fa23e4dcabf637f357 Mon Sep 17 00:00:00 2001 From: David William Allen Date: Fri, 21 Jun 2024 10:25:59 -0700 Subject: [PATCH] rebuilt --- gps_time/datetime.py | 6 +++--- gps_time/leapseconds.py | 40 ++++++++++++++++++++-------------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/gps_time/datetime.py b/gps_time/datetime.py index 3e95cd5..d52d3b9 100644 --- a/gps_time/datetime.py +++ b/gps_time/datetime.py @@ -15,7 +15,7 @@ from typing import Iterable, List, Tuple, Optional # %% ../20_datetime.ipynb 5 -_gps_epoch_datetime: datetime.datetime = datetime.datetime(year=1980, month=1, day=6, tzinfo=datetime.UTC) +_gps_epoch_datetime: datetime.datetime = datetime.datetime(year=1980, month=1, day=6, tzinfo=datetime.timezone.utc) # %% ../20_datetime.ipynb 6 ISO_FMT = r"([0-9]{4})-?([0-9]{2})-?([0-9]{2})[T| ]?([0-9]{2}):?([0-9]{2}):?([0-9]{2})\.?([0-9]{6})?" # noqa: E501 @@ -56,7 +56,7 @@ def cast_to_datetime(iso_string: str) -> datetime.datetime: y, m, d, h, minute, s, us = [int(v) if v is not None else v for v in m.groups()] if us is None: us = 0 - return datetime.datetime(year=y, month=m, day=d, hour=h, minute=minute, second=s, mircosecond=us, tzinfo=datetime.UTC) + return datetime.datetime(year=y, month=m, day=d, hour=h, minute=minute, second=s, mircosecond=us, tzinfo=datetime.timezone.utc) else: raise IOError("Value {} not in ISO Time Format".format(iso_string)) @@ -352,7 +352,7 @@ def datetime2tow(date_time: datetime.datetime) -> Tuple[int, float]: raise TypeError("DateTime arg must be a datetime object.") if date_time.tzinfo is None: - date_time=date_time.replace(tzinfo=datetime.UTC) + date_time=date_time.replace(tzinfo=datetime.timezone.utc) # Find the week number week_num = (date_time - _gps_epoch_datetime).days // 7 diff --git a/gps_time/leapseconds.py b/gps_time/leapseconds.py index 096bca4..a8c06d5 100644 --- a/gps_time/leapseconds.py +++ b/gps_time/leapseconds.py @@ -29,24 +29,24 @@ class LeapSeconds: """ _leap_seconds: List[List[Union[GPSTime, int]]] = [ - [GPSTime.from_datetime(time=datetime.datetime(year=1981, month=6, day=30, hour=23, minute=59, second=59, tzinfo=datetime.UTC)) + 1, 1], - [GPSTime.from_datetime(time=datetime.datetime(year=1982, month=6, day=30, hour=23, minute=59, second=59, tzinfo=datetime.UTC)) + 1, 2], - [GPSTime.from_datetime(time=datetime.datetime(year=1983, month=6, day=30, hour=23, minute=59, second=59, tzinfo=datetime.UTC)) + 1, 3], - [GPSTime.from_datetime(time=datetime.datetime(year=1985, month=6, day=30, hour=23, minute=59, second=59, tzinfo=datetime.UTC)) + 1, 4], - [GPSTime.from_datetime(time=datetime.datetime(year=1987, month=12, day=31, hour=23, minute=59, second=59, tzinfo=datetime.UTC)) + 1, 5], - [GPSTime.from_datetime(time=datetime.datetime(year=1989, month=12, day=31, hour=23, minute=59, second=59, tzinfo=datetime.UTC)) + 1, 6], - [GPSTime.from_datetime(time=datetime.datetime(year=1990, month=12, day=31, hour=23, minute=59, second=59, tzinfo=datetime.UTC)) + 1, 7], - [GPSTime.from_datetime(time=datetime.datetime(year=1992, month=6, day=30, hour=23, minute=59, second=59, tzinfo=datetime.UTC)) + 1, 8], - [GPSTime.from_datetime(time=datetime.datetime(year=1993, month=6, day=30, hour=23, minute=59, second=59, tzinfo=datetime.UTC)) + 1, 9], - [GPSTime.from_datetime(time=datetime.datetime(year=1994, month=6, day=30, hour=23, minute=59, second=59, tzinfo=datetime.UTC)) + 1, 10], - [GPSTime.from_datetime(time=datetime.datetime(year=1995, month=12, day=31, hour=23, minute=59, second=59, tzinfo=datetime.UTC)) + 1, 11], - [GPSTime.from_datetime(time=datetime.datetime(year=1997, month=6, day=30, hour=23, minute=59, second=59, tzinfo=datetime.UTC)) + 1, 12], - [GPSTime.from_datetime(time=datetime.datetime(year=1998, month=12, day=31, hour=23, minute=59, second=59, tzinfo=datetime.UTC)) + 1, 13], - [GPSTime.from_datetime(time=datetime.datetime(year=2005, month=12, day=31, hour=23, minute=59, second=59, tzinfo=datetime.UTC)) + 1, 14], - [GPSTime.from_datetime(time=datetime.datetime(year=2008, month=12, day=31, hour=23, minute=59, second=59, tzinfo=datetime.UTC)) + 1, 15], - [GPSTime.from_datetime(time=datetime.datetime(year=2012, month=6, day=30, hour=23, minute=59, second=59, tzinfo=datetime.UTC)) + 1, 16], - [GPSTime.from_datetime(time=datetime.datetime(year=2015, month=6, day=30, hour=23, minute=59, second=59, tzinfo=datetime.UTC)) + 1, 17], - [GPSTime.from_datetime(time=datetime.datetime(year=2016, month=12, day=31, hour=23, minute=59, second=59, tzinfo=datetime.UTC)) + 1, 18], + [GPSTime.from_datetime(time=datetime.datetime(year=1981, month=6, day=30, hour=23, minute=59, second=59, tzinfo=datetime.timezone.utc)) + 1, 1], + [GPSTime.from_datetime(time=datetime.datetime(year=1982, month=6, day=30, hour=23, minute=59, second=59, tzinfo=datetime.timezone.utc)) + 1, 2], + [GPSTime.from_datetime(time=datetime.datetime(year=1983, month=6, day=30, hour=23, minute=59, second=59, tzinfo=datetime.timezone.utc)) + 1, 3], + [GPSTime.from_datetime(time=datetime.datetime(year=1985, month=6, day=30, hour=23, minute=59, second=59, tzinfo=datetime.timezone.utc)) + 1, 4], + [GPSTime.from_datetime(time=datetime.datetime(year=1987, month=12, day=31, hour=23, minute=59, second=59, tzinfo=datetime.timezone.utc)) + 1, 5], + [GPSTime.from_datetime(time=datetime.datetime(year=1989, month=12, day=31, hour=23, minute=59, second=59, tzinfo=datetime.timezone.utc)) + 1, 6], + [GPSTime.from_datetime(time=datetime.datetime(year=1990, month=12, day=31, hour=23, minute=59, second=59, tzinfo=datetime.timezone.utc)) + 1, 7], + [GPSTime.from_datetime(time=datetime.datetime(year=1992, month=6, day=30, hour=23, minute=59, second=59, tzinfo=datetime.timezone.utc)) + 1, 8], + [GPSTime.from_datetime(time=datetime.datetime(year=1993, month=6, day=30, hour=23, minute=59, second=59, tzinfo=datetime.timezone.utc)) + 1, 9], + [GPSTime.from_datetime(time=datetime.datetime(year=1994, month=6, day=30, hour=23, minute=59, second=59, tzinfo=datetime.timezone.utc)) + 1, 10], + [GPSTime.from_datetime(time=datetime.datetime(year=1995, month=12, day=31, hour=23, minute=59, second=59, tzinfo=datetime.timezone.utc)) + 1, 11], + [GPSTime.from_datetime(time=datetime.datetime(year=1997, month=6, day=30, hour=23, minute=59, second=59, tzinfo=datetime.timezone.utc)) + 1, 12], + [GPSTime.from_datetime(time=datetime.datetime(year=1998, month=12, day=31, hour=23, minute=59, second=59, tzinfo=datetime.timezone.utc)) + 1, 13], + [GPSTime.from_datetime(time=datetime.datetime(year=2005, month=12, day=31, hour=23, minute=59, second=59, tzinfo=datetime.timezone.utc)) + 1, 14], + [GPSTime.from_datetime(time=datetime.datetime(year=2008, month=12, day=31, hour=23, minute=59, second=59, tzinfo=datetime.timezone.utc)) + 1, 15], + [GPSTime.from_datetime(time=datetime.datetime(year=2012, month=6, day=30, hour=23, minute=59, second=59, tzinfo=datetime.timezone.utc)) + 1, 16], + [GPSTime.from_datetime(time=datetime.datetime(year=2015, month=6, day=30, hour=23, minute=59, second=59, tzinfo=datetime.timezone.utc)) + 1, 17], + [GPSTime.from_datetime(time=datetime.datetime(year=2016, month=12, day=31, hour=23, minute=59, second=59, tzinfo=datetime.timezone.utc)) + 1, 18], ] """Table of Leap Seconds, note that the leap second occues at midnight, but before the next day.""" @@ -136,7 +136,7 @@ def gps2utc(gps_time: Union[GPSTime, datetime.datetime]) -> datetime.datetime: """ if isinstance(gps_time, datetime.datetime): if gps_time.tzinfo is None: - gps_time = gps_time.replace(tzinfo=datetime.UTC) + gps_time = gps_time.replace(tzinfo=datetime.timezone.utc) gps_time = GPSTime.from_datetime(gps_time) assert isinstance(gps_time, GPSTime), "gps_time must be a GPSTime or datetime" @@ -166,7 +166,7 @@ def utc2gps(utc_time: datetime.datetime) -> GPSTime: """ assert isinstance(utc_time, datetime.datetime), "utc_time must be a datetime" - if utc_time.tzinfo != datetime.UTC: + if utc_time.tzinfo != datetime.timezone.utc: logger.warning("utc2gps() was passed a datetime object not in the UTC time zone. May cause unintended behavior") leap_seconds = LeapSeconds.get_leap_seconds(GPSTime.from_datetime(utc_time))