wwvb 5.0.2__tar.gz → 6.0.0__tar.gz

{wwvb-5.0.2 → wwvb-6.0.0}/.github/workflows/test.yml

@@ -31,6 +31,35 @@ jobs:
     - name: Build HTML docs
       run: make html
 
+  typing:
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version:
+        - '3.13'
+        os-version:
+        - 'ubuntu-latest'
+    runs-on: ${{ matrix.os-version }}
+    steps:
+    - uses: actions/checkout@v4
+      with:
+        persist-credentials: false
+
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: ${{ matrix.python-version }}
+
+    - name: Install deps
+      run: |
+        python -mpip install wheel
+        python -mpip install -r requirements-dev.txt
+
+    - name: Check stubs
+      if: (! startsWith(matrix.python-version, 'pypy-'))
+      run: make mypy PYTHON=python
+
+
   test:
     strategy:
       fail-fast: false
@@ -40,7 +69,8 @@ jobs:
         - '3.10'
         - '3.11'
         - '3.12'
-        - '3.13.0-alpha.0 - 3.13'
+        - '3.13'
+        - '3.14.0-alpha.0 - 3.14'
         os-version:
         - 'ubuntu-latest'
         include:
@@ -67,10 +97,6 @@ jobs:
         python -mpip install wheel
         python -mpip install -r requirements-dev.txt
 
-    - name: Check stubs
-      if: (! startsWith(matrix.python-version, 'pypy-'))
-      run: make mypy PYTHON=python
-
     - name: Coverage
       run: make coverage PYTHON=python
 

{wwvb-5.0.2 → wwvb-6.0.0}/.pre-commit-config.yaml

@@ -21,7 +21,7 @@ repos:
   - id: reuse
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.11.5
+  rev: v0.12.1
   hooks:
     # Run the linter.
     - id: ruff

wwvb-6.0.0/.readthedocs.yaml

@@ -0,0 +1,17 @@
+# SPDX-FileCopyrightText: 2024 Jeff Epler
+#
+# SPDX-License-Identifier: GPL-3.0-only
+
+version: 2
+
+build:
+  os: ubuntu-lts-latest
+  tools:
+    python: "3"
+
+sphinx:
+  configuration: doc/conf.py
+
+python:
+  install:
+    - requirements: requirements-dev.txt

{wwvb-5.0.2 → wwvb-6.0.0}/Makefile

@@ -44,7 +44,7 @@ test_venv:
 
 .PHONY: mypy
 mypy:
-	$(Q)mypy --strict --no-warn-unused-ignores src
+	$(Q)mypy --strict --no-warn-unused-ignores src test
 
 .PHONY: update
 update:

{wwvb-5.0.2/src/wwvb.egg-info → wwvb-6.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: wwvb
-Version: 5.0.2
+Version: 6.0.0
 Summary: Generate WWVB timecodes for any desired time
 Author-email: Jeff Epler <jepler@gmail.com>
 Project-URL: Source, https://github.com/jepler/wwvbpy
@@ -33,13 +33,11 @@ SPDX-License-Identifier: GPL-3.0-only
 [![codecov](https://codecov.io/gh/jepler/wwvbpy/branch/main/graph/badge.svg?token=Exx0c3Gp65)](https://codecov.io/gh/jepler/wwvbpy)
 [![Update DUT1 data](https://github.com/jepler/wwvbpy/actions/workflows/cron.yml/badge.svg)](https://github.com/jepler/wwvbpy/actions/workflows/cron.yml)
 [![PyPI](https://img.shields.io/pypi/v/wwvb)](https://pypi.org/project/wwvb)
-[![CodeQL](https://github.com/jepler/wwvbpy/actions/workflows/codeql.yml/badge.svg)](https://github.com/jepler/wwvbpy/actions/workflows/codeql.yml)
 [![pre-commit.ci status](https://results.pre-commit.ci/badge/github/jepler/wwvbpy/main.svg)](https://results.pre-commit.ci/latest/github/jepler/wwvbpy/main)
 
 # Purpose
 
-wwvbpy generates WWVB timecodes for any desired time.  These timecodes
-may be useful in testing WWVB decoder software.
+Python package and command line programs for interacting with WWVB timecodes.
 
 Where possible, wwvbpy uses existing facilities for calendar and time
 manipulation (datetime and dateutil).
@@ -65,7 +63,7 @@ The package includes:
 
 # Development status
 
-The author (@jepler) occasionally develops and maintains this project, but
+The author ([@jepler](https://github.com/jepler)) occasionally develops and maintains this project, but
 issues are not likely to be acted on.  They would be interested in adding
 co-maintainer(s).
 
@@ -93,7 +91,7 @@ channel.
 # Usage
 
 ~~~~
-Usage: python -m wwvb.gen [OPTIONS] [TIMESPEC]...
+Usage: wwvbgen [OPTIONS] [TIMESPEC]...
 
   Generate WWVB timecodes
 
@@ -123,7 +121,7 @@ Options:
 
 For example, to display the leap second that occurred at the end of 1998,
 ~~~~
-$ python wwvbgen.py -m 7 1998 365 23 56
+$ wwvbgen -m 7 1998 365 23 56
 WWVB timecode: year=98 days=365 hour=23 min=56 dst=0 ut1=-300 ly=0 ls=1
 '98+365 23:56  210100110200100001120011001102010100010200110100121000001002
 '98+365 23:57  210100111200100001120011001102010100010200110100121000001002
@@ -145,7 +143,7 @@ The letters `a` through `u` represent offsets of -1.0s through +1.0s
 in 0.1s increments; `k` represents 0s.  (In practice, only a smaller range
 of values, typically -0.7s to +0.8s, is seen)
 
-For 2001 through 2019, NIST has published the actual DUT1 values broadcast,
+For 2001 through 2024, NIST has published the actual DUT1 values broadcast,
 and the date of each change, though it in the format of an HTML
 table and not designed for machine readability:
 

{wwvb-5.0.2 → wwvb-6.0.0}/README.md

@@ -7,13 +7,11 @@ SPDX-License-Identifier: GPL-3.0-only
 [![codecov](https://codecov.io/gh/jepler/wwvbpy/branch/main/graph/badge.svg?token=Exx0c3Gp65)](https://codecov.io/gh/jepler/wwvbpy)
 [![Update DUT1 data](https://github.com/jepler/wwvbpy/actions/workflows/cron.yml/badge.svg)](https://github.com/jepler/wwvbpy/actions/workflows/cron.yml)
 [![PyPI](https://img.shields.io/pypi/v/wwvb)](https://pypi.org/project/wwvb)
-[![CodeQL](https://github.com/jepler/wwvbpy/actions/workflows/codeql.yml/badge.svg)](https://github.com/jepler/wwvbpy/actions/workflows/codeql.yml)
 [![pre-commit.ci status](https://results.pre-commit.ci/badge/github/jepler/wwvbpy/main.svg)](https://results.pre-commit.ci/latest/github/jepler/wwvbpy/main)
 
 # Purpose
 
-wwvbpy generates WWVB timecodes for any desired time.  These timecodes
-may be useful in testing WWVB decoder software.
+Python package and command line programs for interacting with WWVB timecodes.
 
 Where possible, wwvbpy uses existing facilities for calendar and time
 manipulation (datetime and dateutil).
@@ -39,7 +37,7 @@ The package includes:
 
 # Development status
 
-The author (@jepler) occasionally develops and maintains this project, but
+The author ([@jepler](https://github.com/jepler)) occasionally develops and maintains this project, but
 issues are not likely to be acted on.  They would be interested in adding
 co-maintainer(s).
 
@@ -67,7 +65,7 @@ channel.
 # Usage
 
 ~~~~
-Usage: python -m wwvb.gen [OPTIONS] [TIMESPEC]...
+Usage: wwvbgen [OPTIONS] [TIMESPEC]...
 
   Generate WWVB timecodes
 
@@ -97,7 +95,7 @@ Options:
 
 For example, to display the leap second that occurred at the end of 1998,
 ~~~~
-$ python wwvbgen.py -m 7 1998 365 23 56
+$ wwvbgen -m 7 1998 365 23 56
 WWVB timecode: year=98 days=365 hour=23 min=56 dst=0 ut1=-300 ly=0 ls=1
 '98+365 23:56  210100110200100001120011001102010100010200110100121000001002
 '98+365 23:57  210100111200100001120011001102010100010200110100121000001002
@@ -119,7 +117,7 @@ The letters `a` through `u` represent offsets of -1.0s through +1.0s
 in 0.1s increments; `k` represents 0s.  (In practice, only a smaller range
 of values, typically -0.7s to +0.8s, is seen)
 
-For 2001 through 2019, NIST has published the actual DUT1 values broadcast,
+For 2001 through 2024, NIST has published the actual DUT1 values broadcast,
 and the date of each change, though it in the format of an HTML
 table and not designed for machine readability:
 

{wwvb-5.0.2 → wwvb-6.0.0}/doc/conf.py

@@ -56,6 +56,7 @@ version = release = final_version
 # ones.
 extensions = [
     "sphinx.ext.autodoc",
+    "sphinx_mdinclude",
 ]
 
 # Add any paths that contain templates here, relative to this directory.
@@ -82,6 +83,10 @@ html_static_path = ["_static"]
 autodoc_typehints = "description"
 autodoc_class_signature = "separated"
 
+default_role = "any"
+
+intersphinx_mapping = {'py': ('https://docs.python.org/3', None)}
+
 # SPDX-FileCopyrightText: 2021-2024 Jeff Epler
 #
 # SPDX-License-Identifier: GPL-3.0-only

wwvb-6.0.0/doc/index.rst

@@ -0,0 +1,24 @@
+.. SPDX-FileCopyrightText: 2021-2024 Jeff Epler
+..
+.. SPDX-License-Identifier: GPL-3.0-only
+
+wwvbpy |version|
+================
+
+.. mdinclude:: ../README.md
+
+.. toctree::
+   :maxdepth: 2
+   :caption: Contents:
+
+wwvb module
+===========
+
+.. automodule:: wwvb
+   :members:
+
+uwwvb module
+============
+
+.. automodule:: uwwvb
+   :members:

{wwvb-5.0.2 → wwvb-6.0.0}/pyproject.toml

@@ -48,3 +48,6 @@ dut1table = "wwvb.dut1table:main"
 updateiers = "wwvb.updateiers:main"
 [project.gui-scripts]
 wwvbtk = "wwvb.wwvbtk:main"
+[[tool.mypy.overrides]]
+module = ["adafruit_datetime"]
+follow_untyped_imports = true

{wwvb-5.0.2 → wwvb-6.0.0}/requirements-dev.txt

@@ -14,9 +14,10 @@ pre-commit
 python-dateutil
 requests; implementation_name=="cpython"
 setuptools>=68; implementation_name=="cpython"
-sphinx>=7,<8
+sphinx
 sphinx-autodoc-typehints
 sphinx-rtd-theme
+sphinx-mdinclude
 twine; implementation_name=="cpython"
 types-beautifulsoup4; implementation_name=="cpython"
 types-python-dateutil; implementation_name=="cpython"

{wwvb-5.0.2 → wwvb-6.0.0}/src/uwwvb.py

@@ -2,9 +2,12 @@
 #
 # SPDX-License-Identifier: GPL-3.0-only
 
-# ruff: noqa: C405 PYI024 PLR2004 FBT001 FBT002
+# ruff: noqa: C405, PYI024, FBT001, FBT002
 
-"""Implementation of a WWVB state machine & decoder for resource-constrained systems"""
+"""Implementation of a WWVB state machine & decoder for resource-constrained systems
+
+This version is intended for use with MicroPython & CircuitPython.
+"""
 
 from __future__ import annotations
 

{wwvb-5.0.2 → wwvb-6.0.0}/src/wwvb/__init__.py

@@ -1,5 +1,13 @@
 #!/usr/bin/python3
-"""A library for WWVB timecodes"""
+"""A package and CLI for WWVB timecodes
+
+This is the full featured library suitable for use on 'real computers'.
+For a reduced version suitable for use on MicroPython & CircuitPython,
+see `uwwvb`.
+
+This package also includes the commandline programs listed above,
+perhaps most importantly ``wwvbgen`` for generating WWVB timecodes.
+"""
 
 # SPDX-FileCopyrightText: 2011-2024 Jeff Epler
 #
@@ -24,12 +32,6 @@ SECOND = datetime.timedelta(seconds=1)
 T = TypeVar("T")
 
 
-def _require(x: T | None) -> T:
-    """Check an Optional item is not None."""
-    assert x is not None
-    return x
-
-
 def _removeprefix(s: str, p: str) -> str:
     if s.startswith(p):
         return s[len(p) :]
@@ -323,11 +325,22 @@ _dst_ls_lut = [
 ]
 
 
-class _WWVBMinute(NamedTuple):
-    """Uniquely identifies a minute of time in the WWVB system.
+@enum.unique
+class DstStatus(enum.IntEnum):
+    """Constants that describe the DST status of a minute"""
 
-    To use ut1 and ls information from IERS, create a WWVBMinuteIERS value instead.
-    """
+    DST_NOT_IN_EFFECT = 0b00
+    """DST not in effect today"""
+    DST_STARTS_TODAY = 0b01
+    """DST starts today at 0200 local standard time"""
+    DST_ENDS_TODAY = 0b10
+    """DST ends today at 0200 local standard time"""
+    DST_IN_EFFECT = 0b11
+    """DST in effect all day today"""
+
+
+class _WWVBMinute(NamedTuple):
+    """(implementation detail)"""
 
     year: int
     """2-digit year within the WWVB epoch"""
@@ -341,7 +354,7 @@ class _WWVBMinute(NamedTuple):
     min: int
     """Minute of hour"""
 
-    dst: int
+    dst: DstStatus
     """2-bit DST code """
 
     ut1: int
@@ -357,7 +370,8 @@ class _WWVBMinute(NamedTuple):
 class WWVBMinute(_WWVBMinute):
     """Uniquely identifies a minute of time in the WWVB system.
 
-    To use ut1 and ls information from IERS, create a WWVBMinuteIERS value instead.
+    To use ``ut1`` and ``ls`` information from IERS, create a `WWVBMinuteIERS`
+    object instead.
     """
 
     epoch: int = 1970
@@ -368,16 +382,26 @@ class WWVBMinute(_WWVBMinute):
         days: int,
         hour: int,
         minute: int,
-        dst: int | None = None,
+        dst: DstStatus | int | None = None,
         ut1: int | None = None,
+        *,
         ls: bool | None = None,
         ly: bool | None = None,
     ) -> WWVBMinute:
-        """Construct a WWVBMinute"""
-        if dst is None:
-            dst = cls.get_dst(year, days)
-        if dst not in (0, 1, 2, 3):
-            raise ValueError("dst value should be 0..3")
+        """Construct a WWVBMinute
+
+        :param year: The 2- or 4-digit year. This parameter is converted by the `full_year` method.
+        :param days: 1-based day of year
+
+        :param hour: UTC hour of day
+
+        :param minute: Minute of hour
+        :param dst: 2-bit DST code
+        :param ut1: UT1 offset in units of 100ms, range -900 to +900ms
+        :param ls: Leap second warning flag
+        :param ly: Leap year flag
+        """
+        dst = cls.get_dst(year, days) if dst is None else DstStatus(dst)
         if ut1 is None and ls is None:
             ut1, ls = cls._get_dut1_info(year, days)
         elif ut1 is None or ls is None:
@@ -407,13 +431,13 @@ class WWVBMinute(_WWVBMinute):
         return year
 
     @staticmethod
-    def get_dst(year: int, days: int) -> int:
+    def get_dst(year: int, days: int) -> DstStatus:
         """Get the 2-bit WWVB DST value for the given day"""
         d0 = datetime.datetime(year, 1, 1, tzinfo=datetime.timezone.utc) + datetime.timedelta(days - 1)
         d1 = d0 + datetime.timedelta(1)
         dst0 = isdst(d0)
         dst1 = isdst(d1)
-        return dst1 * 2 + dst0
+        return DstStatus(dst1 * 2 + dst0)
 
     def __str__(self) -> str:
         """Implement str()"""
@@ -424,7 +448,10 @@ class WWVBMinute(_WWVBMinute):
         )
 
     def as_datetime_utc(self) -> datetime.datetime:
-        """Convert to a UTC datetime"""
+        """Convert to a UTC datetime
+
+        The returned object has ``tzinfo=datetime.timezone.utc``.
+        """
         d = datetime.datetime(self.year, 1, 1, tzinfo=datetime.timezone.utc)
         d += datetime.timedelta(self.days - 1, self.hour * 3600 + self.min * 60)
         return d
@@ -437,7 +464,18 @@ class WWVBMinute(_WWVBMinute):
         *,
         dst_observed: bool = True,
     ) -> datetime.datetime:
-        """Convert to a local datetime according to the DST bits"""
+        """Convert to a local datetime according to the DST bits
+
+        The returned object has ``tz=datetime.timezone(computed_offset)``.
+
+        :param standard_time_offset: The UTC offset of local standard time, in seconds west of UTC.
+            The default value, ``7 * 3600``, is for Colorado, the source of the WWVB broadcast.
+
+        :param dst_observed: If ``True`` then the locale observes DST, and a
+            one hour offset is applied according to WWVB rules. If ``False``, then
+            the standard time offset is used at all times.
+
+        """
         u = self.as_datetime_utc()
         offset = datetime.timedelta(seconds=-standard_time_offset)
         d = u - datetime.timedelta(seconds=standard_time_offset)
@@ -622,15 +660,15 @@ class WWVBMinute(_WWVBMinute):
         else:
             self._fill_pm_timecode_regular(t)
 
-    def next_minute(self, newut1: int | None = None, newls: bool | None = None) -> WWVBMinute:
+    def next_minute(self, *, newut1: int | None = None, newls: bool | None = None) -> WWVBMinute:
         """Return an object representing the next minute"""
         d = self.as_datetime() + datetime.timedelta(minutes=1)
-        return self.from_datetime(d, newut1, newls, self)
+        return self.from_datetime(d, newut1=newut1, newls=newls, old_time=self)
 
-    def previous_minute(self, newut1: int | None = None, newls: bool | None = None) -> WWVBMinute:
+    def previous_minute(self, *, newut1: int | None = None, newls: bool | None = None) -> WWVBMinute:
         """Return an object representing the previous minute"""
         d = self.as_datetime() - datetime.timedelta(minutes=1)
-        return self.from_datetime(d, newut1, newls, self)
+        return self.from_datetime(d, newut1=newut1, newls=newls, old_time=self)
 
     @classmethod
     def _get_dut1_info(cls: type, year: int, days: int, old_time: WWVBMinute | None = None) -> tuple[int, bool]:  # noqa: ARG003
@@ -659,18 +697,19 @@ class WWVBMinute(_WWVBMinute):
         days = d.pop("days")
         hour = d.pop("hour")
         minute = d.pop("minute")
-        dst: int | None = d.pop("dst", None)
-        ut1: int | None = d.pop("ut1", None)
+        dst = d.pop("dst", None)
+        ut1 = d.pop("ut1", None)
         ls = d.pop("ls", None)
         d.pop("ly", None)
         if d:
             raise ValueError(f"Invalid options: {d}")
-        return cls(year, days, hour, minute, dst, ut1, None if ls is None else bool(ls))
+        return cls(year, days, hour, minute, dst, ut1=ut1, ls=None if ls is None else bool(ls))
 
     @classmethod
     def from_datetime(
         cls,
         d: datetime.datetime,
+        *,
         newut1: int | None = None,
         newls: bool | None = None,
         old_time: WWVBMinute | None = None,
@@ -682,7 +721,7 @@ class WWVBMinute(_WWVBMinute):
         return cls(u.tm_year, u.tm_yday, u.tm_hour, u.tm_min, ut1=newut1, ls=newls)
 
     @classmethod
-    def from_timecode_am(cls, t: WWVBTimecode) -> WWVBMinute | None:
+    def from_timecode_am(cls, t: WWVBTimecode) -> WWVBMinute | None:  # noqa: PLR0912
         """Construct a WWVBMinute from a WWVBTimecode"""
         for i in (0, 9, 19, 29, 39, 49, 59):
             if t.am[i] != AmplitudeModulation.MARK:
@@ -697,9 +736,13 @@ class WWVBMinute(_WWVBMinute):
         minute = t._get_am_bcd(1, 2, 3, 5, 6, 7, 8)
         if minute is None:
             return None
+        if minute >= 60:
+            return None
         hour = t._get_am_bcd(12, 13, 15, 16, 17, 18)
         if hour is None:
             return None
+        if hour >= 24:
+            return None
         days = t._get_am_bcd(22, 23, 25, 26, 27, 28, 30, 31, 32, 33)
         if days is None:
             return None
@@ -716,8 +759,10 @@ class WWVBMinute(_WWVBMinute):
         if days > 366 or (not ly and days > 365):
             return None
         ls = bool(t.am[56])
-        dst = _require(t._get_am_bcd(57, 58))
-        return cls(year, days, hour, minute, dst, ut1, ls, ly)
+        dst = t._get_am_bcd(57, 58)
+        if dst is None:
+            return None
+        return cls(year, days, hour, minute, dst, ut1, ls=ls, ly=ly)
 
 
 class WWVBMinuteIERS(WWVBMinute):
@@ -729,7 +774,7 @@ class WWVBMinuteIERS(WWVBMinute):
         return round(get_dut1(d) * 10) * 100, isls(d)
 
 
-def _bcd_bits(n: int) -> Generator[bool, None, None]:
+def _bcd_bits(n: int) -> Generator[bool]:
     """Return the bcd representation of n, starting with the least significant bit"""
     while True:
         d = n % 10
@@ -743,9 +788,13 @@ class AmplitudeModulation(enum.IntEnum):
     """Constants that describe an Amplitude Modulation value"""
 
     ZERO = 0
+    """A zero bit (reduced carrier during the first 200ms of the second)"""
     ONE = 1
+    """A one bit (reduced carrier during the first 500ms of the second)"""
     MARK = 2
+    """A mark bit (reduced carrier during the first 800ms of the second)"""
     UNSET = -1
+    """An unset or unknown amplitude modulation value"""
 
 
 @enum.unique
@@ -753,8 +802,11 @@ class PhaseModulation(enum.IntEnum):
     """Constants that describe a Phase Modulation value"""
 
     ZERO = 0
+    """A one bit (180° phase shift during the second)"""
     ONE = 1
+    """A zero bit (No phase shift during the second)"""
     UNSET = -1
+    """An unset or unknown phase modulation value"""
 
 
 class WWVBTimecode:
@@ -777,7 +829,10 @@ class WWVBTimecode:
         The the bits ``self.am[poslist[i]]`` in MSB order are converted from
         BCD to integer
         """
-        pos = reversed(poslist)
+        pos = list(poslist)[::-1]
+        for p in pos:
+            if self.am[p] not in {AmplitudeModulation.ZERO, AmplitudeModulation.ONE}:
+                return None
         val = [bool(self.am[p]) for p in pos]
         result = 0
         base = 1
@@ -805,7 +860,7 @@ class WWVBTimecode:
             else:
                 self.am[p] = AmplitudeModulation.ZERO
 
-    def _put_pm_bit(self, i: int, v: PhaseModulation | int | bool) -> None:
+    def _put_pm_bit(self, i: int, v: PhaseModulation | int) -> None:
         """Update a bit of the Phase Modulation signal"""
         self.phase[i] = PhaseModulation(v)
 

{wwvb-5.0.2 → wwvb-6.0.0}/src/wwvb/__version__.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '5.0.2'
-__version_tuple__ = version_tuple = (5, 0, 2)
+__version__ = version = '6.0.0'
+__version_tuple__ = version_tuple = (6, 0, 0)

wwvb-6.0.0/src/wwvb/iersdata.json

@@ -0,0 +1 @@
+{"START": "1972-01-01", "OFFSETS_GZ": "H4sIAJF3PWgC/+2aa3LDMAiEL5uHLDuxnN5/pn/aTmfSSiAWhGR9J8gsywJylqVHPtqxZuH/7leeI0fKsGd5EngQ2WisJWKegrThDa6aJFnL0u4wYZkCE2UmSF0U+13vCveStC6JTfQyW3O86HLJf0SvDgy5u4FCI+WVKRuy0KMjJeXoULIvMDmEWgeRxAJtwXquPCIBqbLh/gbfv0mcxk3mHV9tYiATZP8W/zgw2wd5LpJnY+WErI8abJ3opaIW6592+YMbjSsNWQFlNVVtuhjhtQzSUh4MEpOdDrSW6qsUv+O+Dt+XkIONSrUwvWmTsmq5LO9xsZ+EgcDK+MIESDaYmxSxGlgbGOFjBXMjbV7lc6zlmQ0i48oH5P4+vK7i/AHc7tfTXDtffqFi3m6WhApPSTyDvArU5vUDhm7YaNQYGASVbbwLUBtI2PrhSiZNbvCRrtGUGu0GbjDhJ3aLCx5dQFjt0LFovmWB96e6tktqMenoULXajVS3asBibP3kYXrpmZxnsS2Yf2xRPrHbvQ2D9wjfL4C6b4PWV4otW0vWUYkeWE5M8M594oLbxP77xcl4NuBkG0dfM3xOUf/T0GF+ur+J5pljcODEUZkXg6vIdLYy7g3oZU3bPNDnc8qwGdJZMmAurUsRj6tOo95zP6fb9YPWp5OuZ5X7q2DrmsG/VCyTyaREnDRhnUxOzfzzh3/NRuYTMxwhU6lNAAA="}

{wwvb-5.0.2 → wwvb-6.0.0}/src/wwvb/wwvbtk.py

@@ -6,8 +6,8 @@
 # SPDX-License-Identifier: GPL-3.0-only
 from __future__ import annotations
 
+import datetime
 import functools
-import time
 from tkinter import Canvas, TclError, Tk
 from typing import TYPE_CHECKING, Any
 
@@ -59,31 +59,29 @@ DEFAULT_COLORS = "#3c3c3c #3c3c3c #3c3c3c #cc3c3c #88883c #3ccc3c"
     metavar="COLORS",
     help="2, 3, 4, or 6 Tk color values",
 )
-@click.option("--size", default=48)
-@click.option("--min-size", default=None)
+@click.option("--size", default=48, help="initial size in pixels")
+@click.option("--min-size", default=None, type=int, help="minimum size in pixels (default: same as initial size)")
 def main(colors: list[str], size: int, min_size: int | None) -> None:  # noqa: PLR0915
     """Visualize the WWVB signal in realtime"""
     if min_size is None:
         min_size = size
 
-    def deadline_ms(deadline: float) -> int:
+    def deadline_ms(deadline: datetime.datetime) -> int:
         """Compute the number of ms until a deadline"""
-        now = time.time()
-        return int(max(0, deadline - now) * 1000)
+        now = datetime.datetime.now(datetime.timezone.utc)
+        return int(max(0, (deadline - now).total_seconds()) * 1000)
 
-    def wwvbtick() -> Generator[tuple[float, wwvb.AmplitudeModulation], None, None]:
+    def wwvbtick() -> Generator[tuple[datetime.datetime, wwvb.AmplitudeModulation]]:
         """Yield consecutive values of the WWVB amplitude signal, going from minute to minute"""
-        timestamp = time.time() // 60 * 60
+        timestamp = datetime.datetime.now(datetime.timezone.utc).replace(second=0, microsecond=0)
 
         while True:
-            tt = time.gmtime(timestamp)
-            key = tt.tm_year, tt.tm_yday, tt.tm_hour, tt.tm_min
-            timecode = wwvb.WWVBMinuteIERS(*key).as_timecode()
+            timecode = wwvb.WWVBMinuteIERS.from_datetime(timestamp).as_timecode()
             for i, code in enumerate(timecode.am):
-                yield timestamp + i, code
-            timestamp = timestamp + 60
+                yield timestamp + datetime.timedelta(seconds=i), code
+            timestamp = timestamp + datetime.timedelta(seconds=60)
 
-    def wwvbsmarttick() -> Generator[tuple[float, wwvb.AmplitudeModulation], None, None]:
+    def wwvbsmarttick() -> Generator[tuple[datetime.datetime, wwvb.AmplitudeModulation]]:
         """Yield consecutive values of the WWVB amplitude signal
 
         .. but deal with time progressing unexpectedly, such as when the
@@ -94,10 +92,10 @@ def main(colors: list[str], size: int, min_size: int | None) -> None:  # noqa: P
         """
         while True:
             for stamp, code in wwvbtick():
-                now = time.time()
-                if stamp < now - 60:
+                now = datetime.datetime.now(datetime.timezone.utc)
+                if stamp < now - datetime.timedelta(seconds=60):
                     break
-                if stamp < now - 1:
+                if stamp < now - datetime.timedelta(seconds=1):
                     continue
                 yield stamp, code
 
@@ -137,7 +135,7 @@ def main(colors: list[str], size: int, min_size: int | None) -> None:  # noqa: P
             yield deadline_ms(stamp)
             led_on(code)
             app.update()
-            yield deadline_ms(stamp + 0.2 + 0.3 * int(code))
+            yield deadline_ms(stamp + datetime.timedelta(seconds=0.2 + 0.3 * int(code)))
             led_off(code)
             app.update()