wwvb 7.0.0__tar.gz → 8.0.0rc2__tar.gz

wwvb-8.0.0rc2/.forgejo/workflows/ci.yml

@@ -0,0 +1,65 @@
+# SPDX-FileCopyrightText: 2021-2025 Jeff Epler
+#
+# SPDX-License-Identifier: CC0-1.0
+
+name: Test wwvbpy
+
+on:
+  push:
+  pull_request:
+  release:
+    types:
+      - created  # forgejo does not document the value "created"
+      - published
+
+# (may not be used by forgejo, but is ignored for now)
+concurrency:
+  group: ${{ forge.workflow }}-${{ forge.ref_name }}-${{ forge.event_name }}
+  cancel-in-progress: true
+
+jobs:
+  build:
+    runs-on: codeberg-tiny
+    container:
+      image: docker.io/library/python:3-trixie
+    steps:
+    - name: Set up node
+      run: apt-get update && apt-get install -y --no-install-recommends nodejs
+
+    - uses: actions/checkout@v4
+
+    - name: Set up uv
+      run: pip install --break-system-packages uv
+
+    - name: Run main tests
+      run: |
+        for version in 3.10 3.11 3.12 3.13; do
+          echo "::group::Test with Python $version"
+          uv venv --python $version _venv_${version}
+          . _venv_${version}/bin/activate
+          uv pip install -r requirements-dev.txt
+          env PYTHONPATH=src python -mcoverage run -p -m unittest discover -s test
+          deactivate
+          echo "::endgroup::"
+        done
+
+        for version in 3.13; do
+          echo "::group::Aggregate coverage and run final checks"
+          . _venv_${version}/bin/activate
+          make -j $(nproc) -O mypy test_venv
+          python -mcoverage combine -q
+          python -mcoverage json --include "src/**/*.py"
+          python -mcoverage report --fail-under=100 --include "src/**/*.py"
+          prek --all-files
+          deactivate
+          echo "::endgroup::"
+        done
+
+    - name: Upload Coverage as artifact
+      if: always()
+      uses: actions/upload-artifact@v3
+      with:
+        path: coverage.json
+
+    - name: Check build directory size
+      run: du -shx

wwvb-8.0.0rc2/.forgejo/workflows/cron.yml

@@ -0,0 +1,37 @@
+# SPDX-FileCopyrightText: 2021-2024 Jeff Epler
+#
+# SPDX-License-Identifier: CC0-1.0
+
+name: Update DUT1 data
+
+on:
+  schedule:
+    - cron: '0 10 2 * *'
+  workflow_dispatch:
+
+jobs:
+  update-dut1:
+    permissions: write-all
+    runs-on: codeberg-tiny
+    container:
+      image: docker.io/library/python:3-trixie
+    steps:
+    - name: Set up node
+      run: apt-get update && apt-get install -y --no-install-recommends nodejs
+
+    - uses: actions/checkout@v4
+
+    - name: Install dependencies
+      run: pip install -e .
+
+    - name: Update DUT1 data
+      run: python -m wwvb.updateiers --dist
+
+    - name: Test
+      run: python -munittest discover -s test
+
+    - name: Commit updates
+      run: |
+        git config user.name "${FORGEJO_ACTOR} (actions cron)"
+        git config user.email "${FORGEJO_ACTOR}@noreply.invalid"
+        if git commit -m"update iersdata" src/wwvb/iersdata.json; then git push origin; fi

{wwvb-7.0.0/.github → wwvb-8.0.0rc2/.forgejo}/workflows/release.yml

@@ -10,30 +10,25 @@ on:
 
 jobs:
   release:
-
-    runs-on: ubuntu-24.04
+    permissions: write-all
+    runs-on: codeberg-tiny
+    container:
+      image: docker.io/library/python:3-trixie
     steps:
-    - name: Dump GitHub context
-      env:
-        GITHUB_CONTEXT: ${{ toJson(github) }}
-      run: echo "$GITHUB_CONTEXT"
+    - name: Set up node
+      run: apt-get update && apt-get install -y --no-install-recommends nodejs
 
     - uses: actions/checkout@v4
       with:
         persist-credentials: false
 
-    - name: Set up Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: 3.9
-
     - name: Install deps
       run: |
         python -mpip install wheel
         python -mpip install -r requirements-dev.txt
 
     - name: Test
-      run: make coverage
+      run: make coverage mypy
 
     - name: Build release
       run: python -mbuild
@@ -42,4 +37,4 @@ jobs:
       run: twine upload -u "$TWINE_USERNAME" -p "$TWINE_PASSWORD" dist/*
       env:
         TWINE_USERNAME: __token__
-        TWINE_PASSWORD: ${{ secrets.pypi_token }}
+        TWINE_PASSWORD: ${{ secrets.PYPI_TOKEN }}

{wwvb-7.0.0 → wwvb-8.0.0rc2}/.gitignore

@@ -9,6 +9,7 @@
 /build
 /_build
 /coverage.xml
+/coverage.json
 /dist
 /finals2000A.all.csv
 /htmlcov

{wwvb-7.0.0 → wwvb-8.0.0rc2}/.pre-commit-config.yaml

@@ -21,10 +21,16 @@ repos:
   - id: reuse
 - repo: https://github.com/astral-sh/ruff-pre-commit
   # Ruff version.
-  rev: v0.12.10
+  rev: v0.12.11
   hooks:
     # Run the linter.
-    - id: ruff
+    - id: ruff-check
       args: [ --fix ]
     # Run the formatter.
     - id: ruff-format
+- repo: https://github.com/asottile/pyupgrade
+  rev: v3.20.0
+  hooks:
+  - id: pyupgrade
+    args: [ --py310-plus ]
+    exclude: src/uwwvb.py # CircuitPython prevailing standard!

{wwvb-7.0.0 → wwvb-8.0.0rc2}/Makefile

@@ -24,7 +24,7 @@ ENVPYTHON ?= _env/bin/python3
 endif
 
 .PHONY: default
-default: coverage mypy
+default: coverage mypy pyright pyrefly
 
 COVERAGE_INCLUDE=--include "src/**/*.py"
 .PHONY: coverage

{wwvb-7.0.0/src/wwvb.egg-info → wwvb-8.0.0rc2}/PKG-INFO

@@ -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-7.0.0 → wwvb-8.0.0rc2}/README.md

@@ -3,11 +3,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
 
@@ -37,7 +33,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-7.0.0 → wwvb-8.0.0rc2}/pyproject.toml

@@ -29,18 +29,15 @@ 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"
+requires-python = ">=3.10"
 [project.urls]
-Source = "https://github.com/jepler/wwvbpy"
-Documentation = "https://github.com/jepler/wwvbpy"
+Source = "https://codeberg.org/jepler/wwvbpy"
+Documentation = "https://wwvbpy.readthedocs.io/en/latest/"
 [project.scripts]
 wwvbgen = "wwvb.gen:main"
 wwvbdecode = "wwvb.decode:main"

{wwvb-7.0.0 → wwvb-8.0.0rc2}/requirements-dev.txt

@@ -7,10 +7,12 @@ build
 click
 coverage >= 7.10.3
 mypy; implementation_name=="cpython"
+pyright; implementation_name=="cpython"
+pyrefly; implementation_name=="cpython"
 click>=8.1.5; implementation_name=="cpython"
 leapseconddata
 platformdirs
-pre-commit
+prek
 python-dateutil
 requests; implementation_name=="cpython"
 setuptools>=68; implementation_name=="cpython"

{wwvb-7.0.0 → wwvb-8.0.0rc2}/src/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-7.0.0 → wwvb-8.0.0rc2}/src/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 = 'g14c182717'
+__commit_id__ = commit_id = 'g65bfd773d'

{wwvb-7.0.0 → wwvb-8.0.0rc2}/src/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-7.0.0 → wwvb-8.0.0rc2}/src/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-7.0.0 → wwvb-8.0.0rc2}/src/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-7.0.0 → wwvb-8.0.0rc2}/src/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-7.0.0 → wwvb-8.0.0rc2}/src/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 → wwvb-8.0.0rc2/src/wwvb.egg-info}/PKG-INFO

@@ -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-7.0.0 → wwvb-8.0.0rc2}/src/wwvb.egg-info/SOURCES.txt

@@ -3,13 +3,12 @@
 .readthedocs.yaml
 Makefile
 README.md
-codecov.yml
 pyproject.toml
 requirements-dev.txt
 requirements.txt
-.github/workflows/cron.yml
-.github/workflows/release.yml
-.github/workflows/test.yml
+.forgejo/workflows/ci.yml
+.forgejo/workflows/cron.yml
+.forgejo/workflows/release.yml
 LICENSES/CC0-1.0.txt
 LICENSES/GPL-3.0-only.txt
 LICENSES/Unlicense.txt

{wwvb-7.0.0 → wwvb-8.0.0rc2}/test/testcli.py

@@ -1,4 +1,5 @@
 #!/usr/bin/python3
+
 """Test most wwvblib commandline programs"""
 
 # ruff: noqa: N802 D102
@@ -6,13 +7,13 @@
 #
 # SPDX-License-Identifier: GPL-3.0-only
 
+from __future__ import annotations
+
 import json
 import os
 import subprocess
 import sys
 import unittest
-from collections.abc import Sequence
-from typing import Any
 
 # These imports must remain, even though the module contents are not used directly!
 import wwvb.dut1table
@@ -22,6 +23,12 @@ import wwvb.gen
 assert wwvb.dut1table.__name__ == "wwvb.dut1table"
 assert wwvb.gen.__name__ == "wwvb.gen"
 
+TYPE_CHECKING = False
+if TYPE_CHECKING:
+    from collections.abc import Sequence
+
+    from wwvb import JsonMinute
+
 
 class CLITestCase(unittest.TestCase):
     """Test various CLI commands within wwvbpy"""
@@ -55,9 +62,10 @@ class CLITestCase(unittest.TestCase):
     def assertStarts(self, expected: str, actual: str, *args: str) -> None:
         self.assertMultiLineEqual(expected, actual[: len(expected)], f"args={args}")
 
-    def assertModuleJson(self, expected: Any, *args: str) -> None:
+    def assertModuleJson(self, expected: list[JsonMinute], *args: str) -> None:
         """Check the output from invoking a `python -m modulename` program matches the expected"""
         actual = self.moduleOutput(*args)
+        # Note: in mypy, revealed type of json.loads is typing.Any!
         self.assertEqual(json.loads(actual), expected)
 
     def assertModuleOutputStarts(self, expected: str, *args: str) -> None:

{wwvb-7.0.0 → wwvb-8.0.0rc2}/test/testls.py

@@ -56,7 +56,3 @@ class TestLeapSecond(unittest.TestCase):
                 assert not our_is_ls
             d = datetime.datetime.combine(nm, datetime.time(), tzinfo=datetime.timezone.utc)
         self.assertEqual(leap, bench)
-
-
-if __name__ == "__main__":
-    unittest.main()

{wwvb-7.0.0 → wwvb-8.0.0rc2}/test/testpm.py

@@ -27,7 +27,3 @@ class TestPhaseModulation(unittest.TestCase):
 
         self.assertEqual(ref_am, test_am)
         self.assertEqual(ref_pm, test_pm)
-
-
-if __name__ == "__main__":
-    unittest.main()

{wwvb-7.0.0 → wwvb-8.0.0rc2}/test/testuwwvb.py

@@ -10,26 +10,21 @@ import random
 import sys
 import unittest
 import zoneinfo
-from typing import Union
 
 import adafruit_datetime
 
 import uwwvb
 import wwvb
 
-EitherDatetimeOrNone = Union[None, datetime.datetime, adafruit_datetime.datetime]
-
 
 class WWVBRoundtrip(unittest.TestCase):
     """tests of uwwvb.py"""
 
-    def assertDateTimeEqualExceptTzInfo(self, a: EitherDatetimeOrNone, b: EitherDatetimeOrNone) -> None:
+    def assertDateTimeEqualExceptTzInfo(self, a: datetime.datetime, b: adafruit_datetime.datetime) -> None:
         """Test two datetime objects for equality
 
         This equality test excludes tzinfo, and allows adafruit_datetime and core datetime modules to compare equal
         """
-        assert a
-        assert b
         self.assertEqual(
             (a.year, a.month, a.day, a.hour, a.minute, a.second, a.microsecond),
             (b.year, b.month, b.day, b.hour, b.minute, b.second, b.microsecond),
@@ -47,7 +42,7 @@ class WWVBRoundtrip(unittest.TestCase):
         any_leap_second = False
         for _ in range(20):
             timecode = minute.as_timecode()
-            decoded = None
+            decoded: uwwvb.WWVBMinute | None = None
             if len(timecode.am) == 61:
                 any_leap_second = True
             for code in timecode.am:
@@ -215,7 +210,3 @@ class WWVBRoundtrip(unittest.TestCase):
             datetime.datetime(2020, 12, 31, 17, 00, tzinfo=zoneinfo.ZoneInfo("America/Denver")),  # Mountain time!
             uwwvb.as_datetime_local(decoded),
         )
-
-
-if __name__ == "__main__":
-    unittest.main()

{wwvb-7.0.0 → wwvb-8.0.0rc2}/test/testwwvb.py

@@ -18,7 +18,7 @@ import unittest
 
 import uwwvb
 import wwvb
-from wwvb import decode, iersdata, tz
+from wwvb import WWVBChannel, decode, iersdata, tz
 
 
 class WWVBMinute2k(wwvb.WWVBMinute):
@@ -44,11 +44,15 @@ class WWVBTestCase(unittest.TestCase):
                 header = lines[0].split()
                 timestamp = " ".join(header[:10])
                 options = header[10:]
-                channel = "amplitude"
+                channel: WWVBChannel = "amplitude"
                 style = "default"
                 for o in options:
-                    if o.startswith("--channel="):
-                        channel = o[10:]
+                    if o == "--channel=both":
+                        channel = "both"
+                    elif o == "--channel=amplitude":
+                        channel = "amplitude"
+                    elif o == "--channel=phase":
+                        channel = "phase"
                     elif o.startswith("--style="):
                         style = o[8:]
                     else:
@@ -430,7 +434,3 @@ class WWVBRoundtrip(unittest.TestCase):
         minute.am[57] = wwvb.AmplitudeModulation.MARK
         decoded_minute = wwvb.WWVBMinute.from_timecode_am(minute)
         assert decoded_minute is None
-
-
-if __name__ == "__main__":
-    unittest.main()

wwvb-7.0.0/.github/workflows/cron.yml

@@ -1,48 +0,0 @@
-# SPDX-FileCopyrightText: 2021-2024 Jeff Epler
-#
-# SPDX-License-Identifier: CC0-1.0
-
-name: Update DUT1 data
-
-on:
-  schedule:
-    - cron: '0 10 2 * *'
-  workflow_dispatch:
-
-jobs:
-  update-dut1:
-    runs-on: ubuntu-24.04
-    if: startswith(github.repository, 'jepler/')
-    steps:
-
-    - name: Dump GitHub context
-      env:
-        GITHUB_CONTEXT: ${{ toJson(github) }}
-      run: echo "$GITHUB_CONTEXT"
-
-    - uses: actions/checkout@v4
-      with:
-        persist-credentials: false
-
-    - name: Set up Python 3.10
-      uses: actions/setup-python@v5
-      with:
-        python-version: "3.10"
-
-    - name: Install dependencies
-      run: pip install -e .
-
-    - name: Update DUT1 data
-      run: python -m wwvb.updateiers --dist
-
-    - name: Test
-      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/$REPO"
-        if git commit -m"update iersdata" src/wwvb/iersdata.json; then git push origin HEAD:main; fi

wwvb-7.0.0/.github/workflows/test.yml

@@ -1,126 +0,0 @@
-# SPDX-FileCopyrightText: 2021-2024 Jeff Epler
-#
-# SPDX-License-Identifier: CC0-1.0
-
-name: Test wwvbgen
-
-on:
-  push:
-  pull_request:
-  release:
-    types: [published]
-  check_suite:
-    types: [rerequested]
-
-jobs:
-  docs:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Set up Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: '3.12'
-
-    - uses: actions/checkout@v4
-      with:
-        persist-credentials: false
-
-    - name: Install deps
-      run: python -mpip install -r requirements-dev.txt
-
-    - name: Build HTML docs
-      run: make html
-
-  typing:
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version:
-        - '3.13'
-        os-version:
-        - 'ubuntu-latest'
-    runs-on: ${{ matrix.os-version }}
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        persist-credentials: false
-
-    - name: Set up Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Install deps
-      run: |
-        python -mpip install wheel
-        python -mpip install -r requirements-dev.txt
-
-    - name: Check stubs
-      if: (! startsWith(matrix.python-version, 'pypy-'))
-      run: make mypy PYTHON=python
-
-
-  test:
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version:
-        - '3.9'
-        - '3.10'
-        - '3.11'
-        - '3.12'
-        - '3.13'
-        - '3.14.0-alpha.0 - 3.14'
-        os-version:
-        - 'ubuntu-latest'
-        include:
-          - os-version: 'macos-latest'
-            python-version: '3.x'
-          - os-version: 'windows-latest'
-            python-version: '3.x'
-          - os-version: 'ubuntu-latest'
-            python-version: 'pypy-3.10'
-
-    runs-on: ${{ matrix.os-version }}
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        persist-credentials: false
-
-    - name: Set up Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: ${{ matrix.python-version }}
-
-    - name: Install deps
-      run: |
-        python -mpip install wheel
-        python -mpip install -r requirements-dev.txt
-
-    - 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 }}
-        path: coverage.xml
-
-  pre-commit:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-      with:
-        persist-credentials: false
-
-    - name: Set up Python
-      uses: actions/setup-python@v5
-      with:
-        python-version: '3.x'
-
-    - name: pre-commit
-      run: pip install pre-commit && pre-commit run --all