diff --git a/providers/oracle/pyproject.toml b/providers/oracle/pyproject.toml index 85330e2144749..be608f157b2d1 100644 --- a/providers/oracle/pyproject.toml +++ b/providers/oracle/pyproject.toml @@ -58,6 +58,7 @@ requires-python = ">=3.10" # After you modify the dependencies, and rebuild your Breeze CI image with ``breeze ci-image build`` dependencies = [ "apache-airflow>=2.10.0", + "apache-airflow-providers-common-compat>=1.8.0", "apache-airflow-providers-common-sql>=1.20.0", "oracledb>=2.0.0", ] @@ -80,6 +81,7 @@ dev = [ "apache-airflow", "apache-airflow-task-sdk", "apache-airflow-devel-common", + "apache-airflow-providers-common-compat", "apache-airflow-providers-common-sql", "apache-airflow-providers-openlineage", # Additional devel dependencies (do not remove this line and add extra development dependencies) diff --git a/providers/oracle/src/airflow/providers/oracle/operators/oracle.py b/providers/oracle/src/airflow/providers/oracle/operators/oracle.py index 0907752af142b..a81b79bc77660 100644 --- a/providers/oracle/src/airflow/providers/oracle/operators/oracle.py +++ b/providers/oracle/src/airflow/providers/oracle/operators/oracle.py @@ -23,11 +23,11 @@ import oracledb +from airflow.providers.common.compat.sdk import BaseOperator from airflow.providers.oracle.hooks.oracle import OracleHook -from airflow.providers.oracle.version_compat import BaseOperator if TYPE_CHECKING: - from airflow.providers.oracle.version_compat import Context + from airflow.providers.common.compat.sdk import Context class OracleStoredProcedureOperator(BaseOperator): diff --git a/providers/oracle/src/airflow/providers/oracle/transfers/oracle_to_oracle.py b/providers/oracle/src/airflow/providers/oracle/transfers/oracle_to_oracle.py index 8d722e8658b6a..da4cfb66b9d4a 100644 --- a/providers/oracle/src/airflow/providers/oracle/transfers/oracle_to_oracle.py +++ b/providers/oracle/src/airflow/providers/oracle/transfers/oracle_to_oracle.py @@ -20,11 +20,11 @@ from collections.abc import Sequence from typing import TYPE_CHECKING +from airflow.providers.common.compat.sdk import BaseOperator from airflow.providers.oracle.hooks.oracle import OracleHook -from airflow.providers.oracle.version_compat import BaseOperator if TYPE_CHECKING: - from airflow.providers.oracle.version_compat import Context + from airflow.providers.common.compat.sdk import Context class OracleToOracleOperator(BaseOperator): diff --git a/providers/oracle/src/airflow/providers/oracle/version_compat.py b/providers/oracle/src/airflow/providers/oracle/version_compat.py index c267288006129..ff0f446dc5efc 100644 --- a/providers/oracle/src/airflow/providers/oracle/version_compat.py +++ b/providers/oracle/src/airflow/providers/oracle/version_compat.py @@ -29,15 +29,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 - from airflow.sdk.definitions.context import Context -else: - from airflow.models import BaseOperator - from airflow.utils.context import Context - __all__ = [ "AIRFLOW_V_3_0_PLUS", - "BaseOperator", - "Context", ]