wwvb 4.0.0a0__tar.gz → 5.0.0__tar.gz

wwvb-5.0.0/.coveragerc

@@ -0,0 +1,15 @@
+# SPDX-FileCopyrightText: 2021-2024 Jeff Epler
+#
+# SPDX-License-Identifier: GPL-3.0-only
+[report]
+exclude_also =
+    def __repr__
+    if self.debug:
+    if settings.DEBUG
+    raise AssertionError
+    raise NotImplementedError
+    if 0:
+    if __name__ == .__main__.:
+    if TYPE_CHECKING:
+    class .*\bProtocol\):
+    @(abc\.)?abstractmethod

{wwvb-4.0.0a0 → wwvb-5.0.0}/.github/workflows/codeql.yml

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2022 Jeff Epler
+# SPDX-FileCopyrightText: 2022-2024 Jeff Epler
 #
 # SPDX-License-Identifier: CC0-1.0
 

{wwvb-4.0.0a0 → wwvb-5.0.0}/.github/workflows/cron.yml

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2021 Jeff Epler
+# SPDX-FileCopyrightText: 2021-2024 Jeff Epler
 #
 # SPDX-License-Identifier: CC0-1.0
 
@@ -41,4 +41,4 @@ jobs:
         git config user.name "${GITHUB_ACTOR} (github actions cron)"
         git config user.email "${GITHUB_ACTOR}@users.noreply.github.com"
         git remote set-url --push origin https://${GITHUB_ACTOR}:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }}
-        if git commit -m"update iersdata" src/wwvb/iersdata_dist.py; then git push origin HEAD:main; fi
+        if git commit -m"update iersdata" src/wwvb/iersdata.json; then git push origin HEAD:main; fi

{wwvb-4.0.0a0 → wwvb-5.0.0}/.github/workflows/release.yml

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2021 Jeff Epler
+# SPDX-FileCopyrightText: 2021-2024 Jeff Epler
 #
 # SPDX-License-Identifier: CC0-1.0
 

{wwvb-4.0.0a0 → wwvb-5.0.0}/.github/workflows/test.yml

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2021 Jeff Epler
+# SPDX-FileCopyrightText: 2021-2024 Jeff Epler
 #
 # SPDX-License-Identifier: CC0-1.0
 
@@ -41,19 +41,13 @@ jobs:
         - '3.13.0-alpha.0 - 3.13'
         os-version:
         - 'ubuntu-latest'
-        coverage-core:
-        - 'ctrace'
         include:
           - os-version: 'macos-latest'
             python-version: '3.x'
           - os-version: 'windows-latest'
             python-version: '3.x'
-          - os-version: 'ubuntu-latest'
-            python-version: '3.12'
-            coverage-core: 'sysmon'
           - os-version: 'ubuntu-latest'
             python-version: 'pypy-3.10'
-            coverage-core: 'pytrace'
 
     runs-on: ${{ matrix.os-version }}
     steps:
@@ -73,14 +67,17 @@ jobs:
       if: (! startsWith(matrix.python-version, 'pypy-'))
       run: make mypy PYTHON=python
 
-    - name: Test
-      run: make coverage PYTHON=python COVERAGE_CORE=${{ matrix.coverage-core }}
+    - name: Coverage
+      run: make coverage PYTHON=python
+
+    - name: Test installed version
+      run: make test_venv PYTHON=python
 
     - name: Upload Coverage as artifact
       if: always()
       uses: actions/upload-artifact@v4
       with:
-        name: coverage for ${{ matrix.python-version }} on ${{ matrix.os-version }} ${{ matrix.coverage-core }}
+        name: coverage for ${{ matrix.python-version }} on ${{ matrix.os-version }}
         path: coverage.xml
 
   pre-commit:

{wwvb-4.0.0a0 → wwvb-5.0.0}/.gitignore

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2021 Jeff Epler
+# SPDX-FileCopyrightText: 2021-2024 Jeff Epler
 #
 # SPDX-License-Identifier: CC0-1.0
 

{wwvb-4.0.0a0 → wwvb-5.0.0}/.pre-commit-config.yaml

@@ -1,4 +1,5 @@
 # SPDX-FileCopyrightText: 2020 Diego Elio Pettenò
+# SPDX-FileCopyrightText: 2020-2024 Jeff Epler
 #
 # SPDX-License-Identifier: Unlicense
 
@@ -7,20 +8,20 @@ default_language_version:
 
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.6.0
+  rev: v5.0.0
   hooks:
   -   id: check-yaml
   -   id: end-of-file-fixer
       exclude: tests
   -   id: trailing-whitespace
-      exclude: tests
+      exclude: test/wwvbgen_testcases
 - repo: https://github.com/fsfe/reuse-tool
   rev: v4.0.3
   hooks:
   - id: reuse
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.5.1
+  rev: v0.6.9
   hooks:
     # Run the linter.
     - id: ruff

{wwvb-4.0.0a0 → wwvb-5.0.0}/Makefile

@@ -17,6 +17,11 @@ STEPECHO = @echo
 endif
 
 PYTHON ?= python3
+ifeq ($(OS),Windows_NT)
+ENVPYTHON ?= _env/Scripts/python.exe
+else
+ENVPYTHON ?= _env/bin/python3
+endif
 
 .PHONY: default
 default: coverage mypy
@@ -25,12 +30,18 @@ COVERAGE_INCLUDE=--include "src/**/*.py"
 .PHONY: coverage
 coverage:
 	$(Q)$(PYTHON) -mcoverage erase
-	$(Q)env PYTHONPATH=src $(PYTHON) -mcoverage run --branch -p -m unittest discover -s src
+	$(Q)env PYTHONPATH=src $(PYTHON) -mcoverage run --branch -p -m unittest discover -s test
 	$(Q)$(PYTHON) -mcoverage combine -q
 	$(Q)$(PYTHON) -mcoverage html $(COVERAGE_INCLUDE)
 	$(Q)$(PYTHON) -mcoverage xml $(COVERAGE_INCLUDE)
 	$(Q)$(PYTHON) -mcoverage report --fail-under=100 $(COVERAGE_INCLUDE)
 
+.PHONY: test_venv
+test_venv:
+	$(Q)$(PYTHON) -mvenv --clear _env
+	$(Q)$(ENVPYTHON) -mpip install .
+	$(Q)$(ENVPYTHON) -m unittest discover -s test
+
 .PHONY: mypy
 mypy:
 	$(Q)mypy --strict --no-warn-unused-ignores src
@@ -46,19 +57,15 @@ update:
 # from the environment for the first two.
 SPHINXOPTS    ?= -a -E -j auto
 SPHINXBUILD   ?= sphinx-build
-SOURCEDIR     = .
+SOURCEDIR     = doc
 BUILDDIR      = _build
 
 # Route particular targets to Sphinx using the new
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
 .PHONY: html
 html:
-	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
-
-# Pass the desired coverage tracer name to subprocesses
-export COVERAGE_CORE
+	$(Q)$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
 
-# Copyright (C) 2021 Jeff Epler <jepler@gmail.com>
-# SPDX-FileCopyrightText: 2021 Jeff Epler
+# SPDX-FileCopyrightText: 2024 Jeff Epler
 #
 # SPDX-License-Identifier: GPL-3.0-only

{wwvb-4.0.0a0/src/wwvb.egg-info → wwvb-5.0.0}/PKG-INFO

@@ -1,10 +1,10 @@
 Metadata-Version: 2.1
 Name: wwvb
-Version: 4.0.0a0
+Version: 5.0.0
 Summary: Generate WWVB timecodes for any desired time
-Home-page: https://github.com/jepler/wwvbpy
-Author: Jeff Epler
-Author-email: jepler@gmail.com
+Author-email: Jeff Epler <jepler@gmail.com>
+Project-URL: Source, https://github.com/jepler/wwvbpy
+Project-URL: Documentation, https://github.com/jepler/wwvbpy
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
@@ -22,9 +22,10 @@ Requires-Dist: leapseconddata
 Requires-Dist: platformdirs
 Requires-Dist: python-dateutil
 Requires-Dist: requests
+Requires-Dist: tzdata
 
 <!--
-SPDX-FileCopyrightText: 2021 Jeff Epler
+SPDX-FileCopyrightText: 2021-2024 Jeff Epler
 
 SPDX-License-Identifier: GPL-3.0-only
 -->

{wwvb-4.0.0a0 → wwvb-5.0.0}/README.md

@@ -1,5 +1,5 @@
 <!--
-SPDX-FileCopyrightText: 2021 Jeff Epler
+SPDX-FileCopyrightText: 2021-2024 Jeff Epler
 
 SPDX-License-Identifier: GPL-3.0-only
 -->

{wwvb-4.0.0a0 → wwvb-5.0.0}/adafruit_datetime.pyi

@@ -1,4 +1,5 @@
 # SPDX-FileCopyrightText: 2015-2021 Jukka Lehtosalo and contributors
+# SPDX-FileCopyrightText: 2021-2024 Jeff Epler
 #
 # SPDX-License-Identifier: Apache-2.0
 

{wwvb-4.0.0a0 → wwvb-5.0.0/doc}/conf.py

@@ -16,8 +16,10 @@ import os
 import re
 import subprocess
 import sys
+import pathlib
 
-sys.path.insert(0, os.path.abspath("."))
+ROOT = pathlib.Path(__file__).absolute().parent.parent
+sys.path.insert(0, str(ROOT / "src"))
 
 
 # -- Project information -----------------------------------------------------
@@ -80,6 +82,6 @@ html_static_path = ["_static"]
 autodoc_typehints = "description"
 autodoc_class_signature = "separated"
 
-# SPDX-FileCopyrightText: 2021 Jeff Epler
+# SPDX-FileCopyrightText: 2021-2024 Jeff Epler
 #
 # SPDX-License-Identifier: GPL-3.0-only

{wwvb-4.0.0a0 → wwvb-5.0.0/doc}/index.rst

@@ -1,4 +1,4 @@
-.. SPDX-FileCopyrightText: 2021 Jeff Epler
+.. SPDX-FileCopyrightText: 2021-2024 Jeff Epler
 ..
 .. SPDX-License-Identifier: GPL-3.0-only
 

wwvb-5.0.0/pyproject.toml

@@ -0,0 +1,50 @@
+# SPDX-FileCopyrightText: 2021-2024 Jeff Epler
+#
+# SPDX-License-Identifier: GPL-3.0-only
+
+[build-system]
+requires = [
+    "setuptools>=68",
+    "setuptools_scm[toml]>=6.0",
+]
+build-backend = "setuptools.build_meta"
+[tool.setuptool]
+package_dir = {"" = "src"}
+include-package-data = true
+
+[tool.setuptools.dynamic]
+readme = {file = ["README.md"], content-type="text/markdown"}
+dependencies = {file = "requirements.txt"}
+[tool.setuptools_scm]
+write_to = "src/wwvb/__version__.py"
+[tool.ruff.lint]
+select = ["E", "F", "D", "I", "N", "UP", "YTT", "BLE", "B", "FBT", "A", "COM", "C4", "DTZ", "FA", "ISC", "ICN", "PIE", "PYI", "Q", "RET", "SIM", "TID", "TCH", "ARG", "PTH", "C", "R", "W", "FLY", "RUF", "PL"]
+ignore = ["D203", "D213", "D400", "D415", "ISC001", "E741", "C901", "PLR0911", "PLR2004", "PLR0913"]
+[tool.ruff]
+line-length = 120
+[project]
+name = "wwvb"
+authors = [{name = "Jeff Epler", email = "jepler@gmail.com"}]
+description = "Generate WWVB timecodes for any desired time"
+dynamic = ["readme","version","dependencies"]
+classifiers = [
+    "Programming Language :: Python :: 3",
+    "Programming Language :: Python :: 3.9",
+    "Programming Language :: Python :: 3.10",
+    "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: Implementation :: PyPy",
+    "Programming Language :: Python :: Implementation :: CPython",
+    "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
+    "Operating System :: OS Independent",
+]
+requires-python = ">=3.9"
+[project.urls]
+Source = "https://github.com/jepler/wwvbpy"
+Documentation = "https://github.com/jepler/wwvbpy"
+[project.scripts]
+wwvbgen = "wwvb.gen:main"
+wwvbdecode = "wwvb.decode:main"
+dut1table = "wwvb.dut1table:main"
+updateiers = "wwvb.updateiers:main"
+[project.gui-scripts]
+wwvbtk = "wwvb.wwvbtk:main"

{wwvb-4.0.0a0 → wwvb-5.0.0}/requirements-dev.txt

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2021 Jeff Epler
+# SPDX-FileCopyrightText: 2021-2024 Jeff Epler
 #
 # SPDX-License-Identifier: GPL-3.0-only
 adafruit-circuitpython-datetime
@@ -14,12 +14,12 @@ pre-commit
 python-dateutil
 requests; implementation_name=="cpython"
 setuptools>=68; implementation_name=="cpython"
-sphinx
+sphinx>=7,<8
 sphinx-autodoc-typehints
 sphinx-rtd-theme
 twine; implementation_name=="cpython"
-types-beautifulsoup4
-types-python-dateutil
-types-requests
+types-beautifulsoup4; implementation_name=="cpython"
+types-python-dateutil; implementation_name=="cpython"
+types-requests; implementation_name=="cpython"
 tzdata
 wheel

wwvb-5.0.0/requirements.txt

@@ -0,0 +1,11 @@
+# SPDX-FileCopyrightText: 2021-2024 Jeff Epler
+#
+# SPDX-License-Identifier: GPL-3.0-only
+adafruit-circuitpython-datetime
+beautifulsoup4
+click
+leapseconddata
+platformdirs
+python-dateutil
+requests
+tzdata

wwvb-5.0.0/setup.cfg

@@ -0,0 +1,4 @@
+[egg_info]
+tag_build = 
+tag_date = 0
+

{wwvb-4.0.0a0 → wwvb-5.0.0}/src/uwwvb.py

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2021 Jeff Epler
+# SPDX-FileCopyrightText: 2021-2024 Jeff Epler
 #
 # SPDX-License-Identifier: GPL-3.0-only
 

{wwvb-4.0.0a0 → wwvb-5.0.0}/src/wwvb/__init__.py

@@ -1,8 +1,7 @@
 #!/usr/bin/python3
 """A library for WWVB timecodes"""
 
-# Copyright (C) 2011-2020 Jeff Epler <jepler@gmail.com>
-# SPDX-FileCopyrightText: 2021 Jeff Epler
+# SPDX-FileCopyrightText: 2011-2024 Jeff Epler
 #
 # SPDX-License-Identifier: GPL-3.0-only
 
@@ -12,11 +11,14 @@ import datetime
 import enum
 import json
 import warnings
-from typing import Any, Generator, NamedTuple, TextIO, TypeVar
+from typing import TYPE_CHECKING, Any, NamedTuple, TextIO, TypeVar
 
 from . import iersdata
 from .tz import Mountain
 
+if TYPE_CHECKING:
+    from collections.abc import Generator
+
 HOUR = datetime.timedelta(seconds=3600)
 SECOND = datetime.timedelta(seconds=1)
 T = TypeVar("T")
@@ -871,6 +873,8 @@ def print_timecodes(
     style_chars = styles.get(style, ["0", "1", "2"])
     first = True
     for _ in range(minutes):
+        if not first and channel == "both":
+            print(file=file)
         if first or all_timecodes:
             if not first:
                 print(file=file)
@@ -888,8 +892,6 @@ def print_timecodes(
                 pfx = " " * len(pfx)
             if channel in ("phase", "both"):
                 print(f"{pfx} {tc.to_pm_string(style_chars)}", file=file)
-            if channel == "both":
-                print(file=file)
         w = w.next_minute()
 
 

{wwvb-4.0.0a0 → wwvb-5.0.0}/src/wwvb/__version__.py

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

{wwvb-4.0.0a0 → wwvb-5.0.0}/src/wwvb/decode.py

@@ -6,10 +6,13 @@
 from __future__ import annotations
 
 import sys
-from typing import Generator
+from typing import TYPE_CHECKING
 
 import wwvb
 
+if TYPE_CHECKING:
+    from collections.abc import Generator
+
 # State 1: Unsync'd
 #  Marker: State 2
 #  Other: State 1
@@ -86,5 +89,5 @@ def main() -> None:
                     print(w)
 
 
-if __name__ == "__main__":  # pragma no cover
+if __name__ == "__main__":
     main()

{wwvb-4.0.0a0 → wwvb-5.0.0}/src/wwvb/dut1table.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# SPDX-FileCopyrightText: 2021 Jeff Epler
+# SPDX-FileCopyrightText: 2021-2024 Jeff Epler
 #
 # SPDX-License-Identifier: GPL-3.0-only
 
@@ -28,5 +28,5 @@ def main() -> None:
     print(date)
 
 
-if __name__ == "__main__":  # pragma no branch
+if __name__ == "__main__":
     main()

{wwvb-4.0.0a0 → wwvb-5.0.0}/src/wwvb/gen.py

@@ -1,8 +1,7 @@
 #!/usr/bin/python3
 """A command-line program for generating wwvb timecodes"""
 
-# Copyright (C) 2011-2020 Jeff Epler <jepler@gmail.com>
-# SPDX-FileCopyrightText: 2021 Jeff Epler
+# SPDX-FileCopyrightText: 2011-2024 Jeff Epler
 #
 # SPDX-License-Identifier: GPL-3.0-only
 
@@ -124,5 +123,5 @@ def main(
         print_timecodes(w, minutes, channel, style, all_timecodes=all_timecodes, file=sys.stdout)
 
 
-if __name__ == "__main__":  # pragma no branch
+if __name__ == "__main__":
     main()

wwvb-5.0.0/src/wwvb/iersdata.json

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

wwvb-5.0.0/src/wwvb/iersdata.json.license

@@ -0,0 +1,2 @@
+SPDX-FileCopyrightText: Public domain
+SPDX-License-Identifier: CC0-1.0

wwvb-5.0.0/src/wwvb/iersdata.py

@@ -0,0 +1,37 @@
+# -*- python3 -*-
+"""Retrieve iers data, possibly from user or site data or from the wwvbpy distribution"""
+
+# SPDX-FileCopyrightText: 2011-2024 Jeff Epler
+#
+# SPDX-License-Identifier: GPL-3.0-only
+
+import binascii
+import datetime
+import gzip
+import importlib.resources
+import json
+
+import platformdirs
+
+__all__ = ["DUT1_DATA_START", "DUT1_OFFSETS", "start", "span", "end"]
+
+content: dict[str, str] = {"START": "1970-01-01", "OFFSETS_GZ": "H4sIAFNx1mYC/wMAAAAAAAAAAAA="}
+
+path = importlib.resources.files("wwvb") / "iersdata.json"
+content = json.loads(path.read_text(encoding="utf-8"))
+
+for location in [  # pragma no cover
+    platformdirs.user_data_path("wwvbpy", "unpythonic.net"),
+    platformdirs.site_data_path("wwvbpy", "unpythonic.net"),
+]:
+    path = location / "iersdata.json"
+    if path.exists():
+        content = json.loads(path.read_text(encoding="utf-8"))
+        break
+
+DUT1_DATA_START = datetime.date.fromisoformat(content["START"])
+DUT1_OFFSETS = gzip.decompress(binascii.a2b_base64(content["OFFSETS_GZ"])).decode("ascii")
+
+start = datetime.datetime.combine(DUT1_DATA_START, datetime.time(), tzinfo=datetime.timezone.utc)
+span = datetime.timedelta(days=len(DUT1_OFFSETS))
+end = start + span

{wwvb-4.0.0a0 → wwvb-5.0.0}/src/wwvb/tz.py

@@ -1,8 +1,7 @@
 # -*- python -*-
 """A library for WWVB timecodes"""
 
-# Copyright (C) 2011-2020 Jeff Epler <jepler@gmail.com>
-# SPDX-FileCopyrightText: 2021 Jeff Epler
+# SPDX-FileCopyrightText: 2021-2024 Jeff Epler
 #
 # SPDX-License-Identifier: GPL-3.0-only
 

{wwvb-4.0.0a0 → wwvb-5.0.0}/src/wwvb/updateiers.py

@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 
-# SPDX-FileCopyrightText: 2021 Jeff Epler
+# SPDX-FileCopyrightText: 2021-2024 Jeff Epler
 #
 # SPDX-License-Identifier: GPL-3.0-only
 
@@ -8,10 +8,12 @@
 
 from __future__ import annotations
 
+import binascii
 import csv
 import datetime
+import gzip
 import io
-import itertools
+import json
 import pathlib
 from typing import Callable
 
@@ -20,15 +22,7 @@ import click
 import platformdirs
 import requests
 
-DIST_PATH = pathlib.Path(__file__).parent / "iersdata_dist.py"
-
-OLD_TABLE_START: datetime.date | None = None
-OLD_TABLE_END: datetime.date | None = None
-if DIST_PATH.exists():
-    import wwvb.iersdata_dist
-
-    OLD_TABLE_START = wwvb.iersdata_dist.DUT1_DATA_START
-    OLD_TABLE_END = OLD_TABLE_START + datetime.timedelta(days=len(wwvb.iersdata_dist.DUT1_OFFSETS) - 1)
+DIST_PATH = pathlib.Path(__file__).parent / "iersdata.json"
 
 IERS_URL = "https://datacenter.iers.org/data/csv/finals2000A.all.csv"
 IERS_PATH = pathlib.Path("finals2000A.all.csv")
@@ -47,7 +41,7 @@ def _get_text(url: str) -> str:
         return pathlib.Path(url).read_text(encoding="utf-8")
 
 
-def update_iersdata(  # noqa: PLR0915, PLR0912
+def update_iersdata(  # noqa: PLR0915
     target_path: pathlib.Path,
 ) -> None:
     """Update iersdata.py"""
@@ -124,57 +118,25 @@ def update_iersdata(  # noqa: PLR0915, PLR0912
     assert wwvb_start is not None
     patch(wwvb_start, wwvb_data_stamp + datetime.timedelta(days=1), wwvb_dut1)
 
-    with target_path.open("w", encoding="utf-8") as output:
-
-        def code(*args: str) -> None:
-            """Print to the output file"""
-            print(*args, file=output)
-
-        code("# -*- python3 -*-")
-        code("# fmt: off")
-        code('"""File generated from public data - not subject to copyright"""')
-        code("# SPDX" + "-FileCopyrightText: Public domain")
-        code("# SPDX" + "-License-Identifier: CC0-1.0")
-        code("# isort: skip_file")
-        code("import datetime")
-
-        code("__all__ = ['DUT1_DATA_START', 'DUT1_OFFSETS']")
-        code(f"DUT1_DATA_START = {table_start!r}")
-        c = sorted(chr(ord("a") + ch + 10) for ch in set(offsets))
-        code(f"{','.join(c)} = tuple({''.join(c)!r})")
-        code(f"DUT1_OFFSETS = str( # {table_start.year:04d}{table_start.month:02d}{table_start.day:02d}")
-        line = ""
-        j = 0
-
-        for val, it in itertools.groupby(offsets):
-            part = ""
-            ch = chr(ord("a") + val + 10)
-            sz = len(list(it))
-            if j:
-                part = part + "+"
-            part = part + ch if sz < 2 else part + f"{ch}*{sz}"
-            j += sz
-            if len(line + part) > 60:
-                d = table_start + datetime.timedelta(j - 1)
-                code(f"    {line:<60s} # {d.year:04d}{d.month:02d}{d.day:02d}")
-                line = part
-            else:
-                line = line + part
-        d = table_start + datetime.timedelta(j - 1)
-        code(f"    {line:<60s} # {d.year:04d}{d.month:02d}{d.day:02d}")
-        code(")")
     table_end = table_start + datetime.timedelta(len(offsets) - 1)
-    if OLD_TABLE_START:
-        print(f"old iersdata covered {OLD_TABLE_START} .. {OLD_TABLE_END}")
+    base = ord("a") + 10
+    offsets_bin = bytes(base + ch for ch in offsets)
+
+    target_path.write_text(
+        json.dumps(
+            {
+                "START": table_start.isoformat(),
+                "OFFSETS_GZ": binascii.b2a_base64(gzip.compress(offsets_bin)).decode("ascii").strip(),
+            },
+        ),
+    )
+
     print(f"iersdata covers {table_start} .. {table_end}")
 
 
 def iersdata_path(callback: Callable[[str, str], pathlib.Path]) -> pathlib.Path:
     """Find out the path for this directory"""
-    print("iersdata_path", callback)
-    r = callback("wwvbpy", "unpythonic.net") / "wwvb_iersdata.py"
-    print(f"iersdata_path {r=!r}")
-    return r
+    return callback("wwvbpy", "unpythonic.net") / "iersdata.json"
 
 
 @click.command()

{wwvb-4.0.0a0 → wwvb-5.0.0}/src/wwvb/wwvbtk.py

@@ -1,8 +1,7 @@
 #!/usr/bin/python3
 """Visualize the WWVB signal in realtime"""
 
-# Copyright (C) 2011-2020 Jeff Epler <jepler@gmail.com>
-# SPDX-FileCopyrightText: 2021 Jeff Epler
+# SPDX-FileCopyrightText: 2021-2024 Jeff Epler
 #
 # SPDX-License-Identifier: GPL-3.0-only
 from __future__ import annotations
@@ -11,12 +10,15 @@ import functools
 import threading
 import time
 from tkinter import Canvas, TclError, Tk
-from typing import Any, Generator
+from typing import TYPE_CHECKING, Any
 
 import click
 
 import wwvb
 
+if TYPE_CHECKING:
+    from collections.abc import Generator
+
 
 @functools.cache
 def _app() -> Tk: