Skip to content

Migrate remaining providers to common.compat compatibility layer in Salesforce #57088

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vincbeck merged 3 commits into from
Oct 22, 2025
Merged

Migrate remaining providers to common.compat compatibility layer in Salesforce #57088

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0cbad4d
Migrate remaining providers to common.compat compatibility layer
rich7420 Oct 22, 2025
8b46255
remove extra modification
rich7420 Oct 22, 2025
6bc061d
fix ruff error
rich7420 Oct 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions providers/salesforce/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.7.4", # + TODO: bump to next version
"simple-salesforce>=1.0.0",
'pandas>=2.1.2; python_version <"3.13"',
'pandas>=2.2.3; python_version >="3.13"',
Expand All @@ -68,6 +69,7 @@ dev = [
"apache-airflow",
"apache-airflow-task-sdk",
"apache-airflow-devel-common",
"apache-airflow-providers-common-compat",
# Additional devel dependencies (do not remove this line and add extra development dependencies)
]

Expand Down
2 changes: 1 addition & 1 deletion providers/salesforce/src/airflow/providers/salesforce/hooks/salesforce.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

from simple_salesforce import Salesforce, api

from airflow.providers.salesforce.version_compat import BaseHook
from airflow.providers.common.compat.sdk import BaseHook

if TYPE_CHECKING:
import pandas as pd
Expand Down
4 changes: 2 additions & 2 deletions providers/salesforce/src/airflow/providers/salesforce/operators/bulk.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@
from collections.abc import Iterable
from typing import TYPE_CHECKING, cast

from airflow.providers.common.compat.sdk import BaseOperator
from airflow.providers.salesforce.hooks.salesforce import SalesforceHook
from airflow.providers.salesforce.version_compat import BaseOperator

if TYPE_CHECKING:
from typing import Literal

from simple_salesforce.bulk import SFBulkHandler

from airflow.providers.salesforce.version_compat import Context
from airflow.providers.common.compat.sdk import Context


class SalesforceBulkOperator(BaseOperator):
Expand Down
4 changes: 2 additions & 2 deletions providers/salesforce/src/airflow/providers/salesforce/operators/salesforce_apex_rest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,11 @@

from typing import TYPE_CHECKING

from airflow.providers.common.compat.sdk import BaseOperator
from airflow.providers.salesforce.hooks.salesforce import SalesforceHook
from airflow.providers.salesforce.version_compat import BaseOperator

if TYPE_CHECKING:
from airflow.providers.salesforce.version_compat import Context
from airflow.providers.common.compat.sdk import Context


class SalesforceApexRestOperator(BaseOperator):
Expand Down
17 changes: 4 additions & 13 deletions providers/salesforce/src/airflow/providers/salesforce/version_compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,16 +30,7 @@ def get_base_airflow_version_tuple() -> tuple[int, int, int]:
AIRFLOW_V_3_0_PLUS = get_base_airflow_version_tuple() >= (3, 0, 0)
AIRFLOW_V_3_1_PLUS: bool = get_base_airflow_version_tuple() >= (3, 1, 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

if AIRFLOW_V_3_1_PLUS:
from airflow.sdk import BaseHook
else:
from airflow.hooks.base import BaseHook # type: ignore[attr-defined,no-redef]

__all__ = ["AIRFLOW_V_3_0_PLUS", "BaseHook", "BaseOperator", "Context"]
__all__ = [
"AIRFLOW_V_3_0_PLUS",
"AIRFLOW_V_3_1_PLUS",
]