dycw-utilities 0.151.7__tar.gz → 0.151.9__tar.gz

{dycw_utilities-0.151.7 → dycw_utilities-0.151.9}/PKG-INFO

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

{dycw_utilities-0.151.7 → dycw_utilities-0.151.9}/pyproject.toml

@@ -232,7 +232,7 @@ dependencies = [
 name = "dycw-utilities"
 readme = "README.md"
 requires-python = ">= 3.12"
-version = "0.151.7"
+version = "0.151.9"
 
 [project.entry-points.pytest11]
 pytest-randomly = "utilities.pytest_plugins.pytest_randomly"
@@ -265,7 +265,7 @@ test = [
 # bump-my-version
 [tool.bumpversion]
 allow_dirty = true
-current_version = "0.151.7"
+current_version = "0.151.9"
 
 [[tool.bumpversion.files]]
 filename = "src/utilities/__init__.py"
@@ -295,7 +295,7 @@ directory = ".coverage/html"
 exclude_also = [
   "@overload",
   "assert_never",
-  "case _ as never:",
+  "case never:",
   "if TYPE_CHECKING:",
 ]
 fail_under = 100.0
@@ -352,6 +352,7 @@ reportUnknownArgumentType = false
 reportUnknownMemberType = false
 reportUnknownParameterType = false
 reportUnknownVariableType = false
+reportUnnecessaryComparison = false
 reportUnnecessaryTypeIgnoreComment = true
 reportUnusedCallResult = true
 reportUnusedImport = false

{dycw_utilities-0.151.7 → dycw_utilities-0.151.9}/src/tests/test_period.py

@@ -4,7 +4,7 @@ from re import search
 from typing import TYPE_CHECKING, Any, cast
 
 from hypothesis import HealthCheck, given, settings
-from hypothesis.strategies import DataObject, data
+from hypothesis.strategies import DataObject, data, sampled_from
 from pytest import mark, param, raises
 from whenever import Date, Time, ZonedDateTime
 
@@ -17,6 +17,7 @@ from utilities.hypothesis import (
     time_deltas,
     times,
     zoned_datetimes,
+    zoned_datetimes_2000,
 )
 from utilities.period import (
     DatePeriod,
@@ -145,13 +146,20 @@ class TestDatePeriod:
         expected = DatePeriod(start - delta, end - delta)
         assert result == expected
 
-    @given(dates=pairs(dates(), sorted=True))
-    def test_to_dict(self, *, dates: tuple[Date, Date]) -> None:
+    @given(data=data(), dates=pairs(dates(), sorted=True))
+    def test_to_and_from_dict(
+        self, *, data: DataObject, dates: tuple[Date, Date]
+    ) -> None:
         start, end = dates
         period = DatePeriod(start, end)
-        result = period.to_dict()
-        expected = _PeriodAsDict(start=start, end=end)
-        assert result == expected
+        dict1 = period.to_dict()
+        dstart, dend = dict1["start"], dict1["end"]
+        dict2 = _PeriodAsDict(
+            start=data.draw(sampled_from([dstart, dstart.py_date()])),
+            end=data.draw(sampled_from([dend, dend.py_date()])),
+        )
+        result = DatePeriod.from_dict(dict2)
+        assert result == period
 
     @given(dates=pairs(dates(), unique=True, sorted=True))
     def test_error_period_invalid(self, *, dates: tuple[Date, Date]) -> None:
@@ -224,13 +232,20 @@ class TestTimePeriod:
             result,
         )
 
-    @given(times=pairs(times()))
-    def test_to_dict(self, *, times: tuple[Time, Time]) -> None:
+    @given(data=data(), times=pairs(times()))
+    def test_to_and_from_dict(
+        self, *, data: DataObject, times: tuple[Time, Time]
+    ) -> None:
         start, end = times
         period = TimePeriod(start, end)
-        result = period.to_dict()
-        expected = _PeriodAsDict(start=start, end=end)
-        assert result == expected
+        dict1 = period.to_dict()
+        dstart, dend = dict1["start"], dict1["end"]
+        dict2 = _PeriodAsDict(
+            start=data.draw(sampled_from([dstart, dstart.py_time()])),
+            end=data.draw(sampled_from([dend, dend.py_time()])),
+        )
+        result = TimePeriod.from_dict(dict2)
+        assert result == period
 
 
 class TestZonedDateTimePeriod:
@@ -455,13 +470,20 @@ class TestZonedDateTimePeriod:
         expected = ZonedDateTimePeriod(start - delta, end - delta)
         assert result == expected
 
-    @given(datetimes=pairs(zoned_datetimes(), sorted=True))
-    def test_to_dict(self, *, datetimes: tuple[ZonedDateTime, ZonedDateTime]) -> None:
+    @given(data=data(), datetimes=pairs(zoned_datetimes_2000, sorted=True))
+    def test_to_and_from_dict(
+        self, data: DataObject, *, datetimes: tuple[ZonedDateTime, ZonedDateTime]
+    ) -> None:
         start, end = datetimes
         period = ZonedDateTimePeriod(start, end)
-        result = period.to_dict()
-        expected = _PeriodAsDict(start=start, end=end)
-        assert result == expected
+        dict1 = period.to_dict()
+        dstart, dend = dict1["start"], dict1["end"]
+        dict2 = _PeriodAsDict(
+            start=data.draw(sampled_from([dstart, dstart.py_datetime()])),
+            end=data.draw(sampled_from([dend, dend.py_datetime()])),
+        )
+        result = ZonedDateTimePeriod.from_dict(dict2)
+        assert result == period
 
     @given(datetimes=pairs(zoned_datetimes(), sorted=True))
     def test_to_tz(self, *, datetimes: tuple[ZonedDateTime, ZonedDateTime]) -> None:

{dycw_utilities-0.151.7 → dycw_utilities-0.151.9}/src/tests/test_platform.py

@@ -38,7 +38,7 @@ class TestGetMaxPID:
                 assert isinstance(result, int)
             case "linux":  # skipif-not-linux
                 assert isinstance(result, int)
-            case _ as never:
+            case never:
                 assert_never(never)
 
     def test_constant(self) -> None:
@@ -49,7 +49,7 @@ class TestGetMaxPID:
                 assert isinstance(MAX_PID, int)
             case "linux":  # skipif-not-linux
                 assert isinstance(MAX_PID, int)
-            case _ as never:
+            case never:
                 assert_never(never)
 
 
@@ -93,5 +93,5 @@ class TestMaybeYieldLowerCase:
                 assert all(text == text.lower() for text in result)
             case "linux":  # skipif-not-linux
                 assert result == text
-            case _ as never:
+            case never:
                 assert_never(never)

{dycw_utilities-0.151.7 → dycw_utilities-0.151.9}/src/tests/test_typed_settings.py

@@ -211,7 +211,7 @@ class TestExtendedTSConverter:
                 expected = Path.cwd().joinpath(path)
             case False:
                 expected = Path(path)
-            case _ as never:
+            case never:
                 assert_never(never)
         assert settings.value == expected
 

{dycw_utilities-0.151.7 → dycw_utilities-0.151.9}/src/tests/test_whenever.py

@@ -32,6 +32,7 @@ from utilities.hypothesis import (
     sentinels,
     times,
     zoned_datetimes,
+    zoned_datetimes_2000,
 )
 from utilities.sentinel import Sentinel, sentinel
 from utilities.tzdata import HongKong, Tokyo
@@ -1184,12 +1185,6 @@ class TestToYears:
             _ = to_years(delta)
 
 
-zoned_datetimes_2000 = zoned_datetimes(
-    min_value=ZonedDateTime(2000, 1, 1, tz=UTC.key),
-    max_value=ZonedDateTime(2000, 12, 31, tz=UTC.key),
-)
-
-
 class TestToZonedDateTime:
     @given(date_time=zoned_datetimes())
     def test_date_time(self, *, date_time: ZonedDateTime) -> None:

{dycw_utilities-0.151.7 → dycw_utilities-0.151.9}/src/utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.151.7"
+__version__ = "0.151.9"

{dycw_utilities-0.151.7 → dycw_utilities-0.151.9}/src/utilities/atomicwrites.py

@@ -57,7 +57,7 @@ def move(
             raise ImpossibleCaseError(
                 case=[f"{source.is_file()=}", f"{source.is_dir()=}"]
             )
-        case _ as never:
+        case never:
             assert_never(never)
 
 

{dycw_utilities-0.151.7 → dycw_utilities-0.151.9}/src/utilities/click.py

@@ -85,7 +85,7 @@ class Date(ParamType):
                     return whenever.Date.parse_common_iso(value)
                 except ValueError as error:
                     self.fail(str(error), param, ctx)
-            case _ as never:
+            case never:
                 assert_never(never)
 
 
@@ -111,7 +111,7 @@ class DateDelta(ParamType):
                     return whenever.DateDelta.parse_common_iso(value)
                 except ValueError as error:
                     self.fail(str(error), param, ctx)
-            case _ as never:
+            case never:
                 assert_never(never)
 
 
@@ -137,7 +137,7 @@ class DateTimeDelta(ParamType):
                     return whenever.DateTimeDelta.parse_common_iso(value)
                 except ValueError as error:
                     self.fail(str(error), param, ctx)
-            case _ as never:
+            case never:
                 assert_never(never)
 
 
@@ -196,7 +196,7 @@ class IPv4Address(ParamType):
                     return parse_object(ipaddress.IPv4Address, value)
                 except ParseObjectError as error:
                     self.fail(str(error), param, ctx)
-            case _ as never:
+            case never:
                 assert_never(never)
 
 
@@ -222,7 +222,7 @@ class IPv6Address(ParamType):
                     return parse_object(ipaddress.IPv6Address, value)
                 except ParseObjectError as error:
                     self.fail(str(error), param, ctx)
-            case _ as never:
+            case never:
                 assert_never(never)
 
 
@@ -248,7 +248,7 @@ class MonthDay(ParamType):
                     return whenever.MonthDay.parse_common_iso(value)
                 except ValueError as error:
                     self.fail(str(error), param, ctx)
-            case _ as never:
+            case never:
                 assert_never(never)
 
 
@@ -274,7 +274,7 @@ class PlainDateTime(ParamType):
                     return whenever.PlainDateTime.parse_common_iso(value)
                 except ValueError as error:
                     self.fail(str(error), param, ctx)
-            case _ as never:
+            case never:
                 assert_never(never)
 
 
@@ -300,7 +300,7 @@ class Time(ParamType):
                     return whenever.Time.parse_common_iso(value)
                 except ValueError as error:
                     self.fail(str(error), param, ctx)
-            case _ as never:
+            case never:
                 assert_never(never)
 
 
@@ -326,7 +326,7 @@ class TimeDelta(ParamType):
                     return whenever.TimeDelta.parse_common_iso(value)
                 except ValueError as error:
                     self.fail(str(error), param, ctx)
-            case _ as never:
+            case never:
                 assert_never(never)
 
 
@@ -352,7 +352,7 @@ class UUID(ParamType):
                     return uuid.UUID(value)
                 except ValueError as error:
                     self.fail(str(error), param, ctx)
-            case _ as never:
+            case never:
                 assert_never(never)
 
 
@@ -378,7 +378,7 @@ class YearMonth(ParamType):
                     return whenever.YearMonth.parse_common_iso(value)
                 except ValueError as error:
                     self.fail(str(error), param, ctx)
-            case _ as never:
+            case never:
                 assert_never(never)
 
 
@@ -404,7 +404,7 @@ class ZonedDateTime(ParamType):
                     return whenever.ZonedDateTime.parse_common_iso(value)
                 except ValueError as error:
                     self.fail(str(error), param, ctx)
-            case _ as never:
+            case never:
                 assert_never(never)
 
 

{dycw_utilities-0.151.7 → dycw_utilities-0.151.9}/src/utilities/concurrent.py

@@ -84,7 +84,7 @@ def concurrent_starmap[T](
                 initargs=initargs,
             ) as pool:
                 result = pool.map(apply, iterable, timeout=timeout, chunksize=chunksize)
-        case _ as never:
+        case never:
             assert_never(never)
     return list(result)
 

{dycw_utilities-0.151.7 → dycw_utilities-0.151.9}/src/utilities/contextlib.py

@@ -210,7 +210,7 @@ def _make_handler(
                 _ = loop.call_soon_threadsafe(
                     create_task, agcm.__aexit__(None, None, None)
                 )
-            case _ as never:
+            case never:
                 assert_never(never)
         if callable(orig_handler):  # pragma: no cover
             orig_handler(signum, frame)

{dycw_utilities-0.151.7 → dycw_utilities-0.151.9}/src/utilities/dataclasses.py

@@ -214,7 +214,7 @@ def is_nullable_lt[T: SupportsLT](x: T | None, y: T | None, /) -> bool | None:
             return True
         case 0:
             return None
-        case _ as never:
+        case never:
             assert_never(never)
 
 
@@ -520,7 +520,7 @@ def parse_dataclass[T: Dataclass](
             )
         case Mapping() as keys_to_serializes:
             ...
-        case _ as never:
+        case never:
             assert_never(never)
     fields = list(
         yield_fields(
@@ -1002,7 +1002,7 @@ def _empty_error_str_core(
             return f"any field starting with {key!r}"
         case True, False:
             return f"any field starting with {key!r} (modulo case)"
-        case _ as never:
+        case never:
             assert_never(never)
 
 
@@ -1043,7 +1043,7 @@ def _non_unique_error_str_core(
             head_msg = f"exactly one field starting with {key!r}"
         case True, False:
             head_msg = f"exactly one field starting with {key!r} (modulo case)"
-        case _ as never:
+        case never:
             assert_never(never)
     return f"{head_msg}; got {first!r}, {second!r} and perhaps more"
 

{dycw_utilities-0.151.7 → dycw_utilities-0.151.9}/src/utilities/enum.py

@@ -95,7 +95,7 @@ def parse_enum[E: Enum](
                 by_name=by_name.name,
                 by_value=by_value.name,
             )
-        case _ as never:
+        case never:
             assert_never(never)
 
 
@@ -116,7 +116,7 @@ def _parse_enum_one[E: Enum](
             names = [e.name for e in enum]
         case "values":
             names = [ensure_str(e.value) for e in enum]
-        case _ as never:
+        case never:
             assert_never(never)
     try:
         name = one_str(names, value, case_sensitive=case_sensitive)

{dycw_utilities-0.151.7 → dycw_utilities-0.151.9}/src/utilities/errors.py

@@ -46,7 +46,7 @@ def repr_error(error: MaybeType[BaseException], /) -> str:
             return f"{error_obj.__class__.__name__}({error_obj})"
         case type() as error_cls:
             return error_cls.__name__
-        case _ as never:
+        case never:
             assert_never(never)
 
 

{dycw_utilities-0.151.7 → dycw_utilities-0.151.9}/src/utilities/eventkit.py

@@ -359,9 +359,9 @@ def lift_listener[F1: Callable[..., MaybeCoro[None]], F2: Callable](
                             error_typed(event, exc)
 
                     lifted = listener_have_error_async
-                case _ as never:
+                case never:
                     assert_never(never)
-        case _ as never:
+        case never:
             assert_never(never)
 
     if decorators is not None:

{dycw_utilities-0.151.7 → dycw_utilities-0.151.9}/src/utilities/functions.py

@@ -960,7 +960,7 @@ def to_bool(
             return bool_
         case Callable() as func:
             return to_bool(bool_=func())
-        case _ as never:
+        case never:
             assert_never(never)
 
 

{dycw_utilities-0.151.7 → dycw_utilities-0.151.9}/src/utilities/hypothesis.py

@@ -1415,6 +1415,11 @@ def zoned_datetimes(
     return zoned
 
 
+zoned_datetimes_2000 = zoned_datetimes(
+    min_value=ZonedDateTime(2000, 1, 1, tz=UTC.key),
+    max_value=ZonedDateTime(2000, 12, 31, tz=UTC.key),
+)
+
 __all__ = [
     "Draw2Error",
     "MaybeSearchStrategy",
@@ -1468,4 +1473,5 @@ __all__ = [
     "versions",
     "year_months",
     "zoned_datetimes",
+    "zoned_datetimes_2000",
 ]

{dycw_utilities-0.151.7 → dycw_utilities-0.151.9}/src/utilities/inflect.py

@@ -15,7 +15,7 @@ def counted_noun(obj: int | Sized, noun: str, /) -> str:
             ...
         case Sized() as sized:
             count = len(sized)
-        case _ as never:
+        case never:
             assert_never(never)
     word = cast("Word", noun)
     sin_or_plu = _ENGINE.plural_noun(word, count=count)

{dycw_utilities-0.151.7 → dycw_utilities-0.151.9}/src/utilities/iterables.py

@@ -295,7 +295,7 @@ class CheckIterablesEqualError[T](Exception):
                 yield "right was longer"
             case None:
                 pass
-            case _ as never:
+            case never:
                 assert_never(never)
 
 
@@ -690,7 +690,7 @@ def cmp_nullable[T: SupportsLT](x: T | None, y: T | None, /) -> Sign:
             return 1
         case _, _:
             return cast("Sign", (x > y) - (x < y))
-        case _ as never:
+        case never:
             assert_never(never)
 
 
@@ -1068,7 +1068,7 @@ def one_str(
             it = (t for t in as_list if t.startswith(text))
         case True, False:
             it = (t for t in as_list if t.lower().startswith(text.lower()))
-        case _ as never:
+        case never:
             assert_never(never)
     try:
         return one(it)
@@ -1109,7 +1109,7 @@ class OneStrEmptyError(OneStrError):
                 tail = f"any string starting with {self.text!r}"
             case True, False:
                 tail = f"any string starting with {self.text!r} (modulo case)"
-            case _ as never:
+            case never:
                 assert_never(never)
         return f"{head} {tail}"
 
@@ -1131,7 +1131,7 @@ class OneStrNonUniqueError(OneStrError):
                 mid = f"exactly one string starting with {self.text!r}"
             case True, False:
                 mid = f"exactly one string starting with {self.text!r} (modulo case)"
-            case _ as never:
+            case never:
                 assert_never(never)
         return f"{head} {mid}; got {self.first!r}, {self.second!r} and perhaps more"
 
@@ -1382,7 +1382,7 @@ def _sort_iterable_cmp_floats(x: float, y: float, /) -> Sign:
             return -1
         case False, False:
             return cast("Sign", (x > y) - (x < y))
-        case _ as never:
+        case never:
             assert_never(never)
 
 

{dycw_utilities-0.151.7 → dycw_utilities-0.151.9}/src/utilities/json.py

@@ -36,7 +36,7 @@ def run_prettier(source: bytes | str | Path, /) -> bytes | str | None:
             with writer(path, overwrite=True) as temp:
                 _ = temp.write_bytes(result)
             return None
-        case _ as never:
+        case never:
             assert_never(never)
 
 

{dycw_utilities-0.151.7 → dycw_utilities-0.151.9}/src/utilities/libcst.py

@@ -54,7 +54,7 @@ def generate_import_from(
         case _, str():
             alias = ImportAlias(name=Name(name), asname=AsName(Name(asname)))
             names = [alias]
-        case _ as never:
+        case never:
             assert_never(never)
     return ImportFrom(module=split_dotted_str(module), names=names)
 
@@ -92,9 +92,9 @@ def parse_import(import_: Import | ImportFrom, /) -> Sequence[_ParseImportOutput
                     return [_parse_import_from_one(module, n) for n in names]
                 case ImportStar():
                     return [_ParseImportOutput(module=module, name="*")]
-                case _ as never:
+                case never:
                     assert_never(never)
-        case _ as never:
+        case never:
             assert_never(never)
 
 
@@ -108,7 +108,7 @@ def _parse_import_from_one(module: str, alias: ImportAlias, /) -> _ParseImportOu
             return _ParseImportOutput(module=module, name=name)
         case Attribute() as attr:
             raise _ParseImportAliasError(module=module, attr=attr)
-        case _ as never:
+        case never:
             assert_never(never)
 
 
@@ -162,7 +162,7 @@ def join_dotted_str(name_or_attr: Name | Attribute, /) -> str:
                 curr = value
             case BaseExpression():  # pragma: no cover
                 raise ImpossibleCaseError(case=[f"{curr=}"])
-            case _ as never:
+            case never:
                 assert_never(never)
     return ".".join(reversed(parts))
 
@@ -180,7 +180,7 @@ def render_module(source: str | Module, /) -> str:
                 return text
         case Module() as module:
             return render_module(module.code)
-        case _ as never:
+        case never:
             assert_never(never)
 
 

{dycw_utilities-0.151.7 → dycw_utilities-0.151.9}/src/utilities/math.py

@@ -731,7 +731,7 @@ def round_(
                     return 0
                 case -1:
                     return floor(x)
-                case _ as never:
+                case never:
                     assert_never(never)
         case "standard-tie-floor":
             return _round_tie_standard(x, "floor", rel_tol=rel_tol, abs_tol=abs_tol)
@@ -743,7 +743,7 @@ def round_(
             )
         case "standard-tie-away-zero":
             return _round_tie_standard(x, "away-zero", rel_tol=rel_tol, abs_tol=abs_tol)
-        case _ as never:
+        case never:
             assert_never(never)
 
 
@@ -876,7 +876,7 @@ def sign(
             if is_negative(x, rel_tol=rel_tol, abs_tol=abs_tol):
                 return -1
             return 0
-        case _ as never:
+        case never:
             assert_never(never)
 
 

{dycw_utilities-0.151.7 → dycw_utilities-0.151.9}/src/utilities/more_itertools.py

@@ -206,7 +206,7 @@ def bucket_mapping[T, U, UH: Hashable](
             return {k: frozenset(map(pre, v)) for k, v in mapping.items()}
         case Callable(), "unique":
             return _bucket_mapping_unique({k: map(pre, v) for k, v in mapping.items()})
-        case _ as never:
+        case never:
             assert_never(never)
 
 
@@ -374,7 +374,7 @@ def _yield_splits2[T](
                 len_tail = max(len_win - head, 0)
                 if len_tail >= 1:
                     yield window, head, len_tail
-            case _ as never:
+            case never:
                 assert_never(never)
 
 

{dycw_utilities-0.151.7 → dycw_utilities-0.151.9}/src/utilities/orjson.py

@@ -564,7 +564,7 @@ def _object_hook(
                 )
                 for k, v in mapping.items()
             }
-        case _ as never:
+        case never:
             assert_never(never)
 
 
@@ -1006,7 +1006,7 @@ class GetLogRecordsOutput:
                         for r in records
                         if (r.func_name is not None) and search(func_name, r.func_name)
                     ]
-                case _ as never:
+                case never:
                     assert_never(never)
         if extra is not None:
             match extra:
@@ -1019,7 +1019,7 @@ class GetLogRecordsOutput:
                         if (r.extra is not None)
                         and set(r.extra).issuperset(always_iterable(keys))
                     ]
-                case _ as never:
+                case never:
                     assert_never(never)
         if log_file is not None:
             match log_file:
@@ -1034,7 +1034,7 @@ class GetLogRecordsOutput:
                         if (r.log_file is not None)
                         and search(str(log_file), str(r.log_file))
                     ]
-                case _ as never:
+                case never:
                     assert_never(never)
         if log_file_line_num is not None:
             match log_file_line_num:
@@ -1048,7 +1048,7 @@ class GetLogRecordsOutput:
                     records = [
                         r for r in records if r.log_file_line_num == log_file_line_num
                     ]
-                case _ as never:
+                case never:
                     assert_never(never)
         if min_log_file_line_num is not None:
             records = [

{dycw_utilities-0.151.7 → dycw_utilities-0.151.9}/src/utilities/os.py

@@ -48,7 +48,7 @@ def get_cpu_use(*, n: IntOrAll = "all") -> int:
             raise GetCPUUseError(n=n)
         case "all":
             return CPU_COUNT
-        case _ as never:
+        case never:
             assert_never(never)
 
 
@@ -105,7 +105,7 @@ def get_env_var(
                 return None
             case str(), _:
                 return default
-            case _ as never:
+            case never:
                 assert_never(never)
     return environ[key_use]