wwvb 7.0.0__py3-none-any.whl → 8.0.0rc2__py3-none-any.whl

wwvb/__init__.py

@@ -20,15 +20,30 @@ import enum
 import json
 import warnings
 from dataclasses import dataclass
-from typing import ClassVar
+from typing import ClassVar, Literal
 
 from . import iersdata
 from .tz import Mountain
 
+WWVBChannel = Literal["amplitude", "phase", "both"]
+
 TYPE_CHECKING = False
 if TYPE_CHECKING:
     from collections.abc import Generator
-    from typing import Any, Self, TextIO, TypeVar
+    from typing import NotRequired, Self, TextIO, TypedDict, TypeVar
+
+    class JsonMinute(TypedDict):
+        """Implementation detail
+
+        This is the Python object type that is serialized by `print_timecodes_json`
+        """
+
+        year: int
+        days: int
+        hour: int
+        minute: int
+        amplitude: NotRequired[str]
+        phase: NotRequired[str]
 
     T = TypeVar("T")
 
@@ -787,7 +802,12 @@ class WWVBMinuteIERS(WWVBMinute):
 
 
 def _bcd_bits(n: int) -> Generator[bool]:
-    """Return the bcd representation of n, starting with the least significant bit"""
+    """Return the (infinite) bcd representation of n, starting with the least significant bit
+
+    This continues to yield `False` forever after the nonzero bcd digits have been genrated.
+    This allows to `zip(strict=False)` the resulting bits together with a sequence of indices
+    and ensure all the upper bits are set to zero.
+    """
     while True:
         d = n % 10
         n = n // 10
@@ -866,7 +886,7 @@ class WWVBTimecode:
         Treating 'poslist' as a sequence of indices, update the AM signal with the value as a BCD number
         """
         pos = list(poslist)[::-1]
-        for p, b in zip(pos, _bcd_bits(v)):
+        for p, b in zip(pos, _bcd_bits(v), strict=False):
             if b:
                 self.am[p] = AmplitudeModulation.ONE
             else:
@@ -894,7 +914,7 @@ class WWVBTimecode:
                 return ("⁰", "¹", "²", "¿")[am]
             return ("₀", "₁", "₂", "⸮")[am]
 
-        return "".join(convert_one(i, j) for i, j in zip(self.am, self.phase))
+        return "".join(convert_one(i, j) for i, j in zip(self.am, self.phase, strict=True))
 
     def __repr__(self) -> str:
         """Implement repr()"""
@@ -912,7 +932,7 @@ class WWVBTimecode:
 
     def to_both_string(self, charset: list[str]) -> str:
         """Convert both channels to a string"""
-        return "".join(charset[i + j * 3] for i, j in zip(self.am, self.phase))
+        return "".join(charset[i + j * 3] for i, j in zip(self.am, self.phase, strict=True))
 
 
 styles = {
@@ -927,7 +947,7 @@ styles = {
 def print_timecodes(
     w: WWVBMinute,
     minutes: int,
-    channel: str,
+    channel: WWVBChannel,
     style: str,
     file: TextIO,
     *,
@@ -964,7 +984,7 @@ def print_timecodes(
 def print_timecodes_json(
     w: WWVBMinute,
     minutes: int,
-    channel: str,
+    channel: WWVBChannel,
     file: TextIO,
 ) -> None:
     """Print a range of timecodes in JSON format.
@@ -984,7 +1004,7 @@ def print_timecodes_json(
     """
     result = []
     for _ in range(minutes):
-        data: dict[str, Any] = {
+        data: JsonMinute = {
             "year": w.year,
             "days": w.days,
             "hour": w.hour,

wwvb/__version__.py

@@ -28,7 +28,7 @@ version_tuple: VERSION_TUPLE
 commit_id: COMMIT_ID
 __commit_id__: COMMIT_ID
 
-__version__ = version = '7.0.0'
-__version_tuple__ = version_tuple = (7, 0, 0)
+__version__ = version = '8.0.0rc2'
+__version_tuple__ = version_tuple = (8, 0, 0, 'rc2')
 
 __commit_id__ = commit_id = None

wwvb/decode.py

@@ -6,10 +6,10 @@
 from __future__ import annotations
 
 import sys
-from typing import TYPE_CHECKING
 
 import wwvb
 
+TYPE_CHECKING = False
 if TYPE_CHECKING:
     from collections.abc import Generator
 

wwvb/gen.py

@@ -9,15 +9,18 @@ from __future__ import annotations
 
 import datetime
 import sys
-from typing import Any
 
 import click
 import dateutil.parser
 
 from . import WWVBMinute, WWVBMinuteIERS, print_timecodes, print_timecodes_json, styles
 
+TYPE_CHECKING = False
+if TYPE_CHECKING:
+    from . import WWVBChannel
 
-def parse_timespec(ctx: Any, param: Any, value: list[str]) -> datetime.datetime:  # noqa: ARG001
+
+def parse_timespec(ctx: click.Context, param: click.Parameter, value: list[str]) -> datetime.datetime:  # noqa: ARG001
     """Parse a time specifier from the commandline"""
     try:
         if len(value) == 5:
@@ -95,7 +98,7 @@ def main(
     dut1: int,
     minutes: int,
     style: str,
-    channel: str,
+    channel: WWVBChannel,
     all_timecodes: bool,
     timespec: datetime.datetime,
 ) -> None:

wwvb/iersdata.json

@@ -1 +1 @@
-{"START": "1972-01-01", "OFFSETS_GZ": "H4sIAOvijWgC/+2aa3LDMAiEL5uHLTuxnN5/pn/aTmfSSiAWhGy+E2SWZQE58zwiH/1YivB/96vMXiIX2Io8CTyIrDSWGqlMRdrpDa6aJFnr0m4wYZkCE2UmSF0V+13vBveStK6JTfQyW3O86HLJf0RvDgy5u4FCI+WVKTsVoUdHzsrRoWRfYHIItZ5EEgu0Beu58EgEpMpO9zf4/s3iNO4y7/hqEwOZIPu3+PuO2T7Ic5E8GxsnZHvUYOtELxW1WP+0yx/caFxpyAooq6lq06UEr+UkLeXOIDPZ6EBrqb5K8Tvu6/B9CdnZqFQL05s2KauWy/IeF/tJGAisjK9MgGyDuUkRq4G1gRE+VjA30uZNPsdantkgMq58QO4fw+sqzj+A2/16mmvnyy9UzDvMktDgKYlnkFeB2rx+wNANG40aA4OgsY03AWoDCVs/XMmkyQ0+0jWaUqPdwA0m/MRuccGjCwirHToWzbcs8P7U1nZZLSYdHapWu5HqVg1YjK2fPEwvPZPzLPUF848tyid2u7dh8B7h+wVQ923Q+kqxZe3JclSSB+YTM3nnHrjgFth/vzgZzw6cbOMYa4bHFPU/DR3mp/ubKM4cgwMnHZW4GFxFprOVcevAKGva6oExn1MOmyGDJQPm0rpU8bjqdOo993O6Xz9ofToZela5vwrWoTn4l4o5CIIaKejCEgSnJv784V+zUyyvbb/gE8h8bi3oTQAA"}
+{"START": "1972-01-01", "OFFSETS_GZ": "H4sIAJLBtmgC/+2aa3LDMAiEL5uHLTuxnN5/pn/aTmfSSiAWhGy+E2SWZQE58zwiH/1YivB/96vMXiIX2Io8CTyIrDSWGqlMRdrpDa6aJFnr0m4wYZkCE2UmSF0V+13vBveStK6JTfQyW3O86HLJf0RvDgy5u4FCI+WVKTsVoUdHzsrRoWRfYHIItZ5EEgu0Beu58EgEpMpO9zf4/s3iNO4y7/hqEwOZIPu3+PuO2T7Ic5E8GxsnZHvUYOtELxW1WP+0yx/caFxpyAooq6lq06UEr+UkLeXOIDPZ6EBrqb5K8Tvu6/B9CdnZqFQL05s2KauWy/IeF/tJGAisjK9MgGyDuUkRq4G1gRE+VjA30uZNPsdantkgMq58QO4fw+sqzj+A2/16mmvnyy9UzDvMktDgKYlnkFeB2rx+wNANG40aA4OgsY03AWoDCVs/XMmkyQ0+0jWaUqPdwA0m/MRuccGjCwirHToWzbcs8P7U1nZZLSYdHapWu5HqVg1YjK2fPEwvPZPzLPUF848tyid2u7dh8B7h+wVQ923Q+kqxZe3JclSSB+YTM3nnHrjgFth/vzgZzw6cbOMYa4bHFPU/DR3mp/ubKM4cgwMnHZW4GFxFprOVcevAKGva6oExn1MOmyGDJQPm0rpU8bjqdOo993O6Xz9ofToZela5vwrWoTn4l4o5CIIaKejCEgSnJv784V+z0yyz2F/zCTF9VskETgAA"}

wwvb/updateiers.py

@@ -15,13 +15,16 @@ import gzip
 import io
 import json
 import pathlib
-from typing import Callable
+from typing import TYPE_CHECKING
 
 import bs4
 import click
 import platformdirs
 import requests
 
+if TYPE_CHECKING:
+    from collections.abc import Callable
+
 DIST_PATH = pathlib.Path(__file__).parent / "iersdata.json"
 
 IERS_URL = "https://datacenter.iers.org/data/csv/finals2000A.all.csv"

wwvb/wwvbtk.py

@@ -8,13 +8,13 @@ from __future__ import annotations
 
 import datetime
 import functools
-from tkinter import Canvas, TclError, Tk
-from typing import TYPE_CHECKING, Any
+from tkinter import Canvas, Event, TclError, Tk
 
 import click
 
 import wwvb
 
+TYPE_CHECKING = False
 if TYPE_CHECKING:
     from collections.abc import Generator
 
@@ -25,7 +25,7 @@ def _app() -> Tk:
     return Tk()
 
 
-def validate_colors(ctx: Any, param: Any, value: str) -> list[str]:  # noqa: ARG001
+def validate_colors(ctx: click.Context, param: click.Parameter, value: str) -> list[str]:  # noqa: ARG001
     """Check that all colors in a string are valid, splitting it to a list"""
     app = _app()
     colors = value.split()
@@ -106,7 +106,7 @@ def main(colors: list[str], size: int, min_size: int | None) -> None:  # noqa: P
     canvas.pack(fill="both", expand=True)
     app.wm_deiconify()
 
-    def resize_canvas(event: Any) -> None:
+    def resize_canvas(event: Event) -> None:
         """Keep the circle filling the window when it is resized"""
         sz = min(event.width, event.height) - 8
         if sz < 0:
@@ -141,10 +141,12 @@ def main(colors: list[str], size: int, min_size: int | None) -> None:  # noqa: P
 
     controller = controller_func().__next__
 
+    # pyrefly: ignore  # bad-assignment
     def after_func() -> None:
         """Repeatedly run the controller after the desired interval"""
         app.after(controller(), after_func)
 
+    # pyrefly: ignore  # bad-argument-type
     app.after_idle(after_func)
     app.mainloop()
 

{wwvb-7.0.0.dist-info → wwvb-8.0.0rc2.dist-info}/METADATA

@@ -1,19 +1,16 @@
 Metadata-Version: 2.4
 Name: wwvb
-Version: 7.0.0
+Version: 8.0.0rc2
 Summary: Generate WWVB timecodes for any desired time
 Author-email: Jeff Epler <jepler@gmail.com>
-Project-URL: Source, https://github.com/jepler/wwvbpy
-Project-URL: Documentation, https://github.com/jepler/wwvbpy
+Project-URL: Source, https://codeberg.org/jepler/wwvbpy
+Project-URL: Documentation, https://wwvbpy.readthedocs.io/en/latest/
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: Implementation :: PyPy
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: License :: OSI Approved :: GNU General Public License v3 (GPLv3)
 Classifier: Operating System :: OS Independent
-Requires-Python: >=3.9
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 Requires-Dist: adafruit-circuitpython-datetime
 Requires-Dist: beautifulsoup4
@@ -29,11 +26,7 @@ SPDX-FileCopyrightText: 2021-2024 Jeff Epler
 
 SPDX-License-Identifier: GPL-3.0-only
 -->
-[![Test wwvbgen](https://github.com/jepler/wwvbpy/actions/workflows/test.yml/badge.svg)](https://github.com/jepler/wwvbpy/actions/workflows/test.yml)
-[![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)
-[![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
 
@@ -63,7 +56,7 @@ The package includes:
 
 # Development status
 
-The author ([@jepler](https://github.com/jepler)) occasionally develops and maintains this project, but
+The author ([@jepler](https://unpythonic.net)) occasionally develops and maintains this project, but
 issues are not likely to be acted on.  They would be interested in adding
 co-maintainer(s).
 

wwvb-8.0.0rc2.dist-info/RECORD

@@ -0,0 +1,18 @@
+uwwvb.py,sha256=Ybf8DeOZ5VjfqRGtO90_oEEW6HhGaztIVlh4L423MdQ,5801
+wwvb/__init__.py,sha256=aFz_HXvOD5D4k_pWDgHA_kTWkBz-s3Ed5qY6W6MmuKE,34127
+wwvb/__version__.py,sha256=BQnZGkrpqxv2i40P0cKXrysqXuu3x1wKpbxl8fOcQu8,714
+wwvb/decode.py,sha256=JQw8XT9AoXlJAl16JRZzjECUPfA7jLhDxI-_XSibzbc,2748
+wwvb/dut1table.py,sha256=HVX1338RlQzAQ-bsMPEdmCqoyIxSWoJSoRu1YGyaJO4,875
+wwvb/gen.py,sha256=iMTYLtyy3ItC4AplTakkOhHNHzDFVmApjlVwYIK72nI,3798
+wwvb/iersdata.json,sha256=lUMrygiih4_ItKX_t8Hqnx5bt9_1D1jocPycbtzOfhE,769
+wwvb/iersdata.json.license,sha256=1k5fhRCuOn0yXbwHtB21G0Nntnf0qMxstflMHuK3-Js,71
+wwvb/iersdata.py,sha256=nMqA1xcE-iPtmi9m5qcTIJwfsCxZwoNsxHfM-wvooMQ,1210
+wwvb/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+wwvb/tz.py,sha256=nlxKnzFPmqLLtC-cEDhWaJ3v3GCSPfqzVtUMf8EEdZ0,248
+wwvb/updateiers.py,sha256=WsyFqkoxlvJS70dwW8vQhMseVACX0VwQRWWm2NyfV4Y,5846
+wwvb/wwvbtk.py,sha256=cFBUduN8rQEdrpB0NtHK5r8HNDYfg_3XD7mbhYrVSrk,5284
+wwvb-8.0.0rc2.dist-info/METADATA,sha256=sgVxOqNBSjlsAdw02aZJMSxkACg7GCBmXs8O5Fc7kww,9467
+wwvb-8.0.0rc2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+wwvb-8.0.0rc2.dist-info/entry_points.txt,sha256=KSevvHWLEKxOxUQ-L-OQidD4Sj2BPEfhZ2TQhOgyys4,179
+wwvb-8.0.0rc2.dist-info/top_level.txt,sha256=0IYdkhEAMgurpv_F-76rlyn4GdxepGFzG99tivVdQVU,11
+wwvb-8.0.0rc2.dist-info/RECORD,,

wwvb-7.0.0.dist-info/RECORD

@@ -1,18 +0,0 @@
-uwwvb.py,sha256=Ybf8DeOZ5VjfqRGtO90_oEEW6HhGaztIVlh4L423MdQ,5801
-wwvb/__init__.py,sha256=tSEjmfqKR0KYdN7tUySGcXpK_W8rzQTtEXG7P_0WPMA,33432
-wwvb/__version__.py,sha256=lB_6pZBic6H_5wY9p7_cc7miE65gtXFl65pORFxuiX0,704
-wwvb/decode.py,sha256=llTLKBW49nl6COheM90NsyMnTNeVApl2oeCHtl6Tf3w,2759
-wwvb/dut1table.py,sha256=HVX1338RlQzAQ-bsMPEdmCqoyIxSWoJSoRu1YGyaJO4,875
-wwvb/gen.py,sha256=_fpUypu_2nZfG5Vjnya0B8C26nk1WOhnLMTCXwskAHs,3720
-wwvb/iersdata.json,sha256=fEElNoF4UJMySnUvNXFlI9TT9k67jdrrGKzO6A1F2rQ,769
-wwvb/iersdata.json.license,sha256=1k5fhRCuOn0yXbwHtB21G0Nntnf0qMxstflMHuK3-Js,71
-wwvb/iersdata.py,sha256=nMqA1xcE-iPtmi9m5qcTIJwfsCxZwoNsxHfM-wvooMQ,1210
-wwvb/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wwvb/tz.py,sha256=nlxKnzFPmqLLtC-cEDhWaJ3v3GCSPfqzVtUMf8EEdZ0,248
-wwvb/updateiers.py,sha256=q3QY--fj06HJ9wCRCmVQK7pCpdXhCudP8BdUPG5WWOA,5781
-wwvb/wwvbtk.py,sha256=cdLwWfulywHmGhaiK6L-m_QQAdpfDfyDFagbe_Y8Rgk,5186
-wwvb-7.0.0.dist-info/METADATA,sha256=6oqjB6nkDQAYeoe8hGbSq5jk9Cj7q9swibX6jubJ-b4,10201
-wwvb-7.0.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-wwvb-7.0.0.dist-info/entry_points.txt,sha256=KSevvHWLEKxOxUQ-L-OQidD4Sj2BPEfhZ2TQhOgyys4,179
-wwvb-7.0.0.dist-info/top_level.txt,sha256=0IYdkhEAMgurpv_F-76rlyn4GdxepGFzG99tivVdQVU,11
-wwvb-7.0.0.dist-info/RECORD,,