chore: add pyupgrader to lint script

propan/__about__.py

@@ -21,24 +21,21 @@ def import_error(error_msg: str) -> Mock:
 
 
 INSTALL_RABBIT = import_error(
-    (
-        "\nYou should install RabbitMQ dependencies"
-        '\npip install "propan[async-rabbit]"'
-    )
+    "\nYou should install RabbitMQ dependencies" '\npip install "propan[async-rabbit]"'
 )
 
 INSTALL_KAFKA = import_error(
-    ("\nYou should install Kafka dependencies" '\npip install "propan[async-kafka]"')
+    "\nYou should install Kafka dependencies" '\npip install "propan[async-kafka]"'
 )
 
 INSTALL_NATS = import_error(
-    ("\nYou should install NATS dependencies" '\npip install "propan[async-nats]"')
+    "\nYou should install NATS dependencies" '\npip install "propan[async-nats]"'
 )
 
 INSTALL_SQS = import_error(
-    ("\nYou should install SQS dependencies" '\npip install "propan[async-sqs]"')
+    "\nYou should install SQS dependencies" '\npip install "propan[async-sqs]"'
 )
 
 INSTALL_REDIS = import_error(
-    ("\nYou should install RabbitMQ dependencies" '\npip install "propan[async-redis]"')
+    "\nYou should install RabbitMQ dependencies" '\npip install "propan[async-redis]"'
 )

propan/brokers/push_back_watcher.py

@@ -2,9 +2,10 @@
 from collections import Counter
 from logging import Logger
 from types import TracebackType
-from typing import Awaitable, Callable, Optional, Type, Union
+from typing import Awaitable, Callable
+from typing import Counter as CounterType
+from typing import Optional, Type, Union
 
-from typing_extensions import Counter as CounterType
 from typing_extensions import TypeVar
 
 from propan.brokers._model.schemas import PropanMessage

propan/fastapi/core/router.py

@@ -3,6 +3,7 @@
 from enum import Enum
 from typing import (
     Any,
+    AsyncIterator,
     Awaitable,
     Callable,
     Dict,
@@ -24,7 +25,7 @@
 from starlette.responses import HTMLResponse, JSONResponse, Response
 from starlette.routing import _DefaultLifespan
 from starlette.types import AppType, ASGIApp, Lifespan
-from typing_extensions import AsyncIterator, TypeVar
+from typing_extensions import TypeVar
 
 from propan.brokers._model.broker_usecase import (
     BrokerAsyncUsecase,

propan/test/kafka.py

@@ -1,15 +1,10 @@
-import sys
 from datetime import datetime
 from types import MethodType
 from typing import Any, Dict, Optional
+from unittest.mock import AsyncMock
 
 from aiokafka.structs import ConsumerRecord
 
-if sys.version_info < (3, 8):
-    from asyncmock import AsyncMock
-else:
-    from unittest.mock import AsyncMock
-
 from propan import KafkaBroker
 from propan.test.utils import call_handler
 from propan.types import SendableMessage

propan/test/nats.py

@@ -1,15 +1,10 @@
-import sys
 from types import MethodType
 from typing import Any, Dict, Optional, Union
+from unittest.mock import AsyncMock
 from uuid import uuid4
 
 from nats.aio.msg import Msg
 
-if sys.version_info < (3, 8):
-    from asyncmock import AsyncMock
-else:
-    from unittest.mock import AsyncMock
-
 from propan import NatsBroker
 from propan.test.utils import call_handler
 from propan.types import SendableMessage

propan/test/rabbit.py

@@ -1,16 +1,8 @@
 import re
-import sys
 from contextlib import asynccontextmanager
 from types import MethodType
 from typing import Any, Optional, Union
-
-from propan.types import AnyDict
-
-if sys.version_info < (3, 8):
-    from asyncmock import AsyncMock
-else:
-    from unittest.mock import AsyncMock
-
+from unittest.mock import AsyncMock
 from uuid import uuid4
 
 import aiormq
@@ -27,6 +19,7 @@
 from propan.brokers.rabbit.rabbit_broker import PikaSendableMessage, TimeoutType
 from propan.brokers.rabbit.utils import validate_exchange, validate_queue
 from propan.test.utils import call_handler
+from propan.types import AnyDict
 
 __all__ = (
     "build_message",

propan/test/redis.py

@@ -1,15 +1,10 @@
 import re
-import sys
 from types import MethodType
 from typing import Any, Dict, Optional, Union
+from unittest.mock import AsyncMock
 
 from typing_extensions import TypeAlias
 
-if sys.version_info < (3, 8):
-    from asyncmock import AsyncMock
-else:
-    from unittest.mock import AsyncMock
-
 from propan._compat import model_to_json
 from propan.brokers.redis.redis_broker import RedisBroker
 from propan.brokers.redis.schemas import RedisMessage

propan/test/sqs.py

@@ -1,15 +1,10 @@
 import json
-import sys
 from hashlib import md5
 from types import MethodType
 from typing import Any, Dict, Optional
+from unittest.mock import AsyncMock
 from uuid import uuid4
 
-if sys.version_info < (3, 8):
-    from asyncmock import AsyncMock
-else:
-    from unittest.mock import AsyncMock
-
 from propan import SQSBroker
 from propan.brokers.sqs.schema import SQSMessage
 from propan.test.utils import call_handler

pyproject.toml

@@ -10,7 +10,7 @@ authors = [
     { name = "Pastukhov Nikita", email = "diementros@yandex.ru" },
 ]
 
-keywords = ["rabbitmq", "framework", "message brokers"]
+keywords = ["rabbitmq", "nats", "kafka", "sqs", "redis", "framework", "message brokers"]
 
 requires-python = ">=3.7"
 
@@ -40,26 +40,18 @@ classifiers = [
     "Framework :: AsyncIO",
     "Framework :: Pydantic",
     "Framework :: Pydantic :: 1",
+    "Framework :: Pydantic :: 2",
 ]
 
+dynamic = ["version"]
+
 dependencies = [
     "fast-depends>=2.1.1",
     "watchfiles",
     "typer",
     "uvloop>=0.14.0,!=0.15.0,!=0.15.1; sys_platform != 'win32' and (sys_platform != 'cygwin' and platform_python_implementation != 'PyPy')",
 ]
 
-dynamic = ["version"]
-
-[project.urls]
-Homepage = "https://lancetnik.github.io/Propan/"
-Documentation = "https://lancetnik.github.io/Propan/"
-Tracker = "https://github.com/Lancetnik/Propan/issues"
-Source = "https://github.com/Lancetnik/Propan"
-
-[project.scripts]
-propan = "propan.__main__:cli"
-
 [project.optional-dependencies]
 async-rabbit = [
     "aio-pika>=9",
@@ -77,6 +69,10 @@ async-kafka = [
     "aiokafka>=0.8",
 ]
 
+async-sqs = [
+    "aiobotocore",
+]
+
 doc = [
     "PyYAML",
     "email-validator>=2.0.0",
@@ -86,10 +82,6 @@ doc = [
     "uvicorn",
 ]
 
-async-sqs = [
-    "aiobotocore",
-]
-
 testsuite = [
     "coverage[toml]>=7.2",
     "pytest==7.4.0",
@@ -136,9 +128,19 @@ dev = [
     "black==23.3.0",
     "isort>=5",
     "ruff==0.0.275",
+    "pyupgrade-directories",
     "typer[all]",
 ]
 
+[project.urls]
+Homepage = "https://lancetnik.github.io/Propan/"
+Documentation = "https://lancetnik.github.io/Propan/"
+Tracker = "https://github.com/Lancetnik/Propan/issues"
+Source = "https://github.com/Lancetnik/Propan"
+
+[project.scripts]
+propan = "propan.__main__:cli"
+
 [tool.hatch.metadata]
 allow-direct-references = true
 allow-ambiguous-features = true

scripts/lint.sh

@@ -1,3 +1,4 @@
+pyup_dirs --py37-plus --recursive propan tests
 mypy propan
 ruff propan examples tests --fix
 black propan examples tests