From 035d5e99c74b14a1b40918ae01a004fba3a80ebb Mon Sep 17 00:00:00 2001 From: Ildar Iskhakov Date: Wed, 20 Jul 2022 10:58:54 +0300 Subject: [PATCH] Fix linter --- .../apps/alerts/incident_appearance/templaters/__init__.py | 2 +- .../templaters/classic_markdown_templater.py | 2 +- engine/apps/alerts/tasks/notify_user.py | 5 ++--- engine/apps/api/serializers/alert_group.py | 2 +- engine/settings/helm.py | 4 +++- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/engine/apps/alerts/incident_appearance/templaters/__init__.py b/engine/apps/alerts/incident_appearance/templaters/__init__.py index 2bd066af..c34fc370 100644 --- a/engine/apps/alerts/incident_appearance/templaters/__init__.py +++ b/engine/apps/alerts/incident_appearance/templaters/__init__.py @@ -1,8 +1,8 @@ from .alert_templater import TemplateLoader # noqa: F401 +from .classic_markdown_templater import AlertClassicMarkdownTemplater # noqa: F401 from .email_templater import AlertEmailTemplater # noqa: F401 from .phone_call_templater import AlertPhoneCallTemplater # noqa: F401 from .slack_templater import AlertSlackTemplater # noqa: F401 from .sms_templater import AlertSmsTemplater # noqa: F401 from .telegram_templater import AlertTelegramTemplater # noqa: F401 from .web_templater import AlertWebTemplater # noqa: F401 -from .classic_markdown_templater import AlertClassicMarkdownTemplater # noqa: F401 diff --git a/engine/apps/alerts/incident_appearance/templaters/classic_markdown_templater.py b/engine/apps/alerts/incident_appearance/templaters/classic_markdown_templater.py index 385d186a..1626e400 100644 --- a/engine/apps/alerts/incident_appearance/templaters/classic_markdown_templater.py +++ b/engine/apps/alerts/incident_appearance/templaters/classic_markdown_templater.py @@ -1,7 +1,7 @@ import re from apps.alerts.incident_appearance.templaters.alert_templater import AlertTemplater -from common.utils import convert_md_to_html, escape_html, url_re, urlize_with_respect_to_a +from common.utils import escape_html, url_re class AlertClassicMarkdownTemplater(AlertTemplater): diff --git a/engine/apps/alerts/tasks/notify_user.py b/engine/apps/alerts/tasks/notify_user.py index 754a4c33..cf60d131 100644 --- a/engine/apps/alerts/tasks/notify_user.py +++ b/engine/apps/alerts/tasks/notify_user.py @@ -1,4 +1,3 @@ -import random import time from django.apps import apps @@ -368,7 +367,7 @@ def perform_notification(log_record_pk): "aps": { "alert": f"{message}", "sound": "bingbong.aiff", - } + }, }, ) @@ -391,7 +390,7 @@ def perform_notification(log_record_pk): # "interruption-level": "critical", "interruption-level": "time-sensitive", "sound": "ambulance.aiff", - } + }, }, ) else: diff --git a/engine/apps/api/serializers/alert_group.py b/engine/apps/api/serializers/alert_group.py index 340070c9..340646e7 100644 --- a/engine/apps/api/serializers/alert_group.py +++ b/engine/apps/api/serializers/alert_group.py @@ -2,8 +2,8 @@ import logging from rest_framework import serializers -from apps.alerts.incident_appearance.renderers.web_renderer import AlertGroupWebRenderer from apps.alerts.incident_appearance.renderers.classic_markdown_renderer import AlertGroupClassicMarkdownRenderer +from apps.alerts.incident_appearance.renderers.web_renderer import AlertGroupWebRenderer from apps.alerts.models import AlertGroup from common.api_helpers.mixins import EagerLoadingMixin diff --git a/engine/settings/helm.py b/engine/settings/helm.py index 9683207b..3f9f1a62 100644 --- a/engine/settings/helm.py +++ b/engine/settings/helm.py @@ -29,7 +29,9 @@ RABBITMQ_PORT = os.environ.get("RABBITMQ_PORT") RABBITMQ_PROTOCOL = os.environ.get("RABBITMQ_PROTOCOL") RABBITMQ_VHOST = os.environ.get("RABBITMQ_VHOST", "") -CELERY_BROKER_URL = f"{RABBITMQ_PROTOCOL}://{RABBITMQ_USERNAME}:{RABBITMQ_PASSWORD}@{RABBITMQ_HOST}:{RABBITMQ_PORT}/{RABBITMQ_VHOST}" +CELERY_BROKER_URL = ( + f"{RABBITMQ_PROTOCOL}://{RABBITMQ_USERNAME}:{RABBITMQ_PASSWORD}@{RABBITMQ_HOST}:{RABBITMQ_PORT}/{RABBITMQ_VHOST}" +) REDIS_PASSWORD = os.environ.get("REDIS_PASSWORD") REDIS_HOST = os.environ.get("REDIS_HOST")