[airflow] branch main updated: Fix 2.7.0 db migration job errors (#33652)

[po...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git


The following commit(s) were added to refs/heads/main by this push:
     new 4bdf908041 Fix 2.7.0 db migration job errors (#33652)
4bdf908041 is described below

commit 4bdf908041159c1d6ed019469190e08297928393
Author: Lipu Fei <li...@gmail.com>
AuthorDate: Wed Aug 23 14:06:20 2023 +0200

    Fix 2.7.0 db migration job errors (#33652)
    
    * Fix circular import from kubernetes_executor
    
    * Do not validate SQL when initialising Sentry
    
    ---------
    
    Co-authored-by: Lipu Fei <li...@kpn.com>
---
 airflow/providers/cncf/kubernetes/executors/kubernetes_executor.py | 2 +-
 airflow/sentry.py                                                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/airflow/providers/cncf/kubernetes/executors/kubernetes_executor.py b/airflow/providers/cncf/kubernetes/executors/kubernetes_executor.py
index 8e95f7a6c9..5bc39625da 100644
--- a/airflow/providers/cncf/kubernetes/executors/kubernetes_executor.py
+++ b/airflow/providers/cncf/kubernetes/executors/kubernetes_executor.py
@@ -37,7 +37,7 @@ from typing import TYPE_CHECKING, Any, Sequence
 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 (
diff --git a/airflow/sentry.py b/airflow/sentry.py
index 34133228ca..da46f92478 100644
--- a/airflow/sentry.py
+++ b/airflow/sentry.py
@@ -87,7 +87,7 @@ if conf.getboolean("sentry", "sentry_on", fallback=False):
             # 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