wwvb 3.0.8__py3-none-any.whl → 4.0.0__py3-none-any.whl

wwvb/__version__.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '3.0.8'
-__version_tuple__ = version_tuple = (3, 0, 8)
+__version__ = version = '4.0.0'
+__version_tuple__ = version_tuple = (4, 0, 0)

wwvb/decode.py

@@ -3,8 +3,10 @@
 # SPDX-License-Identifier: GPL-3.0-only
 """A stateful decoder of WWVB signals"""
 
+from __future__ import annotations
+
 import sys
-from typing import Generator, List, Optional
+from typing import Generator
 
 import wwvb
 
@@ -20,12 +22,12 @@ import wwvb
 # State 4: Decoding a minute, starting in second 1
 #  Second
 
-always_zero = set((4, 10, 11, 14, 20, 21, 34, 35, 44, 54))
+always_zero = {4, 10, 11, 14, 20, 21, 34, 35, 44, 54}
 
 
-def wwvbreceive() -> Generator[Optional[wwvb.WWVBTimecode], wwvb.AmplitudeModulation, None]:
-    """A stateful decoder of WWVB signals"""
-    minute: List[wwvb.AmplitudeModulation] = []
+def wwvbreceive() -> Generator[wwvb.WWVBTimecode | None, wwvb.AmplitudeModulation, None]:
+    """Decode WWVB signals statefully."""
+    minute: list[wwvb.AmplitudeModulation] = []
     state = 1
 
     value = yield None
@@ -38,10 +40,7 @@ def wwvbreceive() -> Generator[Optional[wwvb.WWVBTimecode], wwvb.AmplitudeModula
             value = yield None
 
         elif state == 2:
-            if value == wwvb.AmplitudeModulation.MARK:
-                state = 3
-            else:
-                state = 1
+            state = 3 if value == wwvb.AmplitudeModulation.MARK else 1
             value = yield None
 
         elif state == 3:

wwvb/gen.py

@@ -6,9 +6,11 @@
 #
 # SPDX-License-Identifier: GPL-3.0-only
 
+from __future__ import annotations
+
 import datetime
 import sys
-from typing import Any, List, Type
+from typing import Any
 
 import click
 import dateutil.parser
@@ -16,15 +18,17 @@ import dateutil.parser
 from . import WWVBMinute, WWVBMinuteIERS, print_timecodes, print_timecodes_json, styles
 
 
-def parse_timespec(ctx: Any, param: Any, value: List[str]) -> datetime.datetime:
+def parse_timespec(ctx: Any, param: Any, value: list[str]) -> datetime.datetime:  # noqa: ARG001
     """Parse a time specifier from the commandline"""
     try:
         if len(value) == 5:
             year, month, day, hour, minute = map(int, value)
-            return datetime.datetime(year, month, day, hour, minute)
+            return datetime.datetime(year, month, day, hour, minute, tzinfo=datetime.timezone.utc)
         if len(value) == 4:
             year, yday, hour, minute = map(int, value)
-            return datetime.datetime(year, 1, 1, hour, minute) + datetime.timedelta(days=yday - 1)
+            return datetime.datetime(year, 1, 1, hour, minute, tzinfo=datetime.timezone.utc) + datetime.timedelta(
+                days=yday - 1,
+            )
         if len(value) == 1:
             return dateutil.parser.parse(value[0])
         if len(value) == 0:
@@ -68,7 +72,7 @@ def parse_timespec(ctx: Any, param: Any, value: List[str]) -> datetime.datetime:
 @click.option(
     "--style",
     default="default",
-    type=click.Choice(sorted(["json"] + list(styles.keys()))),
+    type=click.Choice(sorted(["json", *list(styles.keys())])),
     help="Style of output",
 )
 @click.option(
@@ -86,6 +90,7 @@ def parse_timespec(ctx: Any, param: Any, value: List[str]) -> datetime.datetime:
 )
 @click.argument("timespec", type=str, nargs=-1, callback=parse_timespec)
 def main(
+    *,
     iers: bool,
     leap_second: bool,
     dut1: int,
@@ -99,7 +104,6 @@ def main(
 
     TIMESPEC: one of "year yday hour minute" or "year month day hour minute", or else the current minute
     """
-
     if (leap_second is not None) or (dut1 is not None):
         iers = False
 
@@ -107,16 +111,13 @@ def main(
     newls = None
 
     if iers:
-        Constructor: Type[WWVBMinute] = WWVBMinuteIERS
+        constructor: type[WWVBMinute] = WWVBMinuteIERS
     else:
-        Constructor = WWVBMinute
-        if dut1 is None:
-            newut1 = -500 * (leap_second or 0)
-        else:
-            newut1 = dut1
+        constructor = WWVBMinute
+        newut1 = -500 * (leap_second or 0) if dut1 is None else dut1
         newls = bool(leap_second)
 
-    w = Constructor.from_datetime(timespec, newls=newls, newut1=newut1)
+    w = constructor.from_datetime(timespec, newls=newls, newut1=newut1)
     if style == "json":
         print_timecodes_json(w, minutes, channel, file=sys.stdout)
     else:

wwvb/iersdata.py

@@ -7,7 +7,7 @@
 # SPDX-License-Identifier: GPL-3.0-only
 
 import datetime
-import os
+import pathlib
 
 import platformdirs
 
@@ -18,10 +18,9 @@ for location in [
     platformdirs.user_data_dir("wwvbpy", "unpythonic.net"),
     platformdirs.site_data_dir("wwvbpy", "unpythonic.net"),
 ]:  # pragma no cover
-    filename = os.path.join(location, "wwvbpy_iersdata.py")
-    if os.path.exists(filename):
-        with open(filename, encoding="utf-8") as f:
-            exec(f.read(), globals(), globals())
+    path = pathlib.Path(location) / "wwvbpy_iersdata.py"
+    if path.exists():
+        exec(path.read_text(encoding="utf-8"), globals(), globals())
         break
 
 start = datetime.datetime.combine(DUT1_DATA_START, datetime.time()).replace(tzinfo=datetime.timezone.utc)

wwvb/iersdata_dist.py

@@ -5,9 +5,9 @@
 # SPDX-License-Identifier: CC0-1.0
 # isort: skip_file
 import datetime
-__all__ = ['DUT1_DATA_START', 'DUT1_OFFSETS']
+__all__ = ["DUT1_DATA_START", "DUT1_OFFSETS"]
 DUT1_DATA_START = datetime.date(1972, 1, 1)
-d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s = tuple('defghijklmnopqrs')
+d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s = tuple("defghijklmnopqrs")
 DUT1_OFFSETS = str( # 19720101
     i*182+s*123+k*30+i*31+s*19+r*31+q*29+p*28+o*30+n*36+m*40     # 19730909
     +l*39+k*33+j*31+i*31+h*18+r*19+q*38+p*32+o*31+n*33+m*48+l*45 # 19741010
@@ -34,5 +34,5 @@ DUT1_OFFSETS = str( # 19720101
     +i*126+h*176+g*97+f*91+e*52+o*116+n*98+m*70+l*133+k*91+j*91  # 20140507
     +i*77+h*140+g*91+f*84+e*70+d*34+n*72+m*76+l*66+k*53+j*56     # 20160831
     +i*105+h*77+g*45+q*25+p*63+o*91+n*154+m*105+l*190+k*118      # 20190501
-    +j*105+i*807+j*376+k*775+l*67+k*2+l*6+k*133                  # 20250405
+    +j*105+i*807+j*376+k*768+l*47+k*3+l*4+k*252,                  # 20250705
 )

wwvb/testcli.py

@@ -1,6 +1,7 @@
 #!/usr/bin/python3
 """Test most wwvblib commandline programs"""
 
+# ruff: noqa: N802 D102
 # Copyright (C) 2011-2020 Jeff Epler <jepler@gmail.com>
 # SPDX-FileCopyrightText: 2021 Jeff Epler
 #
@@ -25,7 +26,7 @@ class CLITestCase(unittest.TestCase):
         return subprocess.check_output(args, stdin=subprocess.DEVNULL, encoding="utf-8", env=env)
 
     def moduleArgs(self, *args: str) -> Sequence[str]:
-        return tuple((sys.executable, *coverage_add, "-m", *args))
+        return (sys.executable, *coverage_add, "-m", *args)
 
     def moduleOutput(self, *args: str) -> str:
         return self.programOutput(sys.executable, *coverage_add, "-m", *args)
@@ -64,7 +65,11 @@ class CLITestCase(unittest.TestCase):
         env["PYTHONIOENCODING"] = "utf-8"
         with self.assertRaises(subprocess.SubprocessError):
             subprocess.check_output(
-                args, stdin=subprocess.DEVNULL, stderr=subprocess.DEVNULL, encoding="utf-8", env=env
+                args,
+                stdin=subprocess.DEVNULL,
+                stderr=subprocess.DEVNULL,
+                encoding="utf-8",
+                env=env,
             )
 
     def assertModuleError(self, *args: str) -> None:
@@ -72,7 +77,7 @@ class CLITestCase(unittest.TestCase):
         self.assertProgramError(*self.moduleArgs(*args))
 
     def test_gen(self) -> None:
-        """test wwvb.gen"""
+        """Test wwvb.gen"""
         self.assertModuleOutput(
             """\
 WWVB timecode: year=2020 days=001 hour=12 min=30 dst=0 ut1=-200 ly=1 ls=0

wwvb/testpm.py

@@ -15,9 +15,9 @@ class TestPhaseModulation(unittest.TestCase):
 
     def test_pm(self) -> None:
         """Compare the generated signal from a reference minute in NIST docs"""
-        ref_am = "2011000002" "0001001112" "0001010002" "0110001012" "0100000012" "0010010112"
+        ref_am = "201100000200010011120001010002011000101201000000120010010112"
 
-        ref_pm = "0011101101" "0001001000" "0011001000" "0110001101" "0011010001" "0110110110"
+        ref_pm = "001110110100010010000011001000011000110100110100010110110110"
 
         ref_minute = wwvb.WWVBMinuteIERS(2012, 186, 17, 30, dst=3)
         ref_time = ref_minute.as_timecode()

wwvb/testuwwvb.py

@@ -4,6 +4,7 @@
 #
 # SPDX-License-Identifier: GPL-3.0-only
 
+# ruff: noqa: N802 D102
 import datetime
 import random
 import sys
@@ -11,8 +12,9 @@ import unittest
 from typing import Union
 
 import adafruit_datetime
-
 import uwwvb
+import zoneinfo
+
 import wwvb
 
 EitherDatetimeOrNone = Union[None, datetime.datetime, adafruit_datetime.datetime]
@@ -24,7 +26,8 @@ class WWVBRoundtrip(unittest.TestCase):
     def assertDateTimeEqualExceptTzInfo(self, a: EitherDatetimeOrNone, b: EitherDatetimeOrNone) -> None:
         """Test two datetime objects for equality
 
-        This equality test excludes tzinfo, and allows adafruit_datetime and core datetime modules to compare equal"""
+        This equality test excludes tzinfo, and allows adafruit_datetime and core datetime modules to compare equal
+        """
         assert a
         assert b
         self.assertEqual(
@@ -34,8 +37,10 @@ class WWVBRoundtrip(unittest.TestCase):
 
     def test_decode(self) -> None:
         """Test decoding of some minutes including a leap second.
-        Each minute must decode and match the primary decoder."""
-        minute = wwvb.WWVBMinuteIERS.from_datetime(datetime.datetime(2012, 6, 30, 23, 50))
+
+        Each minute must decode and match the primary decoder.
+        """
+        minute = wwvb.WWVBMinuteIERS.from_datetime(datetime.datetime(2012, 6, 30, 23, 50, tzinfo=datetime.timezone.utc))
         assert minute
         decoder = uwwvb.WWVBDecoder()
         decoder.update(uwwvb.MARK)
@@ -57,7 +62,7 @@ class WWVBRoundtrip(unittest.TestCase):
 
     def test_roundtrip(self) -> None:
         """Test that some big range of times all decode the same as the primary decoder"""
-        dt = datetime.datetime(2002, 1, 1, 0, 0)
+        dt = datetime.datetime(2002, 1, 1, 0, 0, tzinfo=datetime.timezone.utc)
         delta = datetime.timedelta(minutes=7182 if sys.implementation.name == "cpython" else 86400 - 7182)
         while dt.year < 2013:
             minute = wwvb.WWVBMinuteIERS.from_datetime(dt)
@@ -70,19 +75,19 @@ class WWVBRoundtrip(unittest.TestCase):
     def test_dst(self) -> None:
         """Test of DST as handled by the small decoder"""
         for dt in (
-            datetime.datetime(2021, 3, 14, 8, 59),
-            datetime.datetime(2021, 3, 14, 9, 00),
-            datetime.datetime(2021, 3, 14, 9, 1),
-            datetime.datetime(2021, 3, 15, 8, 59),
-            datetime.datetime(2021, 3, 15, 9, 00),
-            datetime.datetime(2021, 3, 15, 9, 1),
-            datetime.datetime(2021, 11, 7, 8, 59),
-            datetime.datetime(2021, 11, 7, 9, 00),
-            datetime.datetime(2021, 11, 7, 9, 1),
-            datetime.datetime(2021, 11, 8, 8, 59),
-            datetime.datetime(2021, 11, 8, 9, 00),
-            datetime.datetime(2021, 11, 8, 9, 1),
-            datetime.datetime(2021, 7, 7, 9, 1),
+            datetime.datetime(2021, 3, 14, 8, 59, tzinfo=datetime.timezone.utc),
+            datetime.datetime(2021, 3, 14, 9, 00, tzinfo=datetime.timezone.utc),
+            datetime.datetime(2021, 3, 14, 9, 1, tzinfo=datetime.timezone.utc),
+            datetime.datetime(2021, 3, 15, 8, 59, tzinfo=datetime.timezone.utc),
+            datetime.datetime(2021, 3, 15, 9, 00, tzinfo=datetime.timezone.utc),
+            datetime.datetime(2021, 3, 15, 9, 1, tzinfo=datetime.timezone.utc),
+            datetime.datetime(2021, 11, 7, 8, 59, tzinfo=datetime.timezone.utc),
+            datetime.datetime(2021, 11, 7, 9, 00, tzinfo=datetime.timezone.utc),
+            datetime.datetime(2021, 11, 7, 9, 1, tzinfo=datetime.timezone.utc),
+            datetime.datetime(2021, 11, 8, 8, 59, tzinfo=datetime.timezone.utc),
+            datetime.datetime(2021, 11, 8, 9, 00, tzinfo=datetime.timezone.utc),
+            datetime.datetime(2021, 11, 8, 9, 1, tzinfo=datetime.timezone.utc),
+            datetime.datetime(2021, 7, 7, 9, 1, tzinfo=datetime.timezone.utc),
         ):
             minute = wwvb.WWVBMinuteIERS.from_datetime(dt)
             decoded = uwwvb.decode_wwvb([int(i) for i in minute.as_timecode().am])
@@ -98,7 +103,9 @@ class WWVBRoundtrip(unittest.TestCase):
 
     def test_noise(self) -> None:
         """Test of the state-machine decoder when faced with pseudorandom noise"""
-        minute = wwvb.WWVBMinuteIERS.from_datetime(datetime.datetime(2012, 6, 30, 23, 50))
+        minute = wwvb.WWVBMinuteIERS.from_datetime(
+            datetime.datetime(2012, 6, 30, 23, 50, tzinfo=datetime.timezone.utc),
+        )
         r = random.Random(408)
         junk = [
             r.choice(
@@ -106,12 +113,12 @@ class WWVBRoundtrip(unittest.TestCase):
                     wwvb.AmplitudeModulation.MARK,
                     wwvb.AmplitudeModulation.ONE,
                     wwvb.AmplitudeModulation.ZERO,
-                ]
+                ],
             )
             for _ in range(480)
         ]
         timecode = minute.as_timecode()
-        test_input = junk + [wwvb.AmplitudeModulation.MARK] + timecode.am
+        test_input = [*junk, wwvb.AmplitudeModulation.MARK, *timecode.am]
         decoder = uwwvb.WWVBDecoder()
         for code in test_input[:-1]:
             decoded = decoder.update(code)
@@ -131,7 +138,9 @@ class WWVBRoundtrip(unittest.TestCase):
 
     def test_noise2(self) -> None:
         """Test of the full minute decoder with targeted errors to get full coverage"""
-        minute = wwvb.WWVBMinuteIERS.from_datetime(datetime.datetime(2012, 6, 30, 23, 50))
+        minute = wwvb.WWVBMinuteIERS.from_datetime(
+            datetime.datetime(2012, 6, 30, 23, 50, tzinfo=datetime.timezone.utc),
+        )
         timecode = minute.as_timecode()
         decoded = uwwvb.decode_wwvb([int(i) for i in timecode.am])
         self.assertIsNotNone(decoded)
@@ -166,7 +175,9 @@ class WWVBRoundtrip(unittest.TestCase):
 
     def test_noise3(self) -> None:
         """Test impossible BCD values"""
-        minute = wwvb.WWVBMinuteIERS.from_datetime(datetime.datetime(2012, 6, 30, 23, 50))
+        minute = wwvb.WWVBMinuteIERS.from_datetime(
+            datetime.datetime(2012, 6, 30, 23, 50, tzinfo=datetime.timezone.utc),
+        )
         timecode = minute.as_timecode()
 
         for poslist in [
@@ -191,15 +202,17 @@ class WWVBRoundtrip(unittest.TestCase):
         self.assertEqual(str(uwwvb.WWVBDecoder()), "<WWVBDecoder 1 []>")
 
     def test_near_year_bug(self) -> None:
-        """Chris's WWVB software had a bug where the hours after UTC
-        midnight on 12-31 of a leap year would be shown incorrectly. Check that we
-        don't have that bug."""
-        minute = wwvb.WWVBMinuteIERS.from_datetime(datetime.datetime(2021, 1, 1, 0, 0))
+        """Test for a bug seen in another WWVB implementaiton
+
+        .. in which the hours after UTC midnight on 12-31 of a leap year would
+        be shown incorrectly. Check that we don't have that bug.
+        """
+        minute = wwvb.WWVBMinuteIERS.from_datetime(datetime.datetime(2021, 1, 1, 0, 0, tzinfo=datetime.timezone.utc))
         timecode = minute.as_timecode()
         decoded = uwwvb.decode_wwvb([int(i) for i in timecode.am])
         assert decoded
         self.assertDateTimeEqualExceptTzInfo(
-            datetime.datetime(2020, 12, 31, 17, 00),  # Mountain time!
+            datetime.datetime(2020, 12, 31, 17, 00, tzinfo=zoneinfo.ZoneInfo("America/Denver")),  # Mountain time!
             uwwvb.as_datetime_local(decoded),
         )
 

wwvb/testwwvb.py

@@ -1,4 +1,6 @@
 #!/usr/bin/python3
+# ruff: noqa: E501
+
 """Test most wwvblib functionality"""
 
 # Copyright (C) 2011-2020 Jeff Epler <jepler@gmail.com>
@@ -6,16 +8,18 @@
 #
 # SPDX-License-Identifier: GPL-3.0-only
 
+from __future__ import annotations
+
 import copy
 import datetime
-import glob
 import io
+import pathlib
 import random
 import sys
 import unittest
-from typing import Optional
 
 import uwwvb
+
 import wwvb
 
 from . import decode, iersdata, tz
@@ -34,10 +38,9 @@ class WWVBTestCase(unittest.TestCase):
 
     def test_cases(self) -> None:
         """Generate a test case for each expected output in tests/"""
-        for test in glob.glob("tests/*"):
+        for test in pathlib.Path("tests").glob("*"):
             with self.subTest(test=test):
-                with open(test, "rt", encoding="utf-8") as f:
-                    text = f.read()
+                text = test.read_text(encoding="utf-8")
                 lines = [line for line in text.split("\n") if not line.startswith("#")]
                 while not lines[0]:
                     del lines[0]
@@ -53,7 +56,7 @@ class WWVBTestCase(unittest.TestCase):
                     elif o.startswith("--style="):
                         style = o[8:]
                     else:
-                        raise ValueError(f"Unknown option {repr(o)}")
+                        raise ValueError(f"Unknown option {o!r}")
                 num_minutes = len(lines) - 2
                 if channel == "both":
                     num_minutes = len(lines) // 3
@@ -84,14 +87,14 @@ class WWVBRoundtrip(unittest.TestCase):
 
     def test_decode(self) -> None:
         """Test that a range of minutes including a leap second are correctly decoded by the state-based decoder"""
-        minute = wwvb.WWVBMinuteIERS.from_datetime(datetime.datetime(1992, 6, 30, 23, 50))
+        minute = wwvb.WWVBMinuteIERS.from_datetime(datetime.datetime(1992, 6, 30, 23, 50, tzinfo=datetime.timezone.utc))
         decoder = decode.wwvbreceive()
         next(decoder)
         decoder.send(wwvb.AmplitudeModulation.MARK)
         any_leap_second = False
         for _ in range(20):
             timecode = minute.as_timecode()
-            decoded: Optional[wwvb.WWVBTimecode] = None
+            decoded: wwvb.WWVBTimecode | None = None
             if len(timecode.am) == 61:
                 any_leap_second = True
             for code in timecode.am:
@@ -108,28 +111,28 @@ class WWVBRoundtrip(unittest.TestCase):
     def test_cover_fill_pm_timecode_extended(self) -> None:
         """Get full coverage of the function pm_timecode_extended"""
         for dt in (
-            datetime.datetime(1992, 1, 1),
-            datetime.datetime(1992, 4, 5),
-            datetime.datetime(1992, 6, 1),
-            datetime.datetime(1992, 10, 25),
+            datetime.datetime(1992, 1, 1, tzinfo=datetime.timezone.utc),
+            datetime.datetime(1992, 4, 5, tzinfo=datetime.timezone.utc),
+            datetime.datetime(1992, 6, 1, tzinfo=datetime.timezone.utc),
+            datetime.datetime(1992, 10, 25, tzinfo=datetime.timezone.utc),
         ):
             for hour in (0, 4, 11):
-                dt = dt.replace(hour=hour, minute=10)
-                minute = wwvb.WWVBMinuteIERS.from_datetime(dt)
+                dt1 = dt.replace(hour=hour, minute=10)
+                minute = wwvb.WWVBMinuteIERS.from_datetime(dt1)
                 assert minute is not None
                 timecode = minute.as_timecode().am
                 assert timecode
 
     def test_roundtrip(self) -> None:
         """Test that a wide of minutes are correctly decoded by the state-based decoder"""
-        dt = datetime.datetime(1992, 1, 1, 0, 0)
+        dt = datetime.datetime(1992, 1, 1, 0, 0, tzinfo=datetime.timezone.utc)
         delta = datetime.timedelta(minutes=915 if sys.implementation.name == "cpython" else 86400 - 915)
         while dt.year < 1993:
             minute = wwvb.WWVBMinuteIERS.from_datetime(dt)
             assert minute is not None
             timecode = minute.as_timecode().am
             assert timecode
-            decoded_minute: Optional[wwvb.WWVBMinute] = wwvb.WWVBMinuteIERS.from_timecode_am(minute.as_timecode())
+            decoded_minute: wwvb.WWVBMinute | None = wwvb.WWVBMinuteIERS.from_timecode_am(minute.as_timecode())
             assert decoded_minute
             decoded = decoded_minute.as_timecode().am
             self.assertEqual(
@@ -141,7 +144,7 @@ class WWVBRoundtrip(unittest.TestCase):
 
     def test_noise(self) -> None:
         """Test against pseudorandom noise"""
-        minute = wwvb.WWVBMinuteIERS.from_datetime(datetime.datetime(1992, 6, 30, 23, 50))
+        minute = wwvb.WWVBMinuteIERS.from_datetime(datetime.datetime(1992, 6, 30, 23, 50, tzinfo=datetime.timezone.utc))
         r = random.Random(408)
         junk = [
             r.choice(
@@ -149,12 +152,12 @@ class WWVBRoundtrip(unittest.TestCase):
                     wwvb.AmplitudeModulation.MARK,
                     wwvb.AmplitudeModulation.ONE,
                     wwvb.AmplitudeModulation.ZERO,
-                ]
+                ],
             )
             for _ in range(480)
         ]
         timecode = minute.as_timecode()
-        test_input = junk + [wwvb.AmplitudeModulation.MARK] + timecode.am
+        test_input = [*junk, wwvb.AmplitudeModulation.MARK, *timecode.am]
         decoder = decode.wwvbreceive()
         next(decoder)
         for code in test_input[:-1]:
@@ -171,7 +174,7 @@ class WWVBRoundtrip(unittest.TestCase):
 
     def test_noise2(self) -> None:
         """Test of the full minute decoder with targeted errors to get full coverage"""
-        minute = wwvb.WWVBMinuteIERS.from_datetime(datetime.datetime(2012, 6, 30, 23, 50))
+        minute = wwvb.WWVBMinuteIERS.from_datetime(datetime.datetime(2012, 6, 30, 23, 50, tzinfo=datetime.timezone.utc))
         timecode = minute.as_timecode()
         decoded = wwvb.WWVBMinute.from_timecode_am(timecode)
         self.assertIsNotNone(decoded)
@@ -206,7 +209,7 @@ class WWVBRoundtrip(unittest.TestCase):
 
     def test_noise3(self) -> None:
         """Test impossible BCD values"""
-        minute = wwvb.WWVBMinuteIERS.from_datetime(datetime.datetime(2012, 6, 30, 23, 50))
+        minute = wwvb.WWVBMinuteIERS.from_datetime(datetime.datetime(2012, 6, 30, 23, 50, tzinfo=datetime.timezone.utc))
         timecode = minute.as_timecode()
 
         for poslist in [
@@ -228,12 +231,12 @@ class WWVBRoundtrip(unittest.TestCase):
 
     def test_previous_next_minute(self) -> None:
         """Test that previous minute and next minute are inverses"""
-        minute = wwvb.WWVBMinuteIERS.from_datetime(datetime.datetime(1992, 6, 30, 23, 50))
+        minute = wwvb.WWVBMinuteIERS.from_datetime(datetime.datetime(1992, 6, 30, 23, 50, tzinfo=datetime.timezone.utc))
         self.assertEqual(minute, minute.next_minute().previous_minute())
 
     def test_timecode_str(self) -> None:
         """Test the str() and repr() methods"""
-        minute = wwvb.WWVBMinuteIERS.from_datetime(datetime.datetime(1992, 6, 30, 23, 50))
+        minute = wwvb.WWVBMinuteIERS.from_datetime(datetime.datetime(1992, 6, 30, 23, 50, tzinfo=datetime.timezone.utc))
         timecode = minute.as_timecode()
         self.assertEqual(
             str(timecode),
@@ -256,6 +259,9 @@ class WWVBRoundtrip(unittest.TestCase):
 
         self.assertEqual(wwvb.get_dut1(e), wwvb.get_dut1(ep1))
 
+        ep2 = datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta(days=340)
+        wwvb.get_dut1(ep2)
+
     def test_epoch(self) -> None:
         """Test the 1970-to-2069 epoch"""
         m = wwvb.WWVBMinute(69, 1, 1, 0, 0)
@@ -268,7 +274,6 @@ class WWVBRoundtrip(unittest.TestCase):
 
     def test_fromstring(self) -> None:
         """Test the fromstring() classmethod"""
-
         s = "WWVB timecode: year=1998 days=365 hour=23 min=56 dst=0 ut1=-300 ly=0 ls=1"
         t = "year=1998 days=365 hour=23 min=56 dst=0 ut1=-300 ly=0 ls=1"
         self.assertEqual(wwvb.WWVBMinuteIERS.fromstring(s), wwvb.WWVBMinuteIERS.fromstring(t))
@@ -279,7 +284,7 @@ class WWVBRoundtrip(unittest.TestCase):
 
     def test_from_datetime(self) -> None:
         """Test the from_datetime() classmethod"""
-        d = datetime.datetime(1998, 12, 31, 23, 56, 0)
+        d = datetime.datetime(1998, 12, 31, 23, 56, 0, tzinfo=datetime.timezone.utc)
         self.assertEqual(
             wwvb.WWVBMinuteIERS.from_datetime(d),
             wwvb.WWVBMinuteIERS.from_datetime(d, newls=True, newut1=-300),
@@ -299,16 +304,11 @@ class WWVBRoundtrip(unittest.TestCase):
         with self.assertRaises(ValueError):
             wwvb.WWVBMinute.fromstring("year=1998 days=365 hour=23 min=56 dst=0 ut1=-300 ly=0 ls=1 boo=1")
 
-    def test_deprecated(self) -> None:
-        """Ensure that the 'maybe_warn_update' function is covered"""
-        with self.assertWarnsRegex(DeprecationWarning, "use ly"):
-            wwvb.WWVBMinute(2020, 1, 1, 1).is_ly()
-
     def test_update(self) -> None:
         """Ensure that the 'maybe_warn_update' function is covered"""
         with self.assertWarnsRegex(Warning, "updateiers"):
             wwvb._maybe_warn_update(datetime.date(1970, 1, 1))
-            wwvb._maybe_warn_update(datetime.datetime(1970, 1, 1, 0, 0))
+            wwvb._maybe_warn_update(datetime.datetime(1970, 1, 1, 0, 0, tzinfo=datetime.timezone.utc))
 
     def test_undefined(self) -> None:
         """Ensure that the check for unset elements in am works"""
@@ -317,32 +317,41 @@ class WWVBRoundtrip(unittest.TestCase):
 
     def test_tz(self) -> None:
         """Get a little more coverage in the dst change functions"""
-        date, row = wwvb.get_dst_change_date_and_row(datetime.datetime(1960, 1, 1))
+        date, row = wwvb._get_dst_change_date_and_row(datetime.datetime(1960, 1, 1, tzinfo=datetime.timezone.utc))
         self.assertIsNone(date)
         self.assertIsNone(row)
 
-        self.assertIsNone(wwvb.get_dst_change_hour(datetime.datetime(1960, 1, 1)))
+        self.assertIsNone(wwvb._get_dst_change_hour(datetime.datetime(1960, 1, 1, tzinfo=datetime.timezone.utc)))
 
-        self.assertEqual(wwvb.get_dst_next(datetime.datetime(1960, 1, 1)), 0b000111)
+        self.assertEqual(wwvb._get_dst_next(datetime.datetime(1960, 1, 1, tzinfo=datetime.timezone.utc)), 0b000111)
 
         # Cuba followed year-round DST for several years
         self.assertEqual(
-            wwvb.get_dst_next(datetime.datetime(2005, 1, 1), tz=tz.ZoneInfo("Cuba")),
+            wwvb._get_dst_next(datetime.datetime(2005, 1, 1, tzinfo=datetime.timezone.utc), tz=tz.ZoneInfo("Cuba")),
             0b101111,
         )
-        date, row = wwvb.get_dst_change_date_and_row(datetime.datetime(2005, 1, 1), tz=tz.ZoneInfo("Cuba"))
+        date, row = wwvb._get_dst_change_date_and_row(
+            datetime.datetime(2005, 1, 1, tzinfo=datetime.timezone.utc),
+            tz=tz.ZoneInfo("Cuba"),
+        )
         self.assertIsNone(date)
         self.assertIsNone(row)
 
         # California was weird in 1948
         self.assertEqual(
-            wwvb.get_dst_next(datetime.datetime(1948, 1, 1), tz=tz.ZoneInfo("America/Los_Angeles")),
+            wwvb._get_dst_next(
+                datetime.datetime(1948, 1, 1, tzinfo=datetime.timezone.utc),
+                tz=tz.ZoneInfo("America/Los_Angeles"),
+            ),
             0b100011,
         )
 
         # Berlin had DST changes on Monday in 1917
         self.assertEqual(
-            wwvb.get_dst_next(datetime.datetime(1917, 1, 1), tz=tz.ZoneInfo("Europe/Berlin")),
+            wwvb._get_dst_next(
+                datetime.datetime(1917, 1, 1, tzinfo=datetime.timezone.utc),
+                tz=tz.ZoneInfo("Europe/Berlin"),
+            ),
             0b100011,
         )
 
@@ -350,7 +359,10 @@ class WWVBRoundtrip(unittest.TestCase):
         # Australia observes DST in the other half of the year compared to the
         # Northern hemisphere
         self.assertEqual(
-            wwvb.get_dst_next(datetime.datetime(2005, 1, 1), tz=tz.ZoneInfo("Australia/Melbourne")),
+            wwvb._get_dst_next(
+                datetime.datetime(2005, 1, 1, tzinfo=datetime.timezone.utc),
+                tz=tz.ZoneInfo("Australia/Melbourne"),
+            ),
             0b100011,
         )