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

wwvb/updateiers.py

@@ -6,32 +6,34 @@
 
 """Update the DUT1 and LS data based on online sources"""
 
+from __future__ import annotations
+
 import csv
 import datetime
 import io
 import itertools
-import os
 import pathlib
-from typing import Callable, List, Optional
+from typing import Callable
 
 import bs4
 import click
 import platformdirs
 import requests
 
-DIST_PATH = str(pathlib.Path(__file__).parent / "iersdata_dist.py")
+DIST_PATH = pathlib.Path(__file__).parent / "iersdata_dist.py"
 
-OLD_TABLE_START: Optional[datetime.date] = None
-OLD_TABLE_END: Optional[datetime.date] = None
-if os.path.exists(DIST_PATH):
+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)
 
 IERS_URL = "https://datacenter.iers.org/data/csv/finals2000A.all.csv"
-if os.path.exists("finals2000A.all.csv"):
-    IERS_URL = "finals2000A.all.csv"
+IERS_PATH = pathlib.Path("finals2000A.all.csv")
+if IERS_PATH.exists():
+    IERS_URL = str(IERS_PATH)
     print("using local", IERS_URL)
 NIST_URL = "https://www.nist.gov/pml/time-and-frequency-division/atomic-standards/leap-second-and-ut1-utc-information"
 
@@ -42,15 +44,14 @@ def _get_text(url: str) -> str:
         with requests.get(url, timeout=30) as response:
             return response.text
     else:
-        return open(url, encoding="utf-8").read()
+        return pathlib.Path(url).read_text(encoding="utf-8")
 
 
-def update_iersdata(  # pylint: disable=too-many-locals, too-many-branches, too-many-statements
-    target_file: str,
+def update_iersdata(  # noqa: PLR0915, PLR0912
+    target_path: pathlib.Path,
 ) -> None:
     """Update iersdata.py"""
-
-    offsets: List[int] = []
+    offsets: list[int] = []
     iersdata_text = _get_text(IERS_URL)
     for r in csv.DictReader(io.StringIO(iersdata_text), delimiter=";"):
         jd = float(r["MJD"])
@@ -97,11 +98,11 @@ def update_iersdata(  # pylint: disable=too-many-locals, too-many-branches, too-
         off_end = (patch_end - table_start).days
         offsets[off_start:off_end] = [val] * (off_end - off_start)
 
-    wwvb_dut1: Optional[int] = None
-    wwvb_start: Optional[datetime.date] = None
+    wwvb_dut1: int | None = None
+    wwvb_start: datetime.date | None = None
     for row in wwvb_dut1_table.findAll("tr")[1:][::-1]:
         cells = row.findAll("td")
-        when = datetime.datetime.strptime(cells[0].text, "%Y-%m-%d").date()
+        when = datetime.datetime.strptime(cells[0].text + "+0000", "%Y-%m-%d%z").date()
         dut1 = cells[2].text.replace("s", "").replace(" ", "")
         dut1 = int(round(float(dut1) * 10))
         if wwvb_dut1 is not None:
@@ -123,25 +124,24 @@ def update_iersdata(  # pylint: disable=too-many-locals, too-many-branches, too-
     assert wwvb_start is not None
     patch(wwvb_start, wwvb_data_stamp + datetime.timedelta(days=1), wwvb_dut1)
 
-    with open(target_file, "wt", encoding="utf-8") as output:
+    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("# fmt: off")
         code("# isort: skip_file")
-        code("# pylint: disable=invalid-name")
         code("import datetime")
 
         code("__all__ = ['DUT1_DATA_START', 'DUT1_OFFSETS']")
-        code(f"DUT1_DATA_START = {repr(table_start)}")
+        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({repr(''.join(c))})")
+        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
@@ -152,10 +152,7 @@ def update_iersdata(  # pylint: disable=too-many-locals, too-many-branches, too-
             sz = len(list(it))
             if j:
                 part = part + "+"
-            if sz < 2:
-                part = part + ch
-            else:
-                part = part + f"{ch}*{sz}"
+            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)
@@ -172,25 +169,30 @@ def update_iersdata(  # pylint: disable=too-many-locals, too-many-branches, too-
     print(f"iersdata covers {table_start} .. {table_end}")
 
 
-def iersdata_path(callback: Callable[[str, str], str]) -> str:
+def iersdata_path(callback: Callable[[str, str], pathlib.Path]) -> pathlib.Path:
     """Find out the path for this directory"""
-    return os.path.join(callback("wwvbpy", "unpythonic.net"), "wwvb_iersdata.py")
+    print("iersdata_path", callback)
+    r = callback("wwvbpy", "unpythonic.net") / "wwvb_iersdata.py"
+    print(f"iersdata_path {r=!r}")
+    return r
 
 
 @click.command()
 @click.option(
     "--user",
     "location",
-    flag_value=iersdata_path(platformdirs.user_data_dir),
-    default=iersdata_path(platformdirs.user_data_dir),
+    flag_value=iersdata_path(platformdirs.user_data_path),
+    default=iersdata_path(platformdirs.user_data_path),
+    type=pathlib.Path,
 )
 @click.option("--dist", "location", flag_value=DIST_PATH)
-@click.option("--site", "location", flag_value=iersdata_path(platformdirs.site_data_dir))
+@click.option("--site", "location", flag_value=iersdata_path(platformdirs.site_data_path))
 def main(location: str) -> None:
     """Update DUT1 data"""
-    print("will write to", location)
-    os.makedirs(os.path.dirname(location), exist_ok=True)
-    update_iersdata(location)
+    path = pathlib.Path(location)
+    print(f"will write to {location!r}")
+    path.parent.mkdir(parents=True, exist_ok=True)
+    update_iersdata(path)
 
 
 if __name__ == "__main__":

wwvb/wwvbtk.py

@@ -5,12 +5,13 @@
 # SPDX-FileCopyrightText: 2021 Jeff Epler
 #
 # SPDX-License-Identifier: GPL-3.0-only
+from __future__ import annotations
 
 import functools
 import threading
 import time
-from tkinter import Canvas, TclError, Tk  # pylint: disable=import-error
-from typing import Any, Generator, Optional, Tuple
+from tkinter import Canvas, TclError, Tk
+from typing import Any, Generator
 
 import click
 
@@ -23,9 +24,7 @@ def _app() -> Tk:
     return Tk()
 
 
-def validate_colors(  # pylint: disable=unused-argument
-    ctx: Any, param: Any, value: str
-) -> list[str]:
+def validate_colors(ctx: Any, param: Any, 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()
@@ -55,9 +54,8 @@ DEFAULT_COLORS = "#3c3c3c #3c3c3c #3c3c3c #cc3c3c #88883c #3ccc3c"
 @click.option("--colors", callback=validate_colors, default=DEFAULT_COLORS)
 @click.option("--size", default=48)
 @click.option("--min-size", default=None)
-def main(colors: list[str], size: int, min_size: Optional[int]) -> None:
+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
 
@@ -67,7 +65,7 @@ def main(colors: list[str], size: int, min_size: Optional[int]) -> None:
         if deadline > now:
             time.sleep(deadline - now)
 
-    def wwvbtick() -> Generator[Tuple[float, wwvb.AmplitudeModulation], None, None]:
+    def wwvbtick() -> Generator[tuple[float, wwvb.AmplitudeModulation], None, None]:
         """Yield consecutive values of the WWVB amplitude signal, going from minute to minute"""
         timestamp = time.time() // 60 * 60
 
@@ -79,13 +77,15 @@ def main(colors: list[str], size: int, min_size: Optional[int]) -> None:
                 yield timestamp + i, code
             timestamp = timestamp + 60
 
-    def wwvbsmarttick() -> Generator[Tuple[float, wwvb.AmplitudeModulation], None, None]:
-        """Yield consecutive values of the WWVB amplitude signal but deal with time
-        progressing unexpectedly, such as when the computer is suspended or NTP steps
-        the clock backwards
+    def wwvbsmarttick() -> Generator[tuple[float, wwvb.AmplitudeModulation], None, None]:
+        """Yield consecutive values of the WWVB amplitude signal
+
+        .. but deal with time progressing unexpectedly, such as when the
+        computer is suspended or NTP steps the clock backwards
 
         When time goes backwards or advances by more than a minute, get a fresh
-        wwvbtick object; otherwise, discard time signals more than 1s in the past."""
+        wwvbtick object; otherwise, discard time signals more than 1s in the past.
+        """
         while True:
             for stamp, code in wwvbtick():
                 now = time.time()

{wwvb-3.0.7.dist-info → wwvb-4.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: wwvb
-Version: 3.0.7
+Version: 4.0.0
 Summary: Generate WWVB timecodes for any desired time
 Home-page: https://github.com/jepler/wwvbpy
 Author: Jeff Epler

wwvb-4.0.0.dist-info/RECORD

@@ -0,0 +1,23 @@
+uwwvb.py,sha256=Ocys0AK10NocugDxNjIjUkL3_uVqD2Q6c2WLfqXmx1s,5732
+wwvb/__init__.py,sha256=gSeXqukkcHnYCJAkbXk4eWBMqBu7n3GJ7CJM32XMiaU,30770
+wwvb/__version__.py,sha256=TgVqVkMXXQVomuTpZfj8uxnyooVWsiw-3pM8cC2qwwE,411
+wwvb/decode.py,sha256=d7bAG2pVsFMX0uxY6pMaz-psdbLXauSHh55JDaUT6W4,2713
+wwvb/dut1table.py,sha256=uqaCnCOWr7ytx-nt3mmyhFb9jJVNP5N-WJX-glunKAk,890
+wwvb/gen.py,sha256=0hgicarLgCtOgBgIpb9sU08yzKgCGuwIYOqblR34H5I,3791
+wwvb/iersdata.py,sha256=NOItawXnXwd3Gq3K_cx85NVQ_iogLw3MDgzOI8q_75Y,924
+wwvb/iersdata_dist.py,sha256=zQVO2AjiBTrhpSs21HUG9fL4S11K3WzTk0kP_eyMXz4,2364
+wwvb/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+wwvb/testcli.py,sha256=wa1E9iRaE62OBHshR4K_hxhIzSNxwpWy8rgoEKuhrqs,10168
+wwvb/testdaylight.py,sha256=JW8UJK-FeAg9Kjy5F_aBYbUVj44DKpJOXQ-u9ooyprA,2485
+wwvb/testls.py,sha256=Kz4-MWLaUKABwyql8sWdzvtg8gipxhHv4r-6fn3fptg,1720
+wwvb/testpm.py,sha256=JR3V_EIm0Su3c4m5CcKpMANL3aZnpzEzDL3KhgKX3rM,905
+wwvb/testuwwvb.py,sha256=SMvq85tJgjGMYHKsreCtlM4Wrb3MYOOjf5rKf9wuHYc,9176
+wwvb/testwwvb.py,sha256=t0TUJhHOh-mRFD-GUvePzHs7D3DkNb_paRAI1uYH8l8,16807
+wwvb/tz.py,sha256=XVYh0btrnyP_nUiZUwBjufkYbb26_DTiZVl-R_1BA2A,299
+wwvb/updateiers.py,sha256=3Bg0cpQnTDrGWcHbi0rwZ4rSURJcO64Bds9FDTYLSK8,7382
+wwvb/wwvbtk.py,sha256=WumGtKsAxMw1HMTfm5x4dOKmHikCaDBRZfh_WbF4iu0,4585
+wwvb-4.0.0.dist-info/METADATA,sha256=w5zC4RwrShajTmBzJfDUFhWpG8SzoiucJochmO45ZUM,10290
+wwvb-4.0.0.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
+wwvb-4.0.0.dist-info/entry_points.txt,sha256=KSevvHWLEKxOxUQ-L-OQidD4Sj2BPEfhZ2TQhOgyys4,179
+wwvb-4.0.0.dist-info/top_level.txt,sha256=0IYdkhEAMgurpv_F-76rlyn4GdxepGFzG99tivVdQVU,11
+wwvb-4.0.0.dist-info/RECORD,,

{wwvb-3.0.7.dist-info → wwvb-4.0.0.dist-info}/WHEEL

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

wwvb-3.0.7.dist-info/RECORD

@@ -1,23 +0,0 @@
-uwwvb.py,sha256=zX0pkBvo-Nn1QNI2NWvCE0sH6dlSgz8IHoszhgMf8XI,5720
-wwvb/__init__.py,sha256=sRUn_0A7FMqbTcq2k3sX_13FS3gB3A1GOvr0vyYWDzo,30100
-wwvb/__version__.py,sha256=LJ4HJPpXI_UsV9wSih_sOZxstGnvrh7nUYp4E-ZbpXc,411
-wwvb/decode.py,sha256=PdRKvSVzyWwMyaM6BGkwXm7RqDW5EByw7NBcIpkNiqY,2795
-wwvb/dut1table.py,sha256=uqaCnCOWr7ytx-nt3mmyhFb9jJVNP5N-WJX-glunKAk,890
-wwvb/gen.py,sha256=v5n23peFc4wOuunAmAe0NogTQIttp5F4KOSwJMRqUlc,3792
-wwvb/iersdata.py,sha256=bMkIY5IAd0n93EQe16BoCqtDkXjnqkjG5L20F3Egp4o,994
-wwvb/iersdata_dist.py,sha256=O4sDlkJPeIcX8pSzrxl_5RptOdC_F8e_KxyV3JIEHjQ,2395
-wwvb/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-wwvb/testcli.py,sha256=8Mgn6l7qddeudtZmZNCKgPvVJYoWBlQupuIdyvQlNtQ,10118
-wwvb/testdaylight.py,sha256=JW8UJK-FeAg9Kjy5F_aBYbUVj44DKpJOXQ-u9ooyprA,2485
-wwvb/testls.py,sha256=Kz4-MWLaUKABwyql8sWdzvtg8gipxhHv4r-6fn3fptg,1720
-wwvb/testpm.py,sha256=I5ajzZjUypyKszSe4sTnMZbS43nPmee4H1G3uZlHC_w,935
-wwvb/testuwwvb.py,sha256=kGINMTDNuA5TxBnFok-eamnlcxFXxjVuhvgELums31k,8444
-wwvb/testwwvb.py,sha256=Sl5s01OqDv8mEZsXocII24hj9CinBlphJCUFtAgXvE4,16143
-wwvb/tz.py,sha256=XVYh0btrnyP_nUiZUwBjufkYbb26_DTiZVl-R_1BA2A,299
-wwvb/updateiers.py,sha256=_yaMeaW4pWSkDl5b8Dur-gdoQVGode6bVjH1kvYvagU,7362
-wwvb/wwvbtk.py,sha256=CdzgUp6AbwMvSi62fJBDUlRDyApfVsE3qKL7FucBqno,4598
-wwvb-3.0.7.dist-info/METADATA,sha256=y2SJcCnjkd4htfzY7sL7OPCHQCmL2NwJ6fkuBGqnKjY,10290
-wwvb-3.0.7.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-wwvb-3.0.7.dist-info/entry_points.txt,sha256=KSevvHWLEKxOxUQ-L-OQidD4Sj2BPEfhZ2TQhOgyys4,179
-wwvb-3.0.7.dist-info/top_level.txt,sha256=0IYdkhEAMgurpv_F-76rlyn4GdxepGFzG99tivVdQVU,11
-wwvb-3.0.7.dist-info/RECORD,,