Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion dev/breeze/tests/test_packages.py
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,11 @@ def test_get_long_package_name():

def test_get_provider_requirements():
# update me when asana dependencies change
assert get_provider_requirements("asana") == ["apache-airflow>=2.10.0", "asana>=5.0.0"]
assert get_provider_requirements("asana") == [
"apache-airflow>=2.10.0",
"apache-airflow-providers-common-compat>=1.7.4",
"asana>=5.0.0",
]


def test_get_removed_providers():
Expand Down
2 changes: 2 additions & 0 deletions providers/asana/pyproject.toml
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
"asana>=5.0.0",
]

Expand All @@ -66,6 +67,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/asana/src/airflow/providers/asana/hooks/asana.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
from asana.configuration import Configuration
from asana.rest import ApiException

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


class AsanaHook(BaseHook):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,10 @@
from typing import TYPE_CHECKING

from airflow.providers.asana.hooks.asana import AsanaHook
from airflow.providers.asana.version_compat import BaseOperator
from airflow.providers.common.compat.sdk 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 AsanaCreateTaskOperator(BaseOperator):
Expand Down
17 changes: 1 addition & 16 deletions providers/asana/src/airflow/providers/asana/version_compat.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,4 @@ 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
else:
from airflow.models import BaseOperator

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