wwvb 5.0.0__tar.gz → 5.0.2__tar.gz

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

@@ -29,7 +29,8 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-
+        with:
+          persist-credentials: false
       - name: Install Dependencies (python)
         run: pip3 install -r requirements-dev.txt
 

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

@@ -11,7 +11,7 @@ on:
 
 jobs:
   update-dut1:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     if: startswith(github.repository, 'jepler/')
     steps:
 
@@ -21,6 +21,8 @@ jobs:
       run: echo "$GITHUB_CONTEXT"
 
     - uses: actions/checkout@v4
+      with:
+        persist-credentials: false
 
     - name: Set up Python 3.10
       uses: actions/setup-python@v5
@@ -37,8 +39,10 @@ jobs:
       run: python -munittest
 
     - name: Commit updates
+      env:
+        REPO: ${{ github.repository }}
       run: |
         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 }}
+        git remote set-url --push origin "https://${GITHUB_ACTOR}:${{ secrets.GITHUB_TOKEN }}@github.com/$REPO"
         if git commit -m"update iersdata" src/wwvb/iersdata.json; then git push origin HEAD:main; fi

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

@@ -11,7 +11,7 @@ on:
 jobs:
   release:
 
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     steps:
     - name: Dump GitHub context
       env:
@@ -19,6 +19,8 @@ jobs:
       run: echo "$GITHUB_CONTEXT"
 
     - uses: actions/checkout@v4
+      with:
+        persist-credentials: false
 
     - name: Set up Python
       uses: actions/setup-python@v5

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

@@ -22,6 +22,8 @@ jobs:
         python-version: '3.12'
 
     - uses: actions/checkout@v4
+      with:
+        persist-credentials: false
 
     - name: Install deps
       run: python -mpip install -r requirements-dev.txt
@@ -52,6 +54,8 @@ jobs:
     runs-on: ${{ matrix.os-version }}
     steps:
     - uses: actions/checkout@v4
+      with:
+        persist-credentials: false
 
     - name: Set up Python
       uses: actions/setup-python@v5
@@ -84,6 +88,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
+      with:
+        persist-credentials: false
 
     - name: Set up Python
       uses: actions/setup-python@v5

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

@@ -12,16 +12,16 @@ repos:
   hooks:
   -   id: check-yaml
   -   id: end-of-file-fixer
-      exclude: tests
+      exclude: src/wwvb/iersdata.json
   -   id: trailing-whitespace
       exclude: test/wwvbgen_testcases
 - repo: https://github.com/fsfe/reuse-tool
-  rev: v4.0.3
+  rev: v5.0.2
   hooks:
   - id: reuse
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.6.9
+  rev: v0.11.5
   hooks:
     # Run the linter.
     - id: ruff

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: wwvb
-Version: 5.0.0
+Version: 5.0.2
 Summary: Generate WWVB timecodes for any desired time
 Author-email: Jeff Epler <jepler@gmail.com>
 Project-URL: Source, https://github.com/jepler/wwvbpy

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

@@ -19,7 +19,7 @@ dependencies = {file = "requirements.txt"}
 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"]
+ignore = ["D203", "D213", "D400", "D415", "ISC001", "E741", "C901", "PLR0911", "PLR2004", "PLR0913", "COM812"]
 [tool.ruff]
 line-length = 120
 [project]

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

@@ -49,7 +49,6 @@ def _maybe_warn_update(dt: datetime.date, stacklevel: int = 1) -> None:
     # If the date is less than 300 days after today, there should be (possibly)
     # prospective available now.
     today = datetime.datetime.now(tz=datetime.timezone.utc).date()
-    print(f"_mwu {today=!r} {dt=!r} {iersdata.end=!r}")
     if _date(dt) < today + datetime.timedelta(days=330):
         warnings.warn(
             "Note: Running `updateiers` may provide better DUT1 and LS information",
@@ -727,7 +726,7 @@ class WWVBMinuteIERS(WWVBMinute):
     @classmethod
     def _get_dut1_info(cls, year: int, days: int, old_time: WWVBMinute | None = None) -> tuple[int, bool]:  # noqa: ARG003
         d = datetime.datetime(year, 1, 1, tzinfo=datetime.timezone.utc) + datetime.timedelta(days - 1)
-        return int(round(get_dut1(d) * 10)) * 100, isls(d)
+        return round(get_dut1(d) * 10) * 100, isls(d)
 
 
 def _bcd_bits(n: int) -> Generator[bool, None, None]:

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

@@ -1,8 +1,13 @@
-# file generated by setuptools_scm
+# file generated by setuptools-scm
 # don't change, don't track in version control
+
+__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+
 TYPE_CHECKING = False
 if TYPE_CHECKING:
-    from typing import Tuple, Union
+    from typing import Tuple
+    from typing import Union
+
     VERSION_TUPLE = Tuple[Union[int, str], ...]
 else:
     VERSION_TUPLE = object
@@ -12,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '5.0.0'
-__version_tuple__ = version_tuple = (5, 0, 0)
+__version__ = version = '5.0.2'
+__version_tuple__ = version_tuple = (5, 0, 2)

wwvb-5.0.2/src/wwvb/iersdata.json

@@ -0,0 +1 @@
+{"START": "1972-01-01", "OFFSETS_GZ": "H4sIAP8L7WcC/+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/ubKM4cgwMnHZW4GFxFprOVcevAKGva6oExn1MOmyGDJQPm0rpU8bjqdOo993O6Xz9ofToZela5vwrWoTn4l4o5CIIaKejCEgSnJv784VGlgfgEoGIm4WpNAAA="}

{wwvb-5.0.0 → wwvb-5.0.2}/src/wwvb/iersdata.py

@@ -13,7 +13,7 @@ import json
 
 import platformdirs
 
-__all__ = ["DUT1_DATA_START", "DUT1_OFFSETS", "start", "span", "end"]
+__all__ = ["DUT1_DATA_START", "DUT1_OFFSETS", "end", "span", "start"]
 
 content: dict[str, str] = {"START": "1970-01-01", "OFFSETS_GZ": "H4sIAFNx1mYC/wMAAAAAAAAAAAA="}
 

{wwvb-5.0.0 → wwvb-5.0.2}/src/wwvb/updateiers.py

@@ -52,7 +52,7 @@ def update_iersdata(  # noqa: PLR0915
         offs_str = r["UT1-UTC"]
         if not offs_str:
             break
-        offs = int(round(float(offs_str) * 10))
+        offs = round(float(offs_str) * 10)
         if not offsets:
             table_start = datetime.date(1858, 11, 17) + datetime.timedelta(jd)
 
@@ -98,7 +98,7 @@ def update_iersdata(  # noqa: PLR0915
         cells = row.findAll("td")
         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))
+        dut1 = round(float(dut1) * 10)
         if wwvb_dut1 is not None:
             assert wwvb_start is not None
             patch(wwvb_start, when, wwvb_dut1)

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

@@ -7,7 +7,6 @@
 from __future__ import annotations
 
 import functools
-import threading
 import time
 from tkinter import Canvas, TclError, Tk
 from typing import TYPE_CHECKING, Any
@@ -31,7 +30,7 @@ def validate_colors(ctx: Any, param: Any, value: str) -> list[str]:  # noqa: ARG
     app = _app()
     colors = value.split()
     if len(colors) not in (2, 3, 4, 6):
-        raise click.BadParameter(f"Give 2, 3, 4 or 6 colors (not {len(colors)}")
+        raise click.BadParameter(f"Give 2, 3, 4 or 6 colors (not {len(colors)})")
     for c in colors:
         try:
             app.winfo_rgb(c)
@@ -53,7 +52,13 @@ DEFAULT_COLORS = "#3c3c3c #3c3c3c #3c3c3c #cc3c3c #88883c #3ccc3c"
 
 
 @click.command
-@click.option("--colors", callback=validate_colors, default=DEFAULT_COLORS)
+@click.option(
+    "--colors",
+    callback=validate_colors,
+    default=DEFAULT_COLORS,
+    metavar="COLORS",
+    help="2, 3, 4, or 6 Tk color values",
+)
 @click.option("--size", default=48)
 @click.option("--min-size", default=None)
 def main(colors: list[str], size: int, min_size: int | None) -> None:  # noqa: PLR0915
@@ -61,11 +66,10 @@ def main(colors: list[str], size: int, min_size: int | None) -> None:  # noqa: P
     if min_size is None:
         min_size = size
 
-    def sleep_deadline(deadline: float) -> None:
-        """Sleep until a deadline"""
+    def deadline_ms(deadline: float) -> int:
+        """Compute the number of ms until a deadline"""
         now = time.time()
-        if deadline > now:
-            time.sleep(deadline - now)
+        return int(max(0, deadline - now) * 1000)
 
     def wwvbtick() -> Generator[tuple[float, wwvb.AmplitudeModulation], None, None]:
         """Yield consecutive values of the WWVB amplitude signal, going from minute to minute"""
@@ -127,18 +131,23 @@ def main(colors: list[str], size: int, min_size: int | None) -> None:  # noqa: P
         """Turn the canvas's virtual LED off"""
         canvas.itemconfigure(circle, fill=colors[i])
 
-    def thread_func() -> None:
-        """Update the canvas virtual LED"""
+    def controller_func() -> Generator[int]:
+        """Update the canvas virtual LED, yielding the number of ms until the next change"""
         for stamp, code in wwvbsmarttick():
-            sleep_deadline(stamp)
+            yield deadline_ms(stamp)
             led_on(code)
             app.update()
-            sleep_deadline(stamp + 0.2 + 0.3 * int(code))
+            yield deadline_ms(stamp + 0.2 + 0.3 * int(code))
             led_off(code)
             app.update()
 
-    thread = threading.Thread(target=thread_func, daemon=True)
-    thread.start()
+    controller = controller_func().__next__
+
+    def after_func() -> None:
+        """Repeatedly run the controller after the desired interval"""
+        app.after(controller(), after_func)
+
+    app.after_idle(after_func)
     app.mainloop()
 
 

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: wwvb
-Version: 5.0.0
+Version: 5.0.2
 Summary: Generate WWVB timecodes for any desired time
 Author-email: Jeff Epler <jepler@gmail.com>
 Project-URL: Source, https://github.com/jepler/wwvbpy

wwvb-5.0.0/src/wwvb/iersdata.json

@@ -1 +0,0 @@
-{"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=="}