Skip to content

Migrate atlassian-jira provider to common.compat #57002

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
eladkal merged 1 commit into from
Oct 22, 2025
Merged

Migrate atlassian-jira provider to common.compat #57002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion providers/atlassian/jira/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +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.6.1",
"apache-airflow-providers-common-compat>=1.7.4", # + TODO: bump to next version
"apache-airflow-providers-http",
"atlassian-python-api>3.41.10",
]
Expand Down
2 changes: 1 addition & 1 deletion providers/atlassian/jira/src/airflow/providers/atlassian/jira/hooks/jira.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
from atlassian import Jira

from airflow.exceptions import AirflowException
from airflow.providers.atlassian.jira.version_compat import BaseHook
from airflow.providers.common.compat.sdk import BaseHook
from airflow.providers.http.hooks.http import HttpAsyncHook

if TYPE_CHECKING:
Expand Down
2 changes: 1 addition & 1 deletion providers/atlassian/jira/src/airflow/providers/atlassian/jira/notifications/jira.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

from airflow.providers.atlassian.jira.hooks.jira import JiraAsyncHook, JiraHook
from airflow.providers.atlassian.jira.version_compat import AIRFLOW_V_3_1_PLUS
from airflow.providers.common.compat.notifier import BaseNotifier
from airflow.providers.common.compat.sdk import BaseNotifier


class JiraNotifier(BaseNotifier):
Expand Down
4 changes: 2 additions & 2 deletions providers/atlassian/jira/src/airflow/providers/atlassian/jira/operators/jira.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
from typing import TYPE_CHECKING, Any

from airflow.providers.atlassian.jira.hooks.jira import JiraHook
from airflow.providers.atlassian.jira.version_compat import BaseOperator
from airflow.providers.common.compat.sdk import BaseOperator

if TYPE_CHECKING:
from airflow.utils.context import Context
from airflow.providers.common.compat.sdk import Context


class JiraOperator(BaseOperator):
Expand Down
4 changes: 2 additions & 2 deletions providers/atlassian/jira/src/airflow/providers/atlassian/jira/sensors/jira.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
from typing import TYPE_CHECKING, Any

from airflow.providers.atlassian.jira.hooks.jira import JiraHook
from airflow.providers.atlassian.jira.version_compat import BaseSensorOperator
from airflow.providers.common.compat.sdk import BaseSensorOperator

if TYPE_CHECKING:
from airflow.utils.context import Context
from airflow.providers.common.compat.sdk import Context


class JiraSensor(BaseSensorOperator):
Expand Down
14 changes: 0 additions & 14 deletions providers/atlassian/jira/src/airflow/providers/atlassian/jira/version_compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,21 +35,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_1_PLUS:
from airflow.sdk import BaseHook
else:
from airflow.hooks.base import BaseHook # type: ignore[attr-defined,no-redef]

if AIRFLOW_V_3_0_PLUS:
from airflow.sdk import BaseOperator, BaseSensorOperator
else:
from airflow.models import BaseOperator
from airflow.sensors.base import BaseSensorOperator # type: ignore[no-redef]

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