chore: mark typing-extensions as non-required with python>=3.11

Author: danfimov

poetry.lock

@@ -19,7 +19,6 @@ classifiers = [
     "Programming Language :: Python",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
@@ -33,7 +32,7 @@ classifiers = [
 keywords = ["taskiq", "tasks", "distributed", "async"]
 requires-python = ">=3.9,<4"
 dependencies = [
-    "typing-extensions>=3.10.0.0",
+    "typing-extensions>=3.10.0.0; python_version < '3.11'",
     "pydantic>=1.0,<=3.0",
     "pycron>=3.0.0",
     "taskiq_dependencies>=1.3.1,<2",

pyproject.toml

@@ -23,8 +23,6 @@
 )
 from uuid import uuid4
 
-from typing_extensions import ParamSpec, Self, TypeAlias
-
 from taskiq.abc.middleware import TaskiqMiddleware
 from taskiq.abc.serializer import TaskiqSerializer
 from taskiq.acks import AckableMessage
@@ -39,6 +37,16 @@
 from taskiq.utils import maybe_awaitable, remove_suffix
 from taskiq.warnings import TaskiqDeprecationWarning
 
+if sys.version_info >= (3, 11):
+    from typing import ParamSpec, Self, TypeAlias
+elif sys.version_info >= (3, 10):
+    from typing import ParamSpec, TypeAlias
+
+    from typing_extensions import Self
+else:
+    from typing_extensions import ParamSpec, Self, TypeAlias
+
+
 if TYPE_CHECKING:  # pragma: no cover
     from taskiq.abc.formatter import TaskiqFormatter
     from taskiq.abc.result_backend import AsyncResultBackend

taskiq/abc/broker.py

@@ -1,13 +1,18 @@
+import sys
 from typing import Any, AsyncGenerator, Optional, TypeVar
 
-from typing_extensions import ParamSpec
-
 from taskiq.abc.broker import AsyncBroker
 from taskiq.decor import AsyncTaskiqDecoratedTask
 from taskiq.exceptions import SharedBrokerListenError, SharedBrokerSendTaskError
 from taskiq.kicker import AsyncKicker
 from taskiq.message import BrokerMessage
 
+if sys.version_info >= (3, 10):
+    from typing import ParamSpec
+else:
+    from typing_extensions import ParamSpec
+
+
 _ReturnType = TypeVar("_ReturnType")
 _Params = ParamSpec("_Params")
 

taskiq/brokers/shared_broker.py

@@ -45,7 +45,7 @@ def dispatch(self, event: FileSystemEvent) -> None:
                 return
         except Exception as exc:
             logger.info(
-                f"Cannot check path `{event.src_path}` in gitignore. Cause: {exc}",
+                f"Cannot check path `{event.src_path!r}` in gitignore. Cause: {exc}",
             )
             return
 

taskiq/cli/watcher.py

@@ -64,7 +64,7 @@ def model_validate_json(
         model_class: Type[Model],
         message: Union[str, bytes, bytearray],
     ) -> Model:
-        return model_class.parse_raw(message)
+        return model_class.parse_raw(message)  # type: ignore[arg-type]
 
     def model_dump_json(instance: Model) -> str:
         return instance.json()

taskiq/compat.py

@@ -15,12 +15,15 @@
     overload,
 )
 
-from typing_extensions import ParamSpec
-
 from taskiq.kicker import AsyncKicker
 from taskiq.scheduler.created_schedule import CreatedSchedule
 from taskiq.task import AsyncTaskiqTask
 
+if sys.version_info >= (3, 10):
+    from typing import ParamSpec
+else:
+    from typing_extensions import ParamSpec
+
 if TYPE_CHECKING:  # pragma: no cover
     from taskiq.abc.broker import AsyncBroker
     from taskiq.abc.schedule_source import ScheduleSource
@@ -106,24 +109,21 @@ async def kiq(
         self: "AsyncTaskiqDecoratedTask[_FuncParams, CoroutineType[Any, Any, _T]]",
         *args: _FuncParams.args,
         **kwargs: _FuncParams.kwargs,
-    ) -> AsyncTaskiqTask[_T]:
-        ...
+    ) -> AsyncTaskiqTask[_T]: ...
 
     @overload
     async def kiq(
         self: "AsyncTaskiqDecoratedTask[_FuncParams, Coroutine[Any, Any, _T]]",
         *args: _FuncParams.args,
         **kwargs: _FuncParams.kwargs,
-    ) -> AsyncTaskiqTask[_T]:
-        ...
+    ) -> AsyncTaskiqTask[_T]: ...
 
     @overload
     async def kiq(
         self: "AsyncTaskiqDecoratedTask[_FuncParams, _ReturnType]",
         *args: _FuncParams.args,
         **kwargs: _FuncParams.kwargs,
-    ) -> AsyncTaskiqTask[_ReturnType]:
-        ...
+    ) -> AsyncTaskiqTask[_ReturnType]: ...
 
     async def kiq(
         self,

taskiq/decor.py

@@ -1,8 +1,7 @@
 import enum
-from typing import Generic, Optional, Union
+from typing import Generic, Optional, TypeVar, Union
 
 from taskiq_dependencies import Depends
-from typing_extensions import TypeVar
 
 from taskiq.compat import IS_PYDANTIC2
 from taskiq.context import Context

taskiq/depends/progress_tracker.py

@@ -1,3 +1,4 @@
+import sys
 from collections.abc import Coroutine
 from dataclasses import asdict, is_dataclass
 from datetime import datetime
@@ -16,7 +17,6 @@
 )
 
 from pydantic import BaseModel
-from typing_extensions import ParamSpec
 
 from taskiq.abc.middleware import TaskiqMiddleware
 from taskiq.compat import model_dump
@@ -28,6 +28,11 @@
 from taskiq.task import AsyncTaskiqTask
 from taskiq.utils import maybe_awaitable
 
+if sys.version_info >= (3, 10):
+    from typing import ParamSpec
+else:
+    from typing_extensions import ParamSpec
+
 if TYPE_CHECKING:  # pragma: no cover
     from taskiq.abc.broker import AsyncBroker
     from taskiq.abc.schedule_source import ScheduleSource

taskiq/kicker.py

@@ -1,14 +1,19 @@
 import json
 import pickle
+import sys
 from functools import partial
 from typing import Any, Callable, Dict, Generic, Optional, TypeVar
 
 from pydantic import Field
-from typing_extensions import Self
 
 from taskiq.compat import IS_PYDANTIC2
 from taskiq.serialization import exception_to_python, prepare_exception
 
+if sys.version_info >= (3, 11):
+    from typing import Self
+else:
+    from typing_extensions import Self
+
 _ReturnType = TypeVar("_ReturnType")