wwvb 4.0.0a0__py3-none-any.whl → 5.0.0__py3-none-any.whl

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/__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/__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/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/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/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/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/iersdata.json.license

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

wwvb/iersdata.py

@@ -1,28 +1,37 @@
 # -*- python3 -*-
 """Retrieve iers data, possibly from user or site data or from the wwvbpy distribution"""
 
-# Copyright (C) 2021 Jeff Epler <jepler@gmail.com>
-# SPDX-FileCopyrightText: 2021 Jeff Epler
+# SPDX-FileCopyrightText: 2011-2024 Jeff Epler
 #
 # SPDX-License-Identifier: GPL-3.0-only
 
+import binascii
 import datetime
-import pathlib
+import gzip
+import importlib.resources
+import json
 
 import platformdirs
 
 __all__ = ["DUT1_DATA_START", "DUT1_OFFSETS", "start", "span", "end"]
-from .iersdata_dist import DUT1_DATA_START, DUT1_OFFSETS
 
-for location in [
-    platformdirs.user_data_dir("wwvbpy", "unpythonic.net"),
-    platformdirs.site_data_dir("wwvbpy", "unpythonic.net"),
-]:  # pragma no cover
-    path = pathlib.Path(location) / "wwvbpy_iersdata.py"
+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():
-        exec(path.read_text(encoding="utf-8"), globals(), globals())
+        content = json.loads(path.read_text(encoding="utf-8"))
         break
 
-start = datetime.datetime.combine(DUT1_DATA_START, datetime.time()).replace(tzinfo=datetime.timezone.utc)
+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/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/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/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:

{wwvb-4.0.0a0.dist-info → wwvb-5.0.0.dist-info}/METADATA

@@ -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-5.0.0.dist-info/RECORD

@@ -0,0 +1,18 @@
+uwwvb.py,sha256=dyYlxZ6tIlcbKsWExNHKA8OtRfbziaCy5Xcj_97bGtA,5737
+wwvb/__init__.py,sha256=rDpr-XLoMld473qP-ufDunQxiDbLQDeS6eN7NOBtW84,30790
+wwvb/__version__.py,sha256=U7HnWMtKn0QTFHRJAzsVjr4cELMq3Toi6P5afKP6ah0,411
+wwvb/decode.py,sha256=llTLKBW49nl6COheM90NsyMnTNeVApl2oeCHtl6Tf3w,2759
+wwvb/dut1table.py,sha256=HVX1338RlQzAQ-bsMPEdmCqoyIxSWoJSoRu1YGyaJO4,875
+wwvb/gen.py,sha256=_fpUypu_2nZfG5Vjnya0B8C26nk1WOhnLMTCXwskAHs,3720
+wwvb/iersdata.json,sha256=cutY_J5jElAyLBsxfcDnP0eHY5fkQQ8Y1nDO77uEU4I,770
+wwvb/iersdata.json.license,sha256=1k5fhRCuOn0yXbwHtB21G0Nntnf0qMxstflMHuK3-Js,71
+wwvb/iersdata.py,sha256=_PSnGhNS5QU4AAk_aFbmR4Jru0pK_y-5JtNL6pAwtT8,1210
+wwvb/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+wwvb/tz.py,sha256=nlxKnzFPmqLLtC-cEDhWaJ3v3GCSPfqzVtUMf8EEdZ0,248
+wwvb/updateiers.py,sha256=2kIzgLD_109EpapdscZj7dGt8z-KzE7Yp4LhRi5NW7Q,5671
+wwvb/wwvbtk.py,sha256=QBJntkgLJPPjsxYC0szDZZXajijUbuwEmU_mjGEJ4GI,4599
+wwvb-5.0.0.dist-info/METADATA,sha256=nOmRifOcCGG1uEgKgr607Fxw-9vB8osk8IL1VBSQwug,10382
+wwvb-5.0.0.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+wwvb-5.0.0.dist-info/entry_points.txt,sha256=KSevvHWLEKxOxUQ-L-OQidD4Sj2BPEfhZ2TQhOgyys4,179
+wwvb-5.0.0.dist-info/top_level.txt,sha256=0IYdkhEAMgurpv_F-76rlyn4GdxepGFzG99tivVdQVU,11
+wwvb-5.0.0.dist-info/RECORD,,

{wwvb-4.0.0a0.dist-info → wwvb-5.0.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.3.0)
+Generator: setuptools (75.2.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

wwvb/iersdata_dist.py

@@ -1,38 +0,0 @@
-# -*- python3 -*-
-# fmt: off
-"""File generated from public data - not subject to copyright"""
-# SPDX-FileCopyrightText: Public domain
-# SPDX-License-Identifier: CC0-1.0
-# isort: skip_file
-import datetime
-__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")
-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
-    +k*37+j*33+i*34+h*15+r*22+q*34+p*33+o*34+n*37+m*49+l*45+k*36 # 19751118
-    +j*32+i*36+h*7+r*28+q*33+p*32+o*30+n*33+m*42+l*42+k*34+j*29  # 19761201
-    +i*33+h*30+r*6+q*36+p*34+o*31+n*32+m*42+l*51+k*37+j*32+i*33  # 19771231
-    +h*31+q*32+p*29+o*29+n*30+m*32+l*47+k*47+j*36+i*33+h*32+g*18 # 19790116
-    +q*16+p*35+o*33+n*32+m*35+l*45+k*51+j*39+i*39+h*38+g*2+q*40  # 19800319
-    +p*39+o*38+n*43+m*57+l*50+k*39+j*42+i*41+h*43+g*37+f*39+e*39 # 19810719
-    +o*19+n*62+m*43+l*45+k*48+j*44+i*39+h*44+g*21+q*44+p*48+o*43 # 19821223
-    +n*41+m*36+l*34+k*34+j*38+i*47+s+r*64+q*50+p*42+o*56+n*57    # 19840517
-    +m*52+l*100+k*61+j*62+i*66+h*52+g*67+f+p*103+o*56+n*68+m*69  # 19860807
-    +l*107+k*82+j*72+i*67+h*63+g*113+f*63+e*51+o*11+n*60+m*59    # 19880907
-    +l*121+k*71+j*71+i*67+h*57+g*93+f*61+e*48+d*12+n*41+m*44     # 19900511
-    +l*46+k*61+j*66+i*47+h*45+g*15+q*32+p*44+o*41+n*48+m*74+l*49 # 19911129
-    +k*45+j*44+i*40+h*37+g*38+f*50+e*5+o*60+n*49+m*40+l*40+k*38  # 19930322
-    +j*38+i*36+h*39+g*25+q*31+p*50+o*41+n*41+m*43+l*41+k*39+j*40 # 19940630
-    +i*39+s*24+r*57+q*43+p*41+o*39+n*38+m*35+l*37+k*43+j*69+i*44 # 19951124
-    +h*42+g*37+q*4+p*51+o*45+n*44+m*69+l*70+k*50+j*54+i*53+h*40  # 19970612
-    +g*49+f*18+p*59+o*53+n*52+m*57+l*48+k*53+j*127+i*70+h*30     # 19990303
-    +r*62+q*79+p*152+o*82+n*106+m*184+l*125+k*217+j*133+i*252    # 20030402
-    +h*161+g*392+f*322+e*290+n*116+m*154+l*85+k*83+j*91+i*168    # 20080312
-    +h*105+g*147+f*105+e*42+o*70+n*91+m*154+l*119+k*84+j*217     # 20110511
-    +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*768+l*47+k*3+l*4+k*252,                  # 20250705
-)