dycw-utilities 0.133.7__tar.gz → 0.134.0__tar.gz

{dycw_utilities-0.133.7 → dycw_utilities-0.134.0}/PKG-INFO

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

{dycw_utilities-0.133.7 → dycw_utilities-0.134.0}/pyproject.toml

@@ -104,7 +104,7 @@ dependencies = [
 name = "dycw-utilities"
 readme = "README.md"
 requires-python = ">= 3.12"
-version = "0.133.7"
+version = "0.134.0"
 
 [project.optional-dependencies]
 logging = [
@@ -131,7 +131,7 @@ test = [
 # bump-my-version
 [tool.bumpversion]
 allow_dirty = true
-current_version = "0.133.7"
+current_version = "0.134.0"
 
 [[tool.bumpversion.files]]
 filename = "src/utilities/__init__.py"
@@ -292,6 +292,7 @@ ignore = [
   "E501",  # line-too-long
   "PD",  # pandas-vet
   "PERF203",  # try-except-in-loop
+  "PLC0415",  # import-outside-top-level
   "PLR0911",  # too-many-return-statements
   "PLR0912",  # too-many-branches
   "PLR0913",  # too-many-arguments

{dycw_utilities-0.133.7 → dycw_utilities-0.134.0}/src/tests/test_arq.py

@@ -12,11 +12,11 @@ from utilities.arq import Worker, cron_raw, job_enqueuer
 from utilities.iterables import one
 
 if TYPE_CHECKING:
-    from collections.abc import Sequence
+    from collections.abc import Callable, Sequence
 
     from arq.typing import WorkerCoroutine
 
-    from utilities.types import CallableCoroutine1
+    from utilities.types import Coro
 
 
 class TestCronRaw:
@@ -51,7 +51,7 @@ class TestWorker:
             return x + y
 
         class Example(Worker):
-            functions_raw: Sequence[CallableCoroutine1[Any]] = [func]
+            functions_raw: Sequence[Callable[..., Coro[Any]]] = [func]
 
         func_use = cast("WorkerCoroutine", one(Example.functions))
         result = await func_use({}, x, y)

{dycw_utilities-0.133.7 → dycw_utilities-0.134.0}/src/tests/test_click.py

@@ -5,7 +5,7 @@ from dataclasses import dataclass
 from enum import auto
 from operator import attrgetter
 from re import search
-from typing import TYPE_CHECKING, Any, ClassVar, Generic, TypeVar
+from typing import TYPE_CHECKING, Any, ClassVar
 
 import whenever
 from click import ParamType, argument, command, echo, option
@@ -68,9 +68,6 @@ if TYPE_CHECKING:
     from pathlib import Path
 
 
-_T = TypeVar("_T")
-
-
 class TestContextSettingsHelpOptionNames:
     @given(help_=sampled_from(["-h", "--help"]))
     def test_main(self, *, help_: str) -> None:
@@ -175,22 +172,22 @@ class _ExampleEnum(enum.Enum):
     c = auto()
 
 
-def _lift_serializer(
-    serializer: Callable[[_T], str], /, *, sort: bool = False
-) -> Callable[[Iterable[_T]], str]:
-    def wrapped(values: Iterable[_T], /) -> str:
+def _lift_serializer[T](
+    serializer: Callable[[T], str], /, *, sort: bool = False
+) -> Callable[[Iterable[T]], str]:
+    def wrapped(values: Iterable[T], /) -> str:
         return join_strs(map(serializer, values), sort=sort)
 
     return wrapped
 
 
 @dataclass(kw_only=True, slots=True)
-class _Case(Generic[_T]):
+class _Case[T]:
     param: ParamType
     name: str
     repr: str | None = None
-    strategy: SearchStrategy[_T]
-    serialize: Callable[[_T], str]
+    strategy: SearchStrategy[T]
+    serialize: Callable[[T], str]
     failable: bool = False
 
 

{dycw_utilities-0.133.7 → dycw_utilities-0.134.0}/src/tests/test_eventkit.py

@@ -6,7 +6,7 @@ from functools import wraps
 from io import StringIO
 from logging import StreamHandler, getLogger
 from re import search
-from typing import TYPE_CHECKING, Literal, ParamSpec, TypeVar
+from typing import TYPE_CHECKING, Literal
 
 from eventkit import Event
 from hypothesis import given
@@ -26,10 +26,6 @@ if TYPE_CHECKING:
     from pathlib import Path
 
 
-_P = ParamSpec("_P")
-_R = TypeVar("_R")
-
-
 class TestAddListener:
     @given(sync_or_async=sampled_from(["sync", "async"]))
     async def test_main(self, *, sync_or_async: Literal["sync", "async"]) -> None:
@@ -210,9 +206,9 @@ class TestAddListener:
             nonlocal counter
             counter += 1
 
-        def increment(func: Callable[_P, _R], /) -> Callable[_P, _R]:
+        def increment[**P, R](func: Callable[P, R], /) -> Callable[P, R]:
             @wraps(func)
-            def wrapped(*args: _P.args, **kwargs: _P.kwargs) -> _R:
+            def wrapped(*args: P.args, **kwargs: P.kwargs) -> R:
                 nonlocal counter
                 counter += 1
                 return func(*args, **kwargs)

{dycw_utilities-0.133.7 → dycw_utilities-0.134.0}/src/tests/test_functions.py

@@ -7,7 +7,7 @@ from itertools import chain
 from operator import neg
 from pathlib import Path
 from types import NoneType
-from typing import TYPE_CHECKING, Any, ClassVar, ParamSpec, TypeVar, cast
+from typing import TYPE_CHECKING, Any, ClassVar, cast
 
 from hypothesis import given
 from hypothesis.strategies import (
@@ -106,11 +106,6 @@ if TYPE_CHECKING:
     from utilities.types import Number
 
 
-_P = ParamSpec("_P")
-_R = TypeVar("_R")
-_T = TypeVar("_T")
-
-
 class TestApplyDecorators:
     @given(n=integers())
     def test_main(self, *, n: int) -> None:
@@ -119,9 +114,9 @@ class TestApplyDecorators:
         def negate(x: int, /) -> int:
             return -x
 
-        def increment(func: Callable[_P, _R], /) -> Callable[_P, _R]:
+        def increment[**P, T](func: Callable[P, T], /) -> Callable[P, T]:
             @wraps(func)
-            def wrapped(*args: _P.args, **kwargs: _P.kwargs) -> _R:
+            def wrapped(*args: P.args, **kwargs: P.kwargs) -> T:
                 nonlocal counter
                 counter += 1
                 return func(*args, **kwargs)
@@ -538,7 +533,7 @@ class TestGetFuncNameAndGetFuncQualName:
 
     def test_decorated(self) -> None:
         @wraps(identity)
-        def wrapped(x: _T, /) -> _T:
+        def wrapped[T](x: T, /) -> T:
             return identity(x)
 
         assert get_func_name(wrapped) == "identity"
@@ -557,7 +552,7 @@ class TestGetFuncNameAndGetFuncQualName:
 
     def test_object(self) -> None:
         class Example:
-            def __call__(self, x: _T, /) -> _T:
+            def __call__[T](self, x: T, /) -> T:
                 return identity(x)
 
         obj = Example()
@@ -566,7 +561,7 @@ class TestGetFuncNameAndGetFuncQualName:
 
     def test_obj_method(self) -> None:
         class Example:
-            def obj_method(self, x: _T) -> _T:
+            def obj_method[T](self, x: T) -> T:
                 return identity(x)
 
         obj = Example()
@@ -579,7 +574,7 @@ class TestGetFuncNameAndGetFuncQualName:
     def test_obj_classmethod(self) -> None:
         class Example:
             @classmethod
-            def obj_classmethod(cls: _T) -> _T:
+            def obj_classmethod[T](cls: T) -> T:
                 return identity(cls)
 
         assert get_func_name(Example.obj_classmethod) == "Example.obj_classmethod"
@@ -591,7 +586,7 @@ class TestGetFuncNameAndGetFuncQualName:
     def test_obj_staticmethod(self) -> None:
         class Example:
             @staticmethod
-            def obj_staticmethod(x: _T) -> _T:
+            def obj_staticmethod[T](x: T) -> T:
                 return identity(x)
 
         assert get_func_name(Example.obj_staticmethod) == "Example.obj_staticmethod"

{dycw_utilities-0.133.7 → dycw_utilities-0.134.0}/src/tests/test_timer.py

@@ -101,6 +101,10 @@ class TestTimer:
             await sleep_td(2 * delta)
         assert timer >= delta
 
+    def test_hashable(self) -> None:
+        timer = Timer()
+        _ = hash(timer)
+
     @mark.parametrize("func", [param(repr), param(str)])
     async def test_repr_and_str(self, *, func: Callable[[Timer], str]) -> None:
         with Timer() as timer:

{dycw_utilities-0.133.7 → dycw_utilities-0.134.0}/src/tests/test_typed_settings.py

@@ -2,7 +2,6 @@ from collections.abc import Callable
 from dataclasses import dataclass
 from ipaddress import IPv4Address, IPv6Address
 from pathlib import Path
-from typing import TypeVar
 
 import typed_settings
 from hypothesis import given
@@ -43,9 +42,6 @@ from utilities.whenever import Freq
 app_names = text_ascii(min_size=1).map(str.lower)
 
 
-_T = TypeVar("_T")
-
-
 class TestExtendedTSConverter:
     @given(data=data(), root=temp_paths(), app_name=app_names)
     @mark.parametrize(
@@ -67,15 +63,15 @@ class TestExtendedTSConverter:
             param(ZonedDateTime, zoned_datetimes(), ZonedDateTime.format_common_iso),
         ],
     )
-    def test_main(
+    def test_main[T](
         self,
         *,
         data: DataObject,
         root: Path,
         app_name: str,
-        test_cls: type[_T],
-        strategy: SearchStrategy[_T],
-        serialize: Callable[[_T], str],
+        test_cls: type[T],
+        strategy: SearchStrategy[T],
+        serialize: Callable[[T], str],
     ) -> None:
         default, value = data.draw(tuples(strategy, strategy))
 

{dycw_utilities-0.133.7 → dycw_utilities-0.134.0}/src/tests/test_types.py

@@ -9,13 +9,13 @@ from hypothesis.strategies import sampled_from
 from pytest import mark, param
 
 from utilities.platform import SYSTEM
-from utilities.types import Number, PathLike, TDataclass, TimeZone
+from utilities.types import Dataclass, Number, PathLike, TimeZone
 from utilities.typing import get_literal_elements
 
 
 class TestDataClassProtocol:
     def test_main(self) -> None:
-        def identity(x: TDataclass, /) -> TDataclass:
+        def identity[T: Dataclass](x: T, /) -> T:
             return x
 
         @dataclass(kw_only=True, slots=True)

{dycw_utilities-0.133.7 → dycw_utilities-0.134.0}/src/utilities/__init__.py

@@ -1,3 +1,3 @@
 from __future__ import annotations
 
-__version__ = "0.133.7"
+__version__ = "0.134.0"

{dycw_utilities-0.133.7 → dycw_utilities-0.134.0}/src/utilities/arq.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from dataclasses import dataclass
 from functools import wraps
 from itertools import chain
-from typing import TYPE_CHECKING, Any, ParamSpec, Self, TypeVar, cast, override
+from typing import TYPE_CHECKING, Any, Self, cast, override
 
 from arq.constants import default_queue_name, expires_extra_ms
 from arq.cron import cron
@@ -27,18 +27,11 @@ if TYPE_CHECKING:
     )
     from arq.worker import Function
 
-    from utilities.types import CallableCoroutine1, Coroutine1, StrMapping
-
-
-_P = ParamSpec("_P")
-_T = TypeVar("_T")
-
-
-##
+    from utilities.types import Coro, StrMapping
 
 
 def cron_raw(
-    coroutine: CallableCoroutine1[Any],
+    coroutine: Callable[..., Coro[Any]],
     /,
     *,
     name: str | None = None,
@@ -83,13 +76,13 @@ def cron_raw(
     )
 
 
-def _lift_cron(
-    func: Callable[_P, Coroutine1[_T]], *args: _P.args, **kwargs: _P.kwargs
+def _lift_cron[**P, T](
+    func: Callable[P, Coro[T]], *args: P.args, **kwargs: P.kwargs
 ) -> WorkerCoroutine:
     """Lift a coroutine function & call arg/kwargs for `cron`."""
 
     @wraps(func)
-    async def wrapped(ctx: StrMapping, /) -> _T:
+    async def wrapped(ctx: StrMapping, /) -> T:
         _ = ctx
         return await func(*args, **kwargs)
 
@@ -110,12 +103,12 @@ class _JobEnqueuer:
     expires: int | float | timedelta | None = None
     job_try: int | None = None
 
-    async def __call__(
+    async def __call__[**P, T](
         self,
         redis: ArqRedis,
-        function: Callable[_P, Coroutine1[_T]],
-        *args: _P.args,
-        **kwargs: _P.kwargs,
+        function: Callable[P, Coro[T]],
+        *args: P.args,
+        **kwargs: P.kwargs,
     ) -> Job | None:
         return await redis.enqueue_job(  # skipif-ci-and-not-linux
             function.__name__,
@@ -171,11 +164,11 @@ class _WorkerMeta(type):
         return cls
 
     @classmethod
-    def _lift(cls, func: Callable[_P, Coroutine1[_T]]) -> WorkerCoroutine:
+    def _lift[**P, T](cls, func: Callable[P, Coro[T]]) -> WorkerCoroutine:
         """Lift a coroutine function to accept the required `ctx` argument."""
 
         @wraps(func)
-        async def wrapped(ctx: StrMapping, *args: _P.args, **kwargs: _P.kwargs) -> _T:
+        async def wrapped(ctx: StrMapping, *args: P.args, **kwargs: P.kwargs) -> T:
             _ = ctx
             return await func(*args, **kwargs)
 
@@ -187,7 +180,7 @@ class Worker(metaclass=_WorkerMeta):
     """Base class for all workers."""
 
     functions: Sequence[Function | WorkerCoroutine] = ()
-    functions_raw: Sequence[CallableCoroutine1[Any]] = ()
+    functions_raw: Sequence[Callable[..., Coro[Any]]] = ()
     queue_name: str | None = default_queue_name
     cron_jobs: Sequence[CronJob] | None = None
     redis_settings: RedisSettings | None = None