dycw-utilities 0.138.0__tar.gz → 0.138.2__tar.gz

{dycw_utilities-0.138.0 → dycw_utilities-0.138.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dycw-utilities
-Version: 0.138.0
+Version: 0.138.2
 Author-email: Derek Wan <d.wan@icloud.com>
 License-File: LICENSE
 Requires-Python: >=3.12

{dycw_utilities-0.138.0 → dycw_utilities-0.138.2}/pyproject.toml

@@ -105,7 +105,7 @@ dependencies = [
 name = "dycw-utilities"
 readme = "README.md"
 requires-python = ">= 3.12"
-version = "0.138.0"
+version = "0.138.2"
 
 [project.optional-dependencies]
 logging = [
@@ -133,7 +133,7 @@ test = [
 # bump-my-version
 [tool.bumpversion]
 allow_dirty = true
-current_version = "0.138.0"
+current_version = "0.138.2"
 
 [[tool.bumpversion.files]]
 filename = "src/utilities/__init__.py"

{dycw_utilities-0.138.0 → dycw_utilities-0.138.2}/src/tests/test_click.py

@@ -16,6 +16,7 @@ from hypothesis.strategies import (
     SearchStrategy,
     data,
     frozensets,
+    integers,
     ip_addresses,
     lists,
     sampled_from,
@@ -37,11 +38,13 @@ from utilities.click import (
     Freq,
     FrozenSetChoices,
     FrozenSetEnums,
+    FrozenSetInts,
     FrozenSetStrs,
     IPv4Address,
     IPv6Address,
     ListChoices,
     ListEnums,
+    ListInts,
     ListStrs,
     MonthDay,
     PlainDateTime,
@@ -231,6 +234,14 @@ class TestParameters:
             serialize=utilities.whenever.Freq.serialize,
             failable=True,
         ),
+        _Case(
+            param=FrozenSetInts(),
+            name="frozenset[integer]",
+            repr="FROZENSET[INT]",
+            strategy=frozensets(integers()),
+            serialize=_lift_serializer(str, sort=True),
+            failable=True,
+        ),
         _Case(
             param=FrozenSetChoices(["a", "b", "c"]),
             name="frozenset[choice]",
@@ -272,8 +283,16 @@ class TestParameters:
             param=ListChoices(["a", "b", "c"]),
             name="list[choice]",
             repr="LIST[Choice(['a', 'b', 'c'])]",
-            strategy=frozensets(sampled_from(["a", "b", "c"])),
-            serialize=_lift_serializer(str, sort=True),
+            strategy=lists(sampled_from(["a", "b", "c"])),
+            serialize=_lift_serializer(str),
+            failable=True,
+        ),
+        _Case(
+            param=ListInts(),
+            name="list[integer]",
+            repr="LIST[INT]",
+            strategy=lists(integers()),
+            serialize=_lift_serializer(str),
             failable=True,
         ),
         _Case(

{dycw_utilities-0.138.0 → dycw_utilities-0.138.2}/src/tests/test_whenever.py

@@ -16,6 +16,7 @@ from whenever import (
     Time,
     TimeDelta,
     TimeZoneNotFoundError,
+    YearMonth,
     ZonedDateTime,
 )
 
@@ -88,6 +89,7 @@ from utilities.whenever import (
     to_nanos,
     to_time_delta,
     to_zoned_date_time,
+    two_digit_year_month,
 )
 from utilities.zoneinfo import UTC
 
@@ -553,6 +555,13 @@ class TestToZonedDateTime:
         assert to_zoned_date_time(date_time=lambda: date_time) == date_time
 
 
+class TestTwoDigitYearMonth:
+    def test_parse_common_iso(self) -> None:
+        result = two_digit_year_month(0, 1)
+        expected = YearMonth(2000, 1)
+        assert result == expected
+
+
 class TestWheneverLogRecord:
     def test_init(self) -> None:
         _ = WheneverLogRecord("name", DEBUG, "pathname", 0, None, None, None)

{dycw_utilities-0.138.0 → dycw_utilities-0.138.2}/src/utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.138.0"
+__version__ = "0.138.2"

{dycw_utilities-0.138.0 → dycw_utilities-0.138.2}/src/utilities/click.py

@@ -8,7 +8,7 @@ from typing import TYPE_CHECKING, TypedDict, assert_never, override
 import click
 import whenever
 from click import Choice, Context, Parameter, ParamType
-from click.types import StringParamType
+from click.types import IntParamType, StringParamType
 
 import utilities.whenever
 from utilities.enum import EnsureEnumError, ensure_enum
@@ -478,6 +478,14 @@ class FrozenSetEnums[E: enum.Enum](FrozenSetParameter[Enum[E], E]):
         super().__init__(Enum(enum, case_sensitive=case_sensitive), separator=separator)
 
 
+class FrozenSetInts(FrozenSetParameter[IntParamType, int]):
+    """A frozenset-of-ints-valued parameter."""
+
+    @override
+    def __init__(self, *, separator: str = ",") -> None:
+        super().__init__(IntParamType(), separator=separator)
+
+
 class FrozenSetStrs(FrozenSetParameter[StringParamType, str]):
     """A frozenset-of-strs-valued parameter."""
 
@@ -555,6 +563,14 @@ class ListEnums[E: enum.Enum](ListParameter[Enum[E], E]):
         super().__init__(Enum(enum, case_sensitive=case_sensitive), separator=separator)
 
 
+class ListInts(ListParameter[IntParamType, int]):
+    """A list-of-ints-valued parameter."""
+
+    @override
+    def __init__(self, *, separator: str = ",") -> None:
+        super().__init__(IntParamType(), separator=separator)
+
+
 class ListStrs(ListParameter[StringParamType, str]):
     """A list-of-strs-valued parameter."""
 
@@ -590,6 +606,7 @@ __all__ = [
     "IPv6Address",
     "ListChoices",
     "ListEnums",
+    "ListInts",
     "ListParameter",
     "ListStrs",
     "MonthDay",

{dycw_utilities-0.138.0 → dycw_utilities-0.138.2}/src/utilities/whenever.py

@@ -25,6 +25,7 @@ from whenever import (
     PlainDateTime,
     Time,
     TimeDelta,
+    YearMonth,
     ZonedDateTime,
 )
 
@@ -670,6 +671,18 @@ def to_zoned_date_time(
 ##
 
 
+def two_digit_year_month(year: int, month: int, /) -> YearMonth:
+    """Construct a year-month from a 2-digit year."""
+    min_year = DATE_TWO_DIGIT_YEAR_MIN.year
+    max_year = DATE_TWO_DIGIT_YEAR_MAX.year
+    years = range(min_year, max_year + 1)
+    (year_use,) = (y for y in years if y % 100 == year)
+    return YearMonth(year_use, month)
+
+
+##
+
+
 class WheneverLogRecord(LogRecord):
     """Log record powered by `whenever`."""
 
@@ -774,4 +787,5 @@ __all__ = [
     "to_local_plain",
     "to_nanos",
     "to_zoned_date_time",
+    "two_digit_year_month",
 ]