From 5e90c077c52aa771b1fc7378b809df83eb663ad5 Mon Sep 17 00:00:00 2001 From: Lancetnik Date: Tue, 13 Jun 2023 21:04:45 +0300 Subject: [PATCH] fix pyi --- propan/fastapi/kafka/router.pyi | 6 ------ propan/fastapi/nats/router.pyi | 6 ------ propan/fastapi/rabbit/router.pyi | 6 ------ propan/fastapi/redis/router.pyi | 6 ------ propan/fastapi/sqs/router.pyi | 6 ------ 5 files changed, 30 deletions(-) diff --git a/propan/fastapi/kafka/router.pyi b/propan/fastapi/kafka/router.pyi index ca006ae1..626f1092 100644 --- a/propan/fastapi/kafka/router.pyi +++ b/propan/fastapi/kafka/router.pyi @@ -26,13 +26,7 @@ from propan.types import AnyCallable Partition = TypeVar("Partition") -<<<<<<< HEAD -class KafkaRouter(PropanRouter): - broker: KafkaBroker - -======= class KafkaRouter(PropanRouter[KafkaBroker]): ->>>>>>> 1acd1a468477ed27a085d3d1c6f38d967e64f1f9 def __init__( self, bootstrap_servers: Union[str, List[str]] = "localhost", diff --git a/propan/fastapi/nats/router.pyi b/propan/fastapi/nats/router.pyi index b09191e7..b52a5dca 100644 --- a/propan/fastapi/nats/router.pyi +++ b/propan/fastapi/nats/router.pyi @@ -32,13 +32,7 @@ from propan.fastapi.core.router import PropanRouter from propan.log import access_logger from propan.types import AnyCallable -<<<<<<< HEAD -class NatsRouter(PropanRouter): - broker: NatsBroker - -======= class NatsRouter(PropanRouter[NatsBroker]): ->>>>>>> 1acd1a468477ed27a085d3d1c6f38d967e64f1f9 def __init__( self, servers: Union[str, List[str]] = ["nats://localhost:4222"], # noqa: B006 diff --git a/propan/fastapi/rabbit/router.pyi b/propan/fastapi/rabbit/router.pyi index 98b42cb0..df667cc6 100644 --- a/propan/fastapi/rabbit/router.pyi +++ b/propan/fastapi/rabbit/router.pyi @@ -19,13 +19,7 @@ from propan.fastapi.core import PropanRouter from propan.log import access_logger from propan.types import AnyCallable -<<<<<<< HEAD -class RabbitRouter(PropanRouter): - broker: RabbitBroker - -======= class RabbitRouter(PropanRouter[RabbitBroker]): ->>>>>>> 1acd1a468477ed27a085d3d1c6f38d967e64f1f9 def __init__( self, host: str = "localhost", diff --git a/propan/fastapi/redis/router.pyi b/propan/fastapi/redis/router.pyi index 6042754c..835b27a7 100644 --- a/propan/fastapi/redis/router.pyi +++ b/propan/fastapi/redis/router.pyi @@ -16,13 +16,7 @@ from propan.fastapi.core.router import PropanRouter from propan.log import access_logger from propan.types import AnyCallable -<<<<<<< HEAD -class RedisRouter(PropanRouter): - broker: RedisBroker - -======= class RedisRouter(PropanRouter[RedisBroker]): ->>>>>>> 1acd1a468477ed27a085d3d1c6f38d967e64f1f9 def __init__( self, url: str = "redis://localhost:6379", diff --git a/propan/fastapi/sqs/router.pyi b/propan/fastapi/sqs/router.pyi index 673a54fc..a9d3e17a 100644 --- a/propan/fastapi/sqs/router.pyi +++ b/propan/fastapi/sqs/router.pyi @@ -17,13 +17,7 @@ from propan.fastapi.core.router import PropanRouter from propan.log import access_logger from propan.types import AnyCallable -<<<<<<< HEAD -class SQSRouter(PropanRouter): - broker: SQSBroker - -======= class SQSRouter(PropanRouter[SQSBroker]): ->>>>>>> 1acd1a468477ed27a085d3d1c6f38d967e64f1f9 def __init__( self, url: str = "http://localhost:9324/",