[airflow] branch main updated: Raise original import error in CLI vending of executors (#32931)

[potiuk]

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 f31af91dbd Raise original import error in CLI vending of executors 
(#32931)
f31af91dbd is described below

commit f31af91dbd8b98cc4ddb98bed8bbc086ab4b65c9
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Sat Jul 29 09:54:12 2023 +0200

    Raise original import error in CLI vending of executors (#32931)
    
    Small follow-up after #29055 - for better diagnostic of potential
    future problems, it would be good to re-raise the original import
    error, otherwise if the Import error results from some other issue
    than Airflow version, we will get quite a bit of head scratching
    trying to diagnose some of the resulting aftermath.
---
 airflow/providers/celery/executors/celery_executor.py              | 2 ++
 airflow/providers/cncf/kubernetes/executors/kubernetes_executor.py | 1 +
 2 files changed, 3 insertions(+)

diff --git a/airflow/providers/celery/executors/celery_executor.py 
b/airflow/providers/celery/executors/celery_executor.py
index 10513605ba..571485b9f3 100644
--- a/airflow/providers/celery/executors/celery_executor.py
+++ b/airflow/providers/celery/executors/celery_executor.py
@@ -68,6 +68,8 @@ except ImportError:
             f"available in the 'airflow.executors' package. You should not use 
"
             f"the provider's executors in this version of Airflow."
         )
+    raise
+
 from airflow.configuration import conf
 from airflow.exceptions import AirflowTaskTimeout
 from airflow.executors.base_executor import BaseExecutor
diff --git a/airflow/providers/cncf/kubernetes/executors/kubernetes_executor.py 
b/airflow/providers/cncf/kubernetes/executors/kubernetes_executor.py
index 1c4a0e91fb..a5aa36d981 100644
--- a/airflow/providers/cncf/kubernetes/executors/kubernetes_executor.py
+++ b/airflow/providers/cncf/kubernetes/executors/kubernetes_executor.py
@@ -69,6 +69,7 @@ except ImportError:
             f"available in the 'airflow.executors' package. You should not use 
"
             f"the provider's executors in this version of Airflow."
         )
+    raise
 from airflow.configuration import conf
 from airflow.executors.base_executor import BaseExecutor
 from airflow.providers.cncf.kubernetes.executors.kubernetes_executor_types 
import POD_EXECUTOR_DONE_KEY