wwvb 6.0.0__py3-none-any.whl → 7.0.0__py3-none-any.whl

wwvb/__init__.py

@@ -19,23 +19,21 @@ import datetime
 import enum
 import json
 import warnings
-from typing import TYPE_CHECKING, Any, NamedTuple, TextIO, TypeVar
+from dataclasses import dataclass
+from typing import ClassVar
 
 from . import iersdata
 from .tz import Mountain
 
+TYPE_CHECKING = False
 if TYPE_CHECKING:
     from collections.abc import Generator
+    from typing import Any, Self, TextIO, TypeVar
+
+    T = TypeVar("T")
 
 HOUR = datetime.timedelta(seconds=3600)
 SECOND = datetime.timedelta(seconds=1)
-T = TypeVar("T")
-
-
-def _removeprefix(s: str, p: str) -> str:
-    if s.startswith(p):
-        return s[len(p) :]
-    return s
 
 
 def _date(dt: datetime.date) -> datetime.date:
@@ -339,8 +337,13 @@ class DstStatus(enum.IntEnum):
     """DST in effect all day today"""
 
 
-class _WWVBMinute(NamedTuple):
-    """(implementation detail)"""
+@dataclass(frozen=True)
+class WWVBMinute:
+    """Uniquely identifies a minute of time in the WWVB system.
+
+    To use ``ut1`` and ``ls`` information from IERS, create a `WWVBMinuteIERS`
+    object instead.
+    """
 
     year: int
     """2-digit year within the WWVB epoch"""
@@ -351,7 +354,7 @@ class _WWVBMinute(NamedTuple):
     hour: int
     """UTC hour of day"""
 
-    min: int
+    minute: int
     """Minute of hour"""
 
     dst: DstStatus
@@ -366,18 +369,10 @@ class _WWVBMinute(NamedTuple):
     ly: bool
     """Leap year flag"""
 
+    epoch: ClassVar[int] = 1970
 
-class WWVBMinute(_WWVBMinute):
-    """Uniquely identifies a minute of time in the WWVB system.
-
-    To use ``ut1`` and ``ls`` information from IERS, create a `WWVBMinuteIERS`
-    object instead.
-    """
-
-    epoch: int = 1970
-
-    def __new__(  # noqa: PYI034
-        cls,
+    def __init__(
+        self,
         year: int,
         days: int,
         hour: int,
@@ -387,7 +382,7 @@ class WWVBMinute(_WWVBMinute):
         *,
         ls: bool | None = None,
         ly: bool | None = None,
-    ) -> WWVBMinute:
+    ) -> None:
         """Construct a WWVBMinute
 
         :param year: The 2- or 4-digit year. This parameter is converted by the `full_year` method.
@@ -401,15 +396,23 @@ class WWVBMinute(_WWVBMinute):
         :param ls: Leap second warning flag
         :param ly: Leap year flag
         """
-        dst = cls.get_dst(year, days) if dst is None else DstStatus(dst)
+        dst = self.get_dst(year, days) if dst is None else DstStatus(dst)
         if ut1 is None and ls is None:
-            ut1, ls = cls._get_dut1_info(year, days)
+            ut1, ls = self._get_dut1_info(year, days)
         elif ut1 is None or ls is None:
             raise ValueError("sepecify both ut1 and ls or neither one")
-        year = cls.full_year(year)
+        year = self.full_year(year)
         if ly is None:
             ly = isly(year)
-        return _WWVBMinute.__new__(cls, year, days, hour, minute, dst, ut1, ls, ly)
+
+        super().__setattr__("year", year)
+        super().__setattr__("days", days)
+        super().__setattr__("hour", hour)
+        super().__setattr__("minute", minute)
+        super().__setattr__("dst", dst)
+        super().__setattr__("ut1", ut1)
+        super().__setattr__("ls", ls)
+        super().__setattr__("ly", ly)
 
     @classmethod
     def full_year(cls, year: int) -> int:
@@ -443,7 +446,7 @@ class WWVBMinute(_WWVBMinute):
         """Implement str()"""
         return (
             f"year={self.year:4d} days={self.days:03d} hour={self.hour:02d} "
-            f"min={self.min:02d} dst={self.dst} ut1={self.ut1} ly={int(self.ly)} "
+            f"min={self.minute:02d} dst={self.dst} ut1={self.ut1} ly={int(self.ly)} "
             f"ls={int(self.ls)}"
         )
 
@@ -453,7 +456,7 @@ class WWVBMinute(_WWVBMinute):
         The returned object has ``tzinfo=datetime.timezone.utc``.
         """
         d = datetime.datetime(self.year, 1, 1, tzinfo=datetime.timezone.utc)
-        d += datetime.timedelta(self.days - 1, self.hour * 3600 + self.min * 60)
+        d += datetime.timedelta(self.days - 1, self.hour * 3600 + self.minute * 60)
         return d
 
     as_datetime = as_datetime_utc
@@ -507,7 +510,7 @@ class WWVBMinute(_WWVBMinute):
             return 60
         if not self._is_end_of_month():
             return 60
-        if self.hour != 23 or self.min != 59:
+        if self.hour != 23 or self.minute != 59:
             return 60
         if self.ut1 > 0:
             return 59
@@ -551,7 +554,7 @@ class WWVBMinute(_WWVBMinute):
             t.am[60] = AmplitudeModulation.MARK
         for i in [4, 10, 11, 14, 20, 21, 24, 34, 35, 44, 54]:
             t.am[i] = AmplitudeModulation.ZERO
-        t._put_am_bcd(self.min, 1, 2, 3, 5, 6, 7, 8)
+        t._put_am_bcd(self.minute, 1, 2, 3, 5, 6, 7, 8)
         t._put_am_bcd(self.hour, 12, 13, 15, 16, 17, 18)
         t._put_am_bcd(self.days, 22, 23, 25, 26, 27, 28, 30, 31, 32, 33)
         ut1_sign = self.ut1 >= 0
@@ -565,14 +568,14 @@ class WWVBMinute(_WWVBMinute):
 
     def _fill_pm_timecode_extended(self, t: WWVBTimecode) -> None:
         """During minutes 10..15 and 40..45, the amplitude signal holds 'extended information'"""
-        assert 10 <= self.min < 16 or 40 <= self.min < 46
-        minno = self.min % 10
+        assert 10 <= self.minute < 16 or 40 <= self.minute < 46
+        minno = self.minute % 10
         assert minno < 6
 
         dst = self.dst
         # Note that these are 1 different than Table 11
         # because our LFSR sequence is zero-based
-        seqno = (self.min // 30) * 2
+        seqno = (self.minute // 30) * 2
         if dst == 0:
             pass
         elif dst == 3:
@@ -655,17 +658,17 @@ class WWVBMinute(_WWVBMinute):
 
     def _fill_pm_timecode(self, t: WWVBTimecode) -> None:
         """Fill the phase portion of a timecode object"""
-        if 10 <= self.min < 16 or 40 <= self.min < 46:
+        if 10 <= self.minute < 16 or 40 <= self.minute < 46:
             self._fill_pm_timecode_extended(t)
         else:
             self._fill_pm_timecode_regular(t)
 
-    def next_minute(self, *, newut1: int | None = None, newls: bool | None = None) -> WWVBMinute:
+    def next_minute(self, *, newut1: int | None = None, newls: bool | None = None) -> Self:
         """Return an object representing the next minute"""
         d = self.as_datetime() + datetime.timedelta(minutes=1)
         return self.from_datetime(d, newut1=newut1, newls=newls, old_time=self)
 
-    def previous_minute(self, *, newut1: int | None = None, newls: bool | None = None) -> WWVBMinute:
+    def previous_minute(self, *, newut1: int | None = None, newls: bool | None = None) -> Self:
         """Return an object representing the previous minute"""
         d = self.as_datetime() - datetime.timedelta(minutes=1)
         return self.from_datetime(d, newut1=newut1, newls=newls, old_time=self)
@@ -684,9 +687,9 @@ class WWVBMinute(_WWVBMinute):
         return 0, False
 
     @classmethod
-    def fromstring(cls, s: str) -> WWVBMinute:
+    def fromstring(cls, s: str) -> Self:
         """Construct a WWVBMinute from a string representation created by print_timecodes"""
-        s = _removeprefix(s, "WWVB timecode: ")
+        s = s.removeprefix("WWVB timecode: ")
         d: dict[str, int] = {}
         for part in s.split():
             k, v = part.split("=")
@@ -700,7 +703,7 @@ class WWVBMinute(_WWVBMinute):
         dst = d.pop("dst", None)
         ut1 = d.pop("ut1", None)
         ls = d.pop("ls", None)
-        d.pop("ly", None)
+        d.pop("ly", None)  # Always use calculated ly flag
         if d:
             raise ValueError(f"Invalid options: {d}")
         return cls(year, days, hour, minute, dst, ut1=ut1, ls=None if ls is None else bool(ls))
@@ -713,7 +716,7 @@ class WWVBMinute(_WWVBMinute):
         newut1: int | None = None,
         newls: bool | None = None,
         old_time: WWVBMinute | None = None,
-    ) -> WWVBMinute:
+    ) -> Self:
         """Construct a WWVBMinute from a datetime, possibly specifying ut1/ls data or propagating it from an old time"""
         u = d.utctimetuple()
         if newls is None and newut1 is None:
@@ -721,7 +724,7 @@ class WWVBMinute(_WWVBMinute):
         return cls(u.tm_year, u.tm_yday, u.tm_hour, u.tm_min, ut1=newut1, ls=newls)
 
     @classmethod
-    def from_timecode_am(cls, t: WWVBTimecode) -> WWVBMinute | None:  # noqa: PLR0912
+    def from_timecode_am(cls, t: WWVBTimecode) -> Self | None:  # noqa: PLR0912
         """Construct a WWVBMinute from a WWVBTimecode"""
         for i in (0, 9, 19, 29, 39, 49, 59):
             if t.am[i] != AmplitudeModulation.MARK:
@@ -764,6 +767,15 @@ class WWVBMinute(_WWVBMinute):
             return None
         return cls(year, days, hour, minute, dst, ut1, ls=ls, ly=ly)
 
+    @property
+    def min(self) -> int:
+        """Deprecated alias for `WWVBMinute.minute`
+
+        Update your code to use the `minute` property instead of the `min` property.
+        """
+        warnings.warn("WWVBMinute.min property is deprecated", category=DeprecationWarning, stacklevel=1)
+        return self.minute
+
 
 class WWVBMinuteIERS(WWVBMinute):
     """A WWVBMinute that uses a database of DUT1 information"""
@@ -934,7 +946,7 @@ def print_timecodes(
                 print(file=file)
             print(f"WWVB timecode: {w!s}{channel_text}{style_text}", file=file)
         first = False
-        pfx = f"{w.year:04d}-{w.days:03d} {w.hour:02d}:{w.min:02d} "
+        pfx = f"{w.year:04d}-{w.days:03d} {w.hour:02d}:{w.minute:02d} "
         tc = w.as_timecode()
         if len(style_chars) == 6:
             print(f"{pfx} {tc.to_both_string(style_chars)}", file=file)
@@ -976,7 +988,7 @@ def print_timecodes_json(
             "year": w.year,
             "days": w.days,
             "hour": w.hour,
-            "minute": w.min,
+            "minute": w.minute,
         }
 
         tc = w.as_timecode()

wwvb/__version__.py

@@ -1,7 +1,14 @@
 # file generated by setuptools-scm
 # don't change, don't track in version control
 
-__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+__all__ = [
+    "__version__",
+    "__version_tuple__",
+    "version",
+    "version_tuple",
+    "__commit_id__",
+    "commit_id",
+]
 
 TYPE_CHECKING = False
 if TYPE_CHECKING:
@@ -9,13 +16,19 @@ if TYPE_CHECKING:
     from typing import Union
 
     VERSION_TUPLE = Tuple[Union[int, str], ...]
+    COMMIT_ID = Union[str, None]
 else:
     VERSION_TUPLE = object
+    COMMIT_ID = object
 
 version: str
 __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
+commit_id: COMMIT_ID
+__commit_id__: COMMIT_ID
 
-__version__ = version = '6.0.0'
-__version_tuple__ = version_tuple = (6, 0, 0)
+__version__ = version = '7.0.0'
+__version_tuple__ = version_tuple = (7, 0, 0)
+
+__commit_id__ = commit_id = None

wwvb/iersdata.json

@@ -1 +1 @@
-{"START": "1972-01-01", "OFFSETS_GZ": "H4sIAJF3PWgC/+2aa3LDMAiEL5uHLDuxnN5/pn/aTmfSSiAWhGR9J8gsywJylqVHPtqxZuH/7leeI0fKsGd5EngQ2WisJWKegrThDa6aJFnL0u4wYZkCE2UmSF0U+13vCveStC6JTfQyW3O86HLJf0SvDgy5u4FCI+WVKRuy0KMjJeXoULIvMDmEWgeRxAJtwXquPCIBqbLh/gbfv0mcxk3mHV9tYiATZP8W/zgw2wd5LpJnY+WErI8abJ3opaIW6592+YMbjSsNWQFlNVVtuhjhtQzSUh4MEpOdDrSW6qsUv+O+Dt+XkIONSrUwvWmTsmq5LO9xsZ+EgcDK+MIESDaYmxSxGlgbGOFjBXMjbV7lc6zlmQ0i48oH5P4+vK7i/AHc7tfTXDtffqFi3m6WhApPSTyDvArU5vUDhm7YaNQYGASVbbwLUBtI2PrhSiZNbvCRrtGUGu0GbjDhJ3aLCx5dQFjt0LFovmWB96e6tktqMenoULXajVS3asBibP3kYXrpmZxnsS2Yf2xRPrHbvQ2D9wjfL4C6b4PWV4otW0vWUYkeWE5M8M594oLbxP77xcl4NuBkG0dfM3xOUf/T0GF+ur+J5pljcODEUZkXg6vIdLYy7g3oZU3bPNDnc8qwGdJZMmAurUsRj6tOo95zP6fb9YPWp5OuZ5X7q2DrmsG/VCyTyaREnDRhnUxOzfzzh3/NRuYTMxwhU6lNAAA="}
+{"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"}

wwvb/updateiers.py

@@ -47,6 +47,7 @@ def update_iersdata(  # noqa: PLR0915
     """Update iersdata.py"""
     offsets: list[int] = []
     iersdata_text = _get_text(IERS_URL)
+    table_start: datetime.date | None = None
     for r in csv.DictReader(io.StringIO(iersdata_text), delimiter=";"):
         jd = float(r["MJD"])
         offs_str = r["UT1-UTC"]
@@ -79,6 +80,8 @@ def update_iersdata(  # noqa: PLR0915
 
         offsets.append(offs)
 
+    assert table_start is not None
+
     wwvb_text = _get_text(NIST_URL)
     wwvb_data = bs4.BeautifulSoup(wwvb_text, features="html.parser")
     wwvb_dut1_table = wwvb_data.findAll("table")[2]
@@ -88,6 +91,7 @@ def update_iersdata(  # noqa: PLR0915
     wwvb_data_stamp = datetime.datetime.fromisoformat(meta.attrs["content"]).replace(tzinfo=None).date()
 
     def patch(patch_start: datetime.date, patch_end: datetime.date, val: int) -> None:
+        assert table_start is not None
         off_start = (patch_start - table_start).days
         off_end = (patch_end - table_start).days
         offsets[off_start:off_end] = [val] * (off_end - off_start)

wwvb/wwvbtk.py

@@ -69,7 +69,7 @@ def main(colors: list[str], size: int, min_size: int | None) -> None:  # noqa: P
     def deadline_ms(deadline: datetime.datetime) -> int:
         """Compute the number of ms until a deadline"""
         now = datetime.datetime.now(datetime.timezone.utc)
-        return int(max(0, (deadline - now).total_seconds()) * 1000)
+        return int(max(0.0, (deadline - now).total_seconds()) * 1000)
 
     def wwvbtick() -> Generator[tuple[datetime.datetime, wwvb.AmplitudeModulation]]:
         """Yield consecutive values of the WWVB amplitude signal, going from minute to minute"""

{wwvb-6.0.0.dist-info → wwvb-7.0.0.dist-info}/METADATA

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

wwvb-7.0.0.dist-info/RECORD

@@ -0,0 +1,18 @@
+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,,

wwvb-6.0.0.dist-info/RECORD

@@ -1,18 +0,0 @@
-uwwvb.py,sha256=Ybf8DeOZ5VjfqRGtO90_oEEW6HhGaztIVlh4L423MdQ,5801
-wwvb/__init__.py,sha256=MRuk6nzitxbIcUfqVLkx-EzGTYYxm96ItfBlR4BSZuQ,32922
-wwvb/__version__.py,sha256=ZEItn3OOgzPGQ44WDUROvtDbTuU_UDPqseQiaWn2NJc,511
-wwvb/decode.py,sha256=llTLKBW49nl6COheM90NsyMnTNeVApl2oeCHtl6Tf3w,2759
-wwvb/dut1table.py,sha256=HVX1338RlQzAQ-bsMPEdmCqoyIxSWoJSoRu1YGyaJO4,875
-wwvb/gen.py,sha256=_fpUypu_2nZfG5Vjnya0B8C26nk1WOhnLMTCXwskAHs,3720
-wwvb/iersdata.json,sha256=4vVfaxfifkNv570_NjNbS2JwSpPqDx1HSeESkcJom44,765
-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=Zemj6m0hwPLP31y8ODAS7sqLeB8SSHvv833pfUPHMUo,5661
-wwvb/wwvbtk.py,sha256=9RcSssben6CEsX7P3Rmphvmlnp8HoAb9gMFcCP35ryk,5184
-wwvb-6.0.0.dist-info/METADATA,sha256=ogZFIs2sa1yGdE7h1raS3ctgaLx4iGjHYrB4gubR2g8,10201
-wwvb-6.0.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-wwvb-6.0.0.dist-info/entry_points.txt,sha256=KSevvHWLEKxOxUQ-L-OQidD4Sj2BPEfhZ2TQhOgyys4,179
-wwvb-6.0.0.dist-info/top_level.txt,sha256=0IYdkhEAMgurpv_F-76rlyn4GdxepGFzG99tivVdQVU,11
-wwvb-6.0.0.dist-info/RECORD,,