apache-airflow-providers-databricks 7.7.3rc1__tar.gz → 7.7.4__tar.gz

{apache_airflow_providers_databricks-7.7.3rc1 → apache_airflow_providers_databricks-7.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: apache-airflow-providers-databricks
-Version: 7.7.3rc1
+Version: 7.7.4
 Summary: Provider package apache-airflow-providers-databricks for Apache Airflow
 Keywords: airflow-provider,databricks,airflow,integration
 Author-email: Apache Software Foundation <dev@airflow.apache.org>
@@ -20,9 +20,9 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: System :: Monitoring
-Requires-Dist: apache-airflow>=2.10.0rc1
-Requires-Dist: apache-airflow-providers-common-compat>=1.6.0rc1
-Requires-Dist: apache-airflow-providers-common-sql>=1.27.0rc1
+Requires-Dist: apache-airflow>=2.10.0
+Requires-Dist: apache-airflow-providers-common-compat>=1.8.0
+Requires-Dist: apache-airflow-providers-common-sql>=1.27.0
 Requires-Dist: requests>=2.32.0,<3
 Requires-Dist: databricks-sql-connector>=4.0.0
 Requires-Dist: databricks-sqlalchemy>=1.0.2
@@ -33,13 +33,13 @@ Requires-Dist: pandas>=2.2.3; python_version >="3.13"
 Requires-Dist: pyarrow>=16.1.0; python_version < '3.13'
 Requires-Dist: pyarrow>=18.0.0; python_version >= '3.13'
 Requires-Dist: azure-identity>=1.3.1 ; extra == "azure-identity"
-Requires-Dist: apache-airflow-providers-fab>=2.2.0rc1 ; extra == "fab" and ( python_version < '3.13')
-Requires-Dist: apache-airflow-providers-openlineage>=2.3.0rc1 ; extra == "openlineage"
+Requires-Dist: apache-airflow-providers-fab>=2.2.0 ; extra == "fab" and ( python_version < '3.13')
+Requires-Dist: apache-airflow-providers-openlineage>=2.3.0 ; extra == "openlineage"
 Requires-Dist: databricks-sdk==0.10.0 ; extra == "sdk"
 Requires-Dist: apache-airflow-providers-standard ; extra == "standard"
 Project-URL: Bug Tracker, https://github.com/apache/airflow/issues
-Project-URL: Changelog, https://airflow.staged.apache.org/docs/apache-airflow-providers-databricks/7.7.3/changelog.html
-Project-URL: Documentation, https://airflow.staged.apache.org/docs/apache-airflow-providers-databricks/7.7.3
+Project-URL: Changelog, https://airflow.apache.org/docs/apache-airflow-providers-databricks/7.7.4/changelog.html
+Project-URL: Documentation, https://airflow.apache.org/docs/apache-airflow-providers-databricks/7.7.4
 Project-URL: Mastodon, https://fosstodon.org/@airflow
 Project-URL: Slack Chat, https://s.apache.org/airflow-slack
 Project-URL: Source Code, https://github.com/apache/airflow
@@ -75,7 +75,7 @@ Provides-Extra: standard
 
 Package ``apache-airflow-providers-databricks``
 
-Release: ``7.7.3``
+Release: ``7.7.4``
 
 
 `Databricks <https://databricks.com/>`__
@@ -88,7 +88,7 @@ This is a provider package for ``databricks`` provider. All classes for this pro
 are in ``airflow.providers.databricks`` python package.
 
 You can find package information and changelog for the provider
-in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-databricks/7.7.3/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-databricks/7.7.4/>`_.
 
 Installation
 ------------
@@ -106,7 +106,7 @@ Requirements
 PIP package                                 Version required
 ==========================================  ======================================
 ``apache-airflow``                          ``>=2.10.0``
-``apache-airflow-providers-common-compat``  ``>=1.6.0``
+``apache-airflow-providers-common-compat``  ``>=1.8.0``
 ``apache-airflow-providers-common-sql``     ``>=1.27.0``
 ``requests``                                ``>=2.32.0,<3``
 ``databricks-sql-connector``                ``>=4.0.0``
@@ -137,7 +137,6 @@ Dependent package
 ==================================================================================================================  =================
 `apache-airflow-providers-common-compat <https://airflow.apache.org/docs/apache-airflow-providers-common-compat>`_  ``common.compat``
 `apache-airflow-providers-common-sql <https://airflow.apache.org/docs/apache-airflow-providers-common-sql>`_        ``common.sql``
-`apache-airflow-providers-fab <https://airflow.apache.org/docs/apache-airflow-providers-fab>`_                      ``fab``
 `apache-airflow-providers-openlineage <https://airflow.apache.org/docs/apache-airflow-providers-openlineage>`_      ``openlineage``
 ==================================================================================================================  =================
 
@@ -155,5 +154,5 @@ Extra               Dependencies
 ==================  ================================================================
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-databricks/7.7.3/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-databricks/7.7.4/changelog.html>`_.
 

{apache_airflow_providers_databricks-7.7.3rc1 → apache_airflow_providers_databricks-7.7.4}/README.rst

@@ -23,7 +23,7 @@
 
 Package ``apache-airflow-providers-databricks``
 
-Release: ``7.7.3``
+Release: ``7.7.4``
 
 
 `Databricks <https://databricks.com/>`__
@@ -36,7 +36,7 @@ This is a provider package for ``databricks`` provider. All classes for this pro
 are in ``airflow.providers.databricks`` python package.
 
 You can find package information and changelog for the provider
-in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-databricks/7.7.3/>`_.
+in the `documentation <https://airflow.apache.org/docs/apache-airflow-providers-databricks/7.7.4/>`_.
 
 Installation
 ------------
@@ -54,7 +54,7 @@ Requirements
 PIP package                                 Version required
 ==========================================  ======================================
 ``apache-airflow``                          ``>=2.10.0``
-``apache-airflow-providers-common-compat``  ``>=1.6.0``
+``apache-airflow-providers-common-compat``  ``>=1.8.0``
 ``apache-airflow-providers-common-sql``     ``>=1.27.0``
 ``requests``                                ``>=2.32.0,<3``
 ``databricks-sql-connector``                ``>=4.0.0``
@@ -85,7 +85,6 @@ Dependent package
 ==================================================================================================================  =================
 `apache-airflow-providers-common-compat <https://airflow.apache.org/docs/apache-airflow-providers-common-compat>`_  ``common.compat``
 `apache-airflow-providers-common-sql <https://airflow.apache.org/docs/apache-airflow-providers-common-sql>`_        ``common.sql``
-`apache-airflow-providers-fab <https://airflow.apache.org/docs/apache-airflow-providers-fab>`_                      ``fab``
 `apache-airflow-providers-openlineage <https://airflow.apache.org/docs/apache-airflow-providers-openlineage>`_      ``openlineage``
 ==================================================================================================================  =================
 
@@ -103,4 +102,4 @@ Extra               Dependencies
 ==================  ================================================================
 
 The changelog for the provider package can be found in the
-`changelog <https://airflow.apache.org/docs/apache-airflow-providers-databricks/7.7.3/changelog.html>`_.
+`changelog <https://airflow.apache.org/docs/apache-airflow-providers-databricks/7.7.4/changelog.html>`_.

{apache_airflow_providers_databricks-7.7.3rc1 → apache_airflow_providers_databricks-7.7.4}/docs/changelog.rst

@@ -26,11 +26,32 @@
 Changelog
 ---------
 
-7.7.3
+7.7.4
 .....
 
+Bug Fixes
+~~~~~~~~~
+
+* ``Fix Databricks provider import error without fab provider (#56702)``
+
+Misc
+~~~~
+
+* ``Migrate databricks provider to ''common.compat'' (#56993)``
+
+Doc-only
+~~~~~~~~
+
+* ``Remove placeholder Release Date in changelog and index files (#56056)``
+
+.. Below changes are excluded from the changelog. Move them to
+   appropriate section above if needed. Do not delete the lines(!):
+   * ``Remove 'pytest.importorskip("flask_appbuilder")' from tests (#56679)``
+   * ``Enable PT011 rule to prvoider tests (#56320)``
+
+7.7.3
+.....
 
-Release Date: ``|PypiReleaseDate|``
 
 Bug Fixes
 ~~~~~~~~~
@@ -49,8 +70,6 @@ Misc
 .....
 
 
-Release Date: ``|PypiReleaseDate|``
-
 Bug Fixes
 ~~~~~~~~~
 

{apache_airflow_providers_databricks-7.7.3rc1 → apache_airflow_providers_databricks-7.7.4}/docs/index.rst

@@ -78,7 +78,7 @@ apache-airflow-providers-databricks package
 `Databricks <https://databricks.com/>`__
 
 
-Release: 7.7.3
+Release: 7.7.4
 
 Provider package
 ----------------
@@ -102,7 +102,7 @@ The minimum Apache Airflow version supported by this provider distribution is ``
 PIP package                                 Version required
 ==========================================  ======================================
 ``apache-airflow``                          ``>=2.10.0``
-``apache-airflow-providers-common-compat``  ``>=1.6.0``
+``apache-airflow-providers-common-compat``  ``>=1.8.0``
 ``apache-airflow-providers-common-sql``     ``>=1.27.0``
 ``requests``                                ``>=2.32.0,<3``
 ``databricks-sql-connector``                ``>=4.0.0``
@@ -133,7 +133,6 @@ Dependent package
 ==================================================================================================================  =================
 `apache-airflow-providers-common-compat <https://airflow.apache.org/docs/apache-airflow-providers-common-compat>`_  ``common.compat``
 `apache-airflow-providers-common-sql <https://airflow.apache.org/docs/apache-airflow-providers-common-sql>`_        ``common.sql``
-`apache-airflow-providers-fab <https://airflow.apache.org/docs/apache-airflow-providers-fab>`_                      ``fab``
 `apache-airflow-providers-openlineage <https://airflow.apache.org/docs/apache-airflow-providers-openlineage>`_      ``openlineage``
 ==================================================================================================================  =================
 
@@ -143,5 +142,5 @@ Downloading official packages
 You can download officially released packages and verify their checksums and signatures from the
 `Official Apache Download site <https://downloads.apache.org/airflow/providers/>`_
 
-* `The apache-airflow-providers-databricks 7.7.3 sdist package <https://downloads.apache.org/airflow/providers/apache_airflow_providers_databricks-7.7.3.tar.gz>`_ (`asc <https://downloads.apache.org/airflow/providers/apache_airflow_providers_databricks-7.7.3.tar.gz.asc>`__, `sha512 <https://downloads.apache.org/airflow/providers/apache_airflow_providers_databricks-7.7.3.tar.gz.sha512>`__)
-* `The apache-airflow-providers-databricks 7.7.3 wheel package <https://downloads.apache.org/airflow/providers/apache_airflow_providers_databricks-7.7.3-py3-none-any.whl>`_ (`asc <https://downloads.apache.org/airflow/providers/apache_airflow_providers_databricks-7.7.3-py3-none-any.whl.asc>`__, `sha512 <https://downloads.apache.org/airflow/providers/apache_airflow_providers_databricks-7.7.3-py3-none-any.whl.sha512>`__)
+* `The apache-airflow-providers-databricks 7.7.4 sdist package <https://downloads.apache.org/airflow/providers/apache_airflow_providers_databricks-7.7.4.tar.gz>`_ (`asc <https://downloads.apache.org/airflow/providers/apache_airflow_providers_databricks-7.7.4.tar.gz.asc>`__, `sha512 <https://downloads.apache.org/airflow/providers/apache_airflow_providers_databricks-7.7.4.tar.gz.sha512>`__)
+* `The apache-airflow-providers-databricks 7.7.4 wheel package <https://downloads.apache.org/airflow/providers/apache_airflow_providers_databricks-7.7.4-py3-none-any.whl>`_ (`asc <https://downloads.apache.org/airflow/providers/apache_airflow_providers_databricks-7.7.4-py3-none-any.whl.asc>`__, `sha512 <https://downloads.apache.org/airflow/providers/apache_airflow_providers_databricks-7.7.4-py3-none-any.whl.sha512>`__)

{apache_airflow_providers_databricks-7.7.3rc1 → apache_airflow_providers_databricks-7.7.4}/provider.yaml

@@ -22,12 +22,13 @@ description: |
     `Databricks <https://databricks.com/>`__
 
 state: ready
-source-date-epoch: 1757950169
+source-date-epoch: 1761116588
 # Note that those versions are maintained by release manager - do not update them manually
 # with the exception of case where other provider in sources has >= new provider version.
 # In such case adding >= NEW_VERSION and bumping to NEW_VERSION in a provider have
 # to be done in the same PR
 versions:
+  - 7.7.4
   - 7.7.3
   - 7.7.2
   - 7.7.1

{apache_airflow_providers_databricks-7.7.3rc1 → apache_airflow_providers_databricks-7.7.4}/pyproject.toml

@@ -25,7 +25,7 @@ build-backend = "flit_core.buildapi"
 
 [project]
 name = "apache-airflow-providers-databricks"
-version = "7.7.3rc1"
+version = "7.7.4"
 description = "Provider package apache-airflow-providers-databricks for Apache Airflow"
 readme = "README.rst"
 authors = [
@@ -57,9 +57,9 @@ requires-python = ">=3.10"
 # Make sure to run ``prek update-providers-dependencies --all-files``
 # After you modify the dependencies, and rebuild your Breeze CI image with ``breeze ci-image build``
 dependencies = [
-    "apache-airflow>=2.10.0rc1",
-    "apache-airflow-providers-common-compat>=1.6.0rc1",
-    "apache-airflow-providers-common-sql>=1.27.0rc1",
+    "apache-airflow>=2.10.0",
+    "apache-airflow-providers-common-compat>=1.8.0",
+    "apache-airflow-providers-common-sql>=1.27.0",
     "requests>=2.32.0,<3",
     "databricks-sql-connector>=4.0.0",
     "databricks-sqlalchemy>=1.0.2",
@@ -82,13 +82,13 @@ dependencies = [
     "azure-identity>=1.3.1",
 ]
 "fab" = [
-    "apache-airflow-providers-fab>=2.2.0rc1; python_version < '3.13'"
+    "apache-airflow-providers-fab>=2.2.0; python_version < '3.13'"
 ]
 "standard" = [
     "apache-airflow-providers-standard"
 ]
 "openlineage" = [
-    "apache-airflow-providers-openlineage>=2.3.0rc1"
+    "apache-airflow-providers-openlineage>=2.3.0"
 ]
 
 [dependency-groups]
@@ -98,13 +98,13 @@ dev = [
     "apache-airflow-devel-common",
     "apache-airflow-providers-common-compat",
     "apache-airflow-providers-common-sql",
-    "apache-airflow-providers-fab",
     "apache-airflow-providers-openlineage",
     # Additional devel dependencies (do not remove this line and add extra development dependencies)
     "deltalake>=1.1.3",
     "apache-airflow-providers-fab>=2.2.0; python_version < '3.13'",
     "apache-airflow-providers-microsoft-azure",
     "apache-airflow-providers-common-sql[pandas,polars]",
+    "apache-airflow-providers-fab",
 ]
 
 # To build docs:
@@ -133,8 +133,8 @@ apache-airflow-providers-common-sql = {workspace = true}
 apache-airflow-providers-standard = {workspace = true}
 
 [project.urls]
-"Documentation" = "https://airflow.staged.apache.org/docs/apache-airflow-providers-databricks/7.7.3"
-"Changelog" = "https://airflow.staged.apache.org/docs/apache-airflow-providers-databricks/7.7.3/changelog.html"
+"Documentation" = "https://airflow.apache.org/docs/apache-airflow-providers-databricks/7.7.4"
+"Changelog" = "https://airflow.apache.org/docs/apache-airflow-providers-databricks/7.7.4/changelog.html"
 "Bug Tracker" = "https://github.com/apache/airflow/issues"
 "Source Code" = "https://github.com/apache/airflow"
 "Slack Chat" = "https://s.apache.org/airflow-slack"

{apache_airflow_providers_databricks-7.7.3rc1 → apache_airflow_providers_databricks-7.7.4}/src/airflow/providers/databricks/__init__.py

@@ -29,7 +29,7 @@ from airflow import __version__ as airflow_version
 
 __all__ = ["__version__"]
 
-__version__ = "7.7.3"
+__version__ = "7.7.4"
 
 if packaging.version.parse(packaging.version.parse(airflow_version).base_version) < packaging.version.parse(
     "2.10.0"

{apache_airflow_providers_databricks-7.7.3rc1 → apache_airflow_providers_databricks-7.7.4}/src/airflow/providers/databricks/operators/databricks.py

@@ -28,6 +28,7 @@ from typing import TYPE_CHECKING, Any
 
 from airflow.configuration import conf
 from airflow.exceptions import AirflowException
+from airflow.providers.common.compat.sdk import BaseOperator, BaseOperatorLink, XCom
 from airflow.providers.databricks.hooks.databricks import (
     DatabricksHook,
     RunLifeCycleState,
@@ -51,7 +52,7 @@ from airflow.providers.databricks.utils.databricks import (
     validate_trigger_event,
 )
 from airflow.providers.databricks.utils.mixins import DatabricksSQLStatementsMixin
-from airflow.providers.databricks.version_compat import AIRFLOW_V_3_0_PLUS, BaseOperator
+from airflow.providers.databricks.version_compat import AIRFLOW_V_3_0_PLUS
 
 if TYPE_CHECKING:
     from airflow.models.taskinstancekey import TaskInstanceKey
@@ -62,13 +63,6 @@ if TYPE_CHECKING:
     from airflow.sdk import TaskGroup
     from airflow.sdk.types import Context, Logger
 
-if AIRFLOW_V_3_0_PLUS:
-    from airflow.sdk import BaseOperatorLink
-    from airflow.sdk.execution_time.xcom import XCom
-else:
-    from airflow.models import XCom
-    from airflow.models.baseoperatorlink import BaseOperatorLink  # type: ignore[no-redef]
-
 DEFER_METHOD_NAME = "execute_complete"
 XCOM_RUN_ID_KEY = "run_id"
 XCOM_JOB_ID_KEY = "job_id"

{apache_airflow_providers_databricks-7.7.3rc1 → apache_airflow_providers_databricks-7.7.4}/src/airflow/providers/databricks/operators/databricks_repos.py

@@ -26,15 +26,11 @@ from typing import TYPE_CHECKING
 from urllib.parse import urlsplit
 
 from airflow.exceptions import AirflowException
+from airflow.providers.common.compat.sdk import BaseOperator
 from airflow.providers.databricks.hooks.databricks import DatabricksHook
-from airflow.providers.databricks.version_compat import BaseOperator
 
 if TYPE_CHECKING:
-    try:
-        from airflow.sdk.definitions.context import Context
-    except ImportError:
-        # TODO: Remove once provider drops support for Airflow 2
-        from airflow.utils.context import Context
+    from airflow.providers.common.compat.sdk import Context
 
 
 class DatabricksReposCreateOperator(BaseOperator):

{apache_airflow_providers_databricks-7.7.3rc1 → apache_airflow_providers_databricks-7.7.4}/src/airflow/providers/databricks/operators/databricks_sql.py

@@ -28,12 +28,12 @@ from typing import TYPE_CHECKING, Any, ClassVar
 from databricks.sql.utils import ParamEscaper
 
 from airflow.exceptions import AirflowException
+from airflow.providers.common.compat.sdk import BaseOperator
 from airflow.providers.common.sql.operators.sql import SQLExecuteQueryOperator
 from airflow.providers.databricks.hooks.databricks_sql import DatabricksSqlHook
-from airflow.providers.databricks.version_compat import BaseOperator
 
 if TYPE_CHECKING:
-    from airflow.utils.context import Context
+    from airflow.providers.common.compat.sdk import Context
 
 
 class DatabricksSqlOperator(SQLExecuteQueryOperator):

{apache_airflow_providers_databricks-7.7.3rc1 → apache_airflow_providers_databricks-7.7.4}/src/airflow/providers/databricks/operators/databricks_workflow.py

@@ -26,24 +26,20 @@ from typing import TYPE_CHECKING, Any
 from mergedeep import merge
 
 from airflow.exceptions import AirflowException
+from airflow.providers.common.compat.sdk import BaseOperator, TaskGroup
 from airflow.providers.databricks.hooks.databricks import DatabricksHook, RunLifeCycleState
 from airflow.providers.databricks.plugins.databricks_workflow import (
     WorkflowJobRepairAllFailedLink,
     WorkflowJobRunLink,
     store_databricks_job_run_link,
 )
-from airflow.providers.databricks.version_compat import AIRFLOW_V_3_0_PLUS, BaseOperator
-
-try:
-    from airflow.sdk import TaskGroup
-except ImportError:
-    from airflow.utils.task_group import TaskGroup  # type: ignore[no-redef]
+from airflow.providers.databricks.version_compat import AIRFLOW_V_3_0_PLUS
 
 if TYPE_CHECKING:
     from types import TracebackType
 
     from airflow.models.taskmixin import DAGNode
-    from airflow.utils.context import Context
+    from airflow.providers.common.compat.sdk import Context
 
 
 @dataclass

{apache_airflow_providers_databricks-7.7.3rc1 → apache_airflow_providers_databricks-7.7.4}/src/airflow/providers/databricks/plugins/databricks_workflow.py

@@ -21,21 +21,13 @@ import os
 from typing import TYPE_CHECKING, Any
 from urllib.parse import unquote
 
-from flask import flash, redirect, request, url_for
-from flask_appbuilder import BaseView
-from flask_appbuilder.api import expose
-
 from airflow.exceptions import AirflowException, TaskInstanceNotFound
 from airflow.models.dagrun import DagRun
 from airflow.models.taskinstance import TaskInstance, TaskInstanceKey, clear_task_instances
 from airflow.plugins_manager import AirflowPlugin
+from airflow.providers.common.compat.sdk import BaseOperatorLink, TaskGroup, XCom
 from airflow.providers.databricks.hooks.databricks import DatabricksHook
-from airflow.providers.databricks.version_compat import AIRFLOW_V_3_0_PLUS, BaseOperatorLink, TaskGroup, XCom
-
-if AIRFLOW_V_3_0_PLUS:
-    from airflow.providers.fab.www import auth
-else:
-    from airflow.www import auth  # type: ignore
+from airflow.providers.databricks.version_compat import AIRFLOW_V_3_0_PLUS
 from airflow.utils.log.logging_mixin import LoggingMixin
 from airflow.utils.state import TaskInstanceState
 
@@ -43,24 +35,15 @@ if TYPE_CHECKING:
     from sqlalchemy.orm.session import Session
 
     from airflow.models import BaseOperator
+    from airflow.providers.common.compat.sdk import Context
     from airflow.providers.databricks.operators.databricks import DatabricksTaskBaseOperator
     from airflow.sdk.types import Logger
-    from airflow.utils.context import Context
 
 
 REPAIR_WAIT_ATTEMPTS = os.getenv("DATABRICKS_REPAIR_WAIT_ATTEMPTS", 20)
 REPAIR_WAIT_DELAY = os.getenv("DATABRICKS_REPAIR_WAIT_DELAY", 0.5)
 
 
-def get_auth_decorator():
-    if AIRFLOW_V_3_0_PLUS:
-        from airflow.api_fastapi.auth.managers.models.resource_details import DagAccessEntity
-    else:
-        from airflow.auth.managers.models.resource_details import DagAccessEntity
-
-    return auth.has_access_dag("POST", DagAccessEntity.RUN)
-
-
 def get_databricks_task_ids(
     group_id: str, task_map: dict[str, DatabricksTaskBaseOperator], log: Logger
 ) -> list[str]:
@@ -86,7 +69,64 @@ def get_databricks_task_ids(
 # TODO: Need to re-think on how to support the currently unavailable repair functionality in Airflow 3. Probably a
 # good time to re-evaluate this would be once the plugin functionality is expanded in Airflow 3.1.
 if not AIRFLOW_V_3_0_PLUS:
+    from flask import flash, redirect, request, url_for
+    from flask_appbuilder import BaseView
+    from flask_appbuilder.api import expose
+
     from airflow.utils.session import NEW_SESSION, provide_session
+    from airflow.www import auth
+
+    def get_auth_decorator():
+        from airflow.auth.managers.models.resource_details import DagAccessEntity
+
+        return auth.has_access_dag("POST", DagAccessEntity.RUN)
+
+    class RepairDatabricksTasks(BaseView, LoggingMixin):
+        """Repair databricks tasks from Airflow."""
+
+        default_view = "repair"
+
+        @expose("/repair_databricks_job/<string:dag_id>/<string:run_id>", methods=("GET",))
+        @get_auth_decorator()
+        def repair(self, dag_id: str, run_id: str):
+            return_url = self._get_return_url(dag_id, run_id)
+
+            tasks_to_repair = request.values.get("tasks_to_repair")
+            self.log.info("Tasks to repair: %s", tasks_to_repair)
+            if not tasks_to_repair:
+                flash("No tasks to repair. Not sending repair request.")
+                return redirect(return_url)
+
+            databricks_conn_id = request.values.get("databricks_conn_id")
+            databricks_run_id = request.values.get("databricks_run_id")
+
+            if not databricks_conn_id:
+                flash("No Databricks connection ID provided. Cannot repair tasks.")
+                return redirect(return_url)
+
+            if not databricks_run_id:
+                flash("No Databricks run ID provided. Cannot repair tasks.")
+                return redirect(return_url)
+
+            self.log.info("Repairing databricks job %s", databricks_run_id)
+            res = _repair_task(
+                databricks_conn_id=databricks_conn_id,
+                databricks_run_id=int(databricks_run_id),
+                tasks_to_repair=tasks_to_repair.split(","),
+                logger=self.log,
+            )
+            self.log.info("Repairing databricks job query for run %s sent", databricks_run_id)
+
+            self.log.info("Clearing tasks to rerun in airflow")
+
+            run_id = unquote(run_id)
+            _clear_task_instances(dag_id, run_id, tasks_to_repair.split(","), self.log)
+            flash(f"Databricks repair job is starting!: {res}")
+            return redirect(return_url)
+
+        @staticmethod
+        def _get_return_url(dag_id: str, run_id: str) -> str:
+            return url_for("Airflow.grid", dag_id=dag_id, dag_run_id=run_id)
 
     def _get_dag(dag_id: str, session: Session):
         from airflow.models.serialized_dag import SerializedDagModel
@@ -140,46 +180,45 @@ if not AIRFLOW_V_3_0_PLUS:
             raise TaskInstanceNotFound("Task instance not found")
         return ti
 
+    def _repair_task(
+        databricks_conn_id: str,
+        databricks_run_id: int,
+        tasks_to_repair: list[str],
+        logger: Logger,
+    ) -> int:
+        """
+        Repair a Databricks task using the Databricks API.
 
-def _repair_task(
-    databricks_conn_id: str,
-    databricks_run_id: int,
-    tasks_to_repair: list[str],
-    logger: Logger,
-) -> int:
-    """
-    Repair a Databricks task using the Databricks API.
-
-    This function allows the Airflow retry function to create a repair job for Databricks.
-    It uses the Databricks API to get the latest repair ID before sending the repair query.
+        This function allows the Airflow retry function to create a repair job for Databricks.
+        It uses the Databricks API to get the latest repair ID before sending the repair query.
 
-    :param databricks_conn_id: The Databricks connection ID.
-    :param databricks_run_id: The Databricks run ID.
-    :param tasks_to_repair: A list of Databricks task IDs to repair.
-    :param logger: The logger to use for logging.
-    :return: None
-    """
-    hook = DatabricksHook(databricks_conn_id=databricks_conn_id)
-
-    repair_history_id = hook.get_latest_repair_id(databricks_run_id)
-    logger.debug("Latest repair ID is %s", repair_history_id)
-    logger.debug(
-        "Sending repair query for tasks %s on run %s",
-        tasks_to_repair,
-        databricks_run_id,
-    )
+        :param databricks_conn_id: The Databricks connection ID.
+        :param databricks_run_id: The Databricks run ID.
+        :param tasks_to_repair: A list of Databricks task IDs to repair.
+        :param logger: The logger to use for logging.
+        :return: None
+        """
+        hook = DatabricksHook(databricks_conn_id=databricks_conn_id)
+
+        repair_history_id = hook.get_latest_repair_id(databricks_run_id)
+        logger.debug("Latest repair ID is %s", repair_history_id)
+        logger.debug(
+            "Sending repair query for tasks %s on run %s",
+            tasks_to_repair,
+            databricks_run_id,
+        )
 
-    run_data = hook.get_run(databricks_run_id)
-    repair_json = {
-        "run_id": databricks_run_id,
-        "latest_repair_id": repair_history_id,
-        "rerun_tasks": tasks_to_repair,
-    }
+        run_data = hook.get_run(databricks_run_id)
+        repair_json = {
+            "run_id": databricks_run_id,
+            "latest_repair_id": repair_history_id,
+            "rerun_tasks": tasks_to_repair,
+        }
 
-    if "overriding_parameters" in run_data:
-        repair_json["overriding_parameters"] = run_data["overriding_parameters"]
+        if "overriding_parameters" in run_data:
+            repair_json["overriding_parameters"] = run_data["overriding_parameters"]
 
-    return hook.repair_run(repair_json)
+        return hook.repair_run(repair_json)
 
 
 def get_launch_task_id(task_group: TaskGroup) -> str:
@@ -461,54 +500,6 @@ class WorkflowJobRepairSingleTaskLink(BaseOperatorLink, LoggingMixin):
         return url_for("RepairDatabricksTasks.repair", **query_params)
 
 
-class RepairDatabricksTasks(BaseView, LoggingMixin):
-    """Repair databricks tasks from Airflow."""
-
-    default_view = "repair"
-
-    @expose("/repair_databricks_job/<string:dag_id>/<string:run_id>", methods=("GET",))
-    @get_auth_decorator()
-    def repair(self, dag_id: str, run_id: str):
-        return_url = self._get_return_url(dag_id, run_id)
-
-        tasks_to_repair = request.values.get("tasks_to_repair")
-        self.log.info("Tasks to repair: %s", tasks_to_repair)
-        if not tasks_to_repair:
-            flash("No tasks to repair. Not sending repair request.")
-            return redirect(return_url)
-
-        databricks_conn_id = request.values.get("databricks_conn_id")
-        databricks_run_id = request.values.get("databricks_run_id")
-
-        if not databricks_conn_id:
-            flash("No Databricks connection ID provided. Cannot repair tasks.")
-            return redirect(return_url)
-
-        if not databricks_run_id:
-            flash("No Databricks run ID provided. Cannot repair tasks.")
-            return redirect(return_url)
-
-        self.log.info("Repairing databricks job %s", databricks_run_id)
-        res = _repair_task(
-            databricks_conn_id=databricks_conn_id,
-            databricks_run_id=int(databricks_run_id),
-            tasks_to_repair=tasks_to_repair.split(","),
-            logger=self.log,
-        )
-        self.log.info("Repairing databricks job query for run %s sent", databricks_run_id)
-
-        self.log.info("Clearing tasks to rerun in airflow")
-
-        run_id = unquote(run_id)
-        _clear_task_instances(dag_id, run_id, tasks_to_repair.split(","), self.log)
-        flash(f"Databricks repair job is starting!: {res}")
-        return redirect(return_url)
-
-    @staticmethod
-    def _get_return_url(dag_id: str, run_id: str) -> str:
-        return url_for("Airflow.grid", dag_id=dag_id, dag_run_id=run_id)
-
-
 class DatabricksWorkflowPlugin(AirflowPlugin):
     """
     Databricks Workflows plugin for Airflow.

{apache_airflow_providers_databricks-7.7.3rc1 → apache_airflow_providers_databricks-7.7.4}/src/airflow/providers/databricks/sensors/databricks.py

@@ -24,18 +24,13 @@ from typing import TYPE_CHECKING, Any
 
 from airflow.configuration import conf
 from airflow.exceptions import AirflowException
+from airflow.providers.common.compat.sdk import BaseSensorOperator
 from airflow.providers.databricks.hooks.databricks import DatabricksHook, SQLStatementState
 from airflow.providers.databricks.operators.databricks import DEFER_METHOD_NAME
 from airflow.providers.databricks.utils.mixins import DatabricksSQLStatementsMixin
-from airflow.providers.databricks.version_compat import AIRFLOW_V_3_0_PLUS
-
-if AIRFLOW_V_3_0_PLUS:
-    from airflow.sdk.bases.sensor import BaseSensorOperator
-else:
-    from airflow.sensors.base import BaseSensorOperator  # type: ignore[no-redef]
 
 if TYPE_CHECKING:
-    from airflow.utils.context import Context
+    from airflow.providers.common.compat.sdk import Context
 
 XCOM_STATEMENT_ID_KEY = "statement_id"
 

{apache_airflow_providers_databricks-7.7.3rc1 → apache_airflow_providers_databricks-7.7.4}/src/airflow/providers/databricks/sensors/databricks_partition.py

@@ -28,21 +28,12 @@ from typing import TYPE_CHECKING, Any
 from databricks.sql.utils import ParamEscaper
 
 from airflow.exceptions import AirflowException
+from airflow.providers.common.compat.sdk import BaseSensorOperator
 from airflow.providers.common.sql.hooks.handlers import fetch_all_handler
 from airflow.providers.databricks.hooks.databricks_sql import DatabricksSqlHook
-from airflow.providers.databricks.version_compat import AIRFLOW_V_3_0_PLUS
-
-if AIRFLOW_V_3_0_PLUS:
-    from airflow.sdk import BaseSensorOperator
-else:
-    from airflow.sensors.base import BaseSensorOperator  # type: ignore[no-redef]
 
 if TYPE_CHECKING:
-    try:
-        from airflow.sdk.definitions.context import Context
-    except ImportError:
-        # TODO: Remove once provider drops support for Airflow 2
-        from airflow.utils.context import Context
+    from airflow.providers.common.compat.sdk import Context
 
 
 class DatabricksPartitionSensor(BaseSensorOperator):

{apache_airflow_providers_databricks-7.7.3rc1 → apache_airflow_providers_databricks-7.7.4}/src/airflow/providers/databricks/sensors/databricks_sql.py

@@ -25,21 +25,12 @@ from functools import cached_property
 from typing import TYPE_CHECKING, Any
 
 from airflow.exceptions import AirflowException
+from airflow.providers.common.compat.sdk import BaseSensorOperator
 from airflow.providers.common.sql.hooks.handlers import fetch_all_handler
 from airflow.providers.databricks.hooks.databricks_sql import DatabricksSqlHook
-from airflow.providers.databricks.version_compat import AIRFLOW_V_3_0_PLUS
-
-if AIRFLOW_V_3_0_PLUS:
-    from airflow.sdk import BaseSensorOperator
-else:
-    from airflow.sensors.base import BaseSensorOperator  # type: ignore[no-redef]
 
 if TYPE_CHECKING:
-    try:
-        from airflow.sdk.definitions.context import Context
-    except ImportError:
-        # TODO: Remove once provider drops support for Airflow 2
-        from airflow.utils.context import Context
+    from airflow.providers.common.compat.sdk import Context
 
 
 class DatabricksSqlSensor(BaseSensorOperator):

{apache_airflow_providers_databricks-7.7.3rc1 → apache_airflow_providers_databricks-7.7.4}/src/airflow/providers/databricks/version_compat.py

@@ -34,18 +34,6 @@ def get_base_airflow_version_tuple() -> tuple[int, int, int]:
 
 AIRFLOW_V_3_0_PLUS = get_base_airflow_version_tuple() >= (3, 0, 0)
 
-if AIRFLOW_V_3_0_PLUS:
-    from airflow.sdk import BaseOperator, BaseOperatorLink, TaskGroup
-    from airflow.sdk.execution_time.xcom import XCom
-else:
-    from airflow.models import BaseOperator, XCom
-    from airflow.models.baseoperatorlink import BaseOperatorLink  # type: ignore[no-redef]
-    from airflow.utils.task_group import TaskGroup  # type: ignore[no-redef]
-
 __all__ = [
     "AIRFLOW_V_3_0_PLUS",
-    "BaseOperator",
-    "BaseOperatorLink",
-    "TaskGroup",
-    "XCom",
 ]

{apache_airflow_providers_databricks-7.7.3rc1 → apache_airflow_providers_databricks-7.7.4}/tests/unit/databricks/hooks/test_databricks.py

@@ -358,7 +358,7 @@ class TestDatabricksHook:
         assert host == HOST
 
     def test_init_bad_retry_limit(self):
-        with pytest.raises(ValueError):
+        with pytest.raises(ValueError, match="Retry limit must be greater than or equal to 1"):
             DatabricksHook(retry_limit=0)
 
     def test_do_api_call_retries_with_retryable_error(self):

{apache_airflow_providers_databricks-7.7.3rc1 → apache_airflow_providers_databricks-7.7.4}/tests/unit/databricks/hooks/test_databricks_sql.py

@@ -373,9 +373,8 @@ def test_query(
     ],
 )
 def test_no_query(databricks_hook, empty_statement):
-    with pytest.raises(ValueError) as err:
+    with pytest.raises(ValueError, match="List of SQL statements is empty"):
         databricks_hook.run(sql=empty_statement)
-    assert err.value.args[0] == "List of SQL statements is empty"
 
 
 @pytest.mark.parametrize(

{apache_airflow_providers_databricks-7.7.3rc1 → apache_airflow_providers_databricks-7.7.4}/tests/unit/databricks/operators/test_databricks.py

@@ -2404,10 +2404,10 @@ class TestDatabricksNotebookOperator:
             existing_cluster_id="existing_cluster_id",
             databricks_conn_id="test_conn_id",
         )
-        with pytest.raises(ValueError) as exc_info:
+        with pytest.raises(
+            ValueError, match="Both new_cluster and existing_cluster_id are set. Only one should be set."
+        ):
             operator._get_run_json()
-        exception_message = "Both new_cluster and existing_cluster_id are set. Only one should be set."
-        assert str(exc_info.value) == exception_message
 
     def test_both_new_and_existing_cluster_unset(self):
         operator = DatabricksNotebookOperator(
@@ -2416,10 +2416,8 @@ class TestDatabricksNotebookOperator:
             source="test_source",
             databricks_conn_id="test_conn_id",
         )
-        with pytest.raises(ValueError) as exc_info:
+        with pytest.raises(ValueError, match="Must specify either existing_cluster_id or new_cluster."):
             operator._get_run_json()
-        exception_message = "Must specify either existing_cluster_id or new_cluster."
-        assert str(exc_info.value) == exception_message
 
     def test_job_runs_forever_by_default(self):
         operator = DatabricksNotebookOperator(
@@ -2442,13 +2440,12 @@ class TestDatabricksNotebookOperator:
             existing_cluster_id="existing_cluster_id",
             execution_timeout=timedelta(seconds=0),
         )
-        with pytest.raises(ValueError) as exc_info:
+        with pytest.raises(
+            ValueError,
+            match="If you've set an `execution_timeout` for the task, ensure it's not `0`. "
+            "Set it instead to `None` if you desire the task to run indefinitely.",
+        ):
             operator._get_run_json()
-        exception_message = (
-            "If you've set an `execution_timeout` for the task, ensure it's not `0`. "
-            "Set it instead to `None` if you desire the task to run indefinitely."
-        )
-        assert str(exc_info.value) == exception_message
 
     def test_extend_workflow_notebook_packages(self):
         """Test that the operator can extend the notebook packages of a Databricks workflow task group."""

{apache_airflow_providers_databricks-7.7.3rc1 → apache_airflow_providers_databricks-7.7.4}/tests/unit/databricks/sensors/test_databricks.py

@@ -21,8 +21,6 @@ from unittest import mock
 
 import pytest
 
-pytest.importorskip("flask_appbuilder")  # Remove after upgrading to FAB5
-
 from airflow.exceptions import AirflowException, TaskDeferred
 from airflow.providers.databricks.hooks.databricks import SQLStatementState
 from airflow.providers.databricks.sensors.databricks import DatabricksSQLStatementsSensor