Merge branch 'python-3.12'

.github/workflows/mypy.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.10", "3.11"]
+        python-version: ["3.10", "3.11", "3.12"]
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}

.github/workflows/pylint.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.10", "3.11"]
+        python-version: ["3.10", "3.11", "3.12"]
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}

.github/workflows/python-app.yml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: ["3.10", "3.11"]
+        python-version: ["3.10", "3.11", "3.12"]
     steps:
     - uses: actions/checkout@v3
     - name: Set up Python ${{ matrix.python-version }}

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## [Unreleased]
 
+### Add
+- Add python 3.12 support
+
+### Fixed
+- Fix Context and _ContextIterator type thing
+
 ## [0.10.2] - 2023-05-29
 
 ### Changed

kaioretry/context.py

@@ -93,7 +93,7 @@
 import logging
 import uuid
 
-from typing import cast, Awaitable, Any, TypeVar
+from typing import cast, Awaitable, Any, TypeVar, Generic
 from collections.abc import Callable, Generator, AsyncGenerator
 
 from .types import NonNegative, Number, UpdateDelayFunc
@@ -103,14 +103,15 @@
 SleepF = Callable[[Number], SleepRetVal]
 
 
-class _ContextIterator:
+class _ContextIterator(Generic[SleepRetVal]):
     """Single-usage helper class for Context objects."""
 
     # pylint: disable=too-few-public-methods
 
     def __init__(self, identifier: uuid.UUID, sleep: SleepF[Any], tries: int,
                  delay: NonNegative, update_delay: UpdateDelayFunc,
                  logger: logging.Logger, /) -> None:
+        # pylint: disable=too-many-arguments
         self.__identifier = identifier
         self.__sleep = sleep
         self.__delay = delay
@@ -189,6 +190,7 @@ def __init__(self, /, tries: int = -1, delay: NonNegative = 0, *,
                  max_delay: NonNegative | None = None,
                  min_delay: NonNegative = 0,
                  logger: logging.Logger = DEFAULT_LOGGER) -> None:
+        # pylint: disable=too-many-arguments
         if tries == 0:
             raise ValueError("tries value cannot be 0")
         self.__tries = tries
@@ -223,7 +225,7 @@ def __update_delay(self, delay: NonNegative) -> NonNegative:
         return delay
 
     def __make_iterator(
-            self, sleep: SleepF[Any]) -> Generator[SleepRetVal, None, None]:
+            self, sleep: SleepF[SleepRetVal]) -> Generator[SleepRetVal, None, None]:
         return iter(_ContextIterator(
             uuid.uuid4(), sleep, self.__tries, self.__delay,
             self.__update_delay, self.__logger))
@@ -234,8 +236,7 @@ def __iter__(self) -> Generator[None, None, None]:
 
     async def __aiter__(self) -> AsyncGenerator[None, None]:
         yield
-        for sleep in cast(Generator[Awaitable[None], None, None],
-                          self.__make_iterator(asyncio.sleep)):
+        for sleep in self.__make_iterator(asyncio.sleep):
             await sleep
             yield
 

kaioretry/decorator.py

@@ -165,10 +165,13 @@ def __success(self, func: Function) -> None:
         self.__log(
             logging.INFO, "%s has succesfully completed", func.__name__)
 
-    # pylint: disable=inconsistent-return-statements
     def __retry(self, func: Callable[FuncParam, FuncRetVal],
                 *args: FuncParam.args,
                 **kwargs: FuncParam.kwargs) -> FuncRetVal:
+        # pylint: disable=inconsistent-return-statements
+        # For some reason, pylint and python 3.12 seem to raise false
+        # positives no-members warnings on ParamSpec.
+        # pylint: disable=no-member
         for _ in self.__context:
             try:
                 result = func(*args, **kwargs)
@@ -206,6 +209,8 @@ async def __aioretry(
             Callable[FuncParam, FuncRetVal],
             *args: FuncParam.args,
             **kwargs: FuncParam.kwargs) -> FuncRetVal:
+        # See above.
+        # pylint: disable=no-member
         async for _ in self.__context:
             try:
                 result = func(*args, **kwargs)
@@ -290,8 +295,7 @@ def is_func_async(cls, func: Function) -> bool:
     def __call__(self, func: Callable[FuncParam, FuncRetVal]) \
             -> Callable[FuncParam, FuncRetVal]:
         if self.is_func_async(func):
-            return self.aioretry(
-                cast(Callable[FuncParam, Awaitable[Any]], func))
+            return cast(Callable[FuncParam, FuncRetVal], self.aioretry(func))
         return self.retry(func)
 
     def __str__(self) -> str:

pyproject.toml

@@ -14,6 +14,7 @@ classifiers = [
     "Intended Audience :: Developers",
     "Programming Language :: Python",
     "Programming Language :: Python :: 3 :: Only",
+    "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.10",
     "Topic :: Software Development"