From eeff1dafe502ac289003af244a1a2e78b571f709 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Wed, 23 Aug 2023 10:33:00 +0200 Subject: [PATCH 1/2] Fix circular import from kubernetes_executor --- .../providers/cncf/kubernetes/executors/kubernetes_executor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airflow/providers/cncf/kubernetes/executors/kubernetes_executor.py b/airflow/providers/cncf/kubernetes/executors/kubernetes_executor.py index 8e95f7a6c9387..5bc39625da97c 100644 --- a/airflow/providers/cncf/kubernetes/executors/kubernetes_executor.py +++ b/airflow/providers/cncf/kubernetes/executors/kubernetes_executor.py @@ -37,7 +37,7 @@ from sqlalchemy import select, update from sqlalchemy.orm import Session -from airflow import AirflowException +from airflow.exceptions import AirflowException try: from airflow.cli.cli_config import ( From 11f3aadb750db40e47c19112d82f7864a4579dd9 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Wed, 23 Aug 2023 10:33:24 +0200 Subject: [PATCH 2/2] Do not validate SQL when initialising Sentry --- airflow/sentry.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/airflow/sentry.py b/airflow/sentry.py index 34133228ca13f..da46f924786df 100644 --- a/airflow/sentry.py +++ b/airflow/sentry.py @@ -87,7 +87,7 @@ def __init__(self): # LoggingIntegration is set by default. integrations = [sentry_flask] - executor_class, _ = ExecutorLoader.import_default_executor_cls() + executor_class, _ = ExecutorLoader.import_default_executor_cls(validate=False) if executor_class.supports_sentry: from sentry_sdk.integrations.celery import CeleryIntegration