Merge pull request #32 from taskiq-python/add-pyupgrade

Author: danfimov

pyproject.toml

@@ -19,13 +19,13 @@ classifiers = [
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
   "Programming Language :: Python :: 3.13",
+  "Programming Language :: Python :: 3.14",
   "Topic :: System :: Networking",
   "Typing :: Typed",
 ]
 dependencies = [
   "pydantic>=2,<3",
   "taskiq>=0.11.12,<1",
-  "typing-extensions>=4.3.0,<5",
 ]
 dynamic = ["version"]
 
@@ -96,6 +96,7 @@ lint.select = [
   "ERA",  # Checks for commented out code
   "PL",  # PyLint checks
   "RUF",  # Specific to Ruff checks
+  "UP",  # Pyupgrade
 ]
 lint.ignore = [
   "D105",  # Missing docstring in magic method
@@ -131,3 +132,6 @@ allow-magic-value-types = ["int", "str", "float"]
 
 [tool.ruff.lint.flake8-bugbear]
 extend-immutable-calls = ["taskiq_dependencies.Depends", "taskiq.TaskiqDepends"]
+
+[tool.pytest.ini_options]
+anyio_mode = "auto"

taskiq_pipelines/abc.py

@@ -1,15 +1,14 @@
 from abc import ABC, abstractmethod
-from typing import Any, Dict, Type
+from typing import Any, ClassVar
 
 from taskiq import AsyncBroker, TaskiqResult
-from typing_extensions import ClassVar
 
 
 class AbstractStep(ABC):
     """Abstract pipeline step."""
 
     _step_name: str
-    _known_steps: ClassVar[Dict[str, Type["AbstractStep"]]] = {}
+    _known_steps: ClassVar[dict[str, type["AbstractStep"]]] = {}
 
     def __init_subclass__(cls, step_name: str, **kwargs: Any) -> None:
         super().__init_subclass__(**kwargs)

taskiq_pipelines/exceptions.py

@@ -1,4 +1,4 @@
-from typing import ClassVar, Union
+from typing import ClassVar
 
 from taskiq import TaskiqError
 
@@ -16,7 +16,7 @@ class StepError(PipelineError):
     _STEP_NAME: ClassVar[str]
 
     task_id: str
-    error: Union[BaseException, None]
+    error: BaseException | None
 
 
 class MappingError(StepError):

taskiq_pipelines/middleware.py

@@ -1,5 +1,5 @@
 from logging import getLogger
-from typing import Any, List, Optional
+from typing import Any
 
 import pydantic
 from taskiq import TaskiqMessage, TaskiqMiddleware, TaskiqResult
@@ -43,7 +43,7 @@ async def post_save(  # noqa: PLR0911
         pipeline_data = message.labels[PIPELINE_DATA]
         parsed_data = self.broker.serializer.loadb(pipeline_data)
         try:
-            steps_data = pydantic.TypeAdapter(List[DumpedStep]).validate_python(
+            steps_data = pydantic.TypeAdapter(list[DumpedStep]).validate_python(
                 parsed_data,
             )
         except ValueError as err:
@@ -103,7 +103,7 @@ async def on_error(
             return
         pipe_data = message.labels[PIPELINE_DATA]
         try:
-            steps = pydantic.TypeAdapter(List[DumpedStep]).validate_json(pipe_data)
+            steps = pydantic.TypeAdapter(list[DumpedStep]).validate_json(pipe_data)
         except ValueError:
             return
         if current_step_num == len(steps) - 1:
@@ -113,7 +113,7 @@ async def on_error(
     async def fail_pipeline(
         self,
         last_task_id: str,
-        abort: Optional[BaseException] = None,
+        abort: BaseException | None = None,
     ) -> None:
         """
         This function aborts pipeline.