diff --git a/docs/spelling_wordlist.txt b/docs/spelling_wordlist.txt index 00c557d1eb2a0..dac6798952671 100644 --- a/docs/spelling_wordlist.txt +++ b/docs/spelling_wordlist.txt @@ -911,6 +911,7 @@ js Json json jsonl +JsonValue juli Jupyter jupyter diff --git a/providers/apache/spark/src/airflow/providers/apache/spark/operators/spark_submit.py b/providers/apache/spark/src/airflow/providers/apache/spark/operators/spark_submit.py index 3ac4870f313fd..902d96a225ba8 100644 --- a/providers/apache/spark/src/airflow/providers/apache/spark/operators/spark_submit.py +++ b/providers/apache/spark/src/airflow/providers/apache/spark/operators/spark_submit.py @@ -31,7 +31,7 @@ from airflow.providers.common.compat.sdk import BaseOperator, conf try: - from airflow.sdk.bases.resumablemixin import ResumableJobMixin + from airflow.sdk import ResumableJobMixin except ImportError: # Airflow 2 compat. # ResumableJobMixin does not exist in Airflow 2, so we need to add a stub to make it diff --git a/task-sdk/src/airflow/sdk/__init__.py b/task-sdk/src/airflow/sdk/__init__.py index 3faefd2ce3c21..b922cad9e1fdc 100644 --- a/task-sdk/src/airflow/sdk/__init__.py +++ b/task-sdk/src/airflow/sdk/__init__.py @@ -126,7 +126,7 @@ cross_downstream, ) from airflow.sdk.bases.operatorlink import BaseOperatorLink - from airflow.sdk.bases.resumablemixin import ResumableJobMixin + from airflow.sdk.bases.resumablejobmixin import ResumableJobMixin from airflow.sdk.bases.sensor import BaseSensorOperator, PokeReturnValue from airflow.sdk.bases.skipmixin import SkipMixin from airflow.sdk.bases.xcom import BaseXCom @@ -256,7 +256,7 @@ "PokeReturnValue": ".bases.sensor", "ProductMapper": ".definitions.partition_mappers.product", "QuarterWindow": ".definitions.partition_mappers.window", - "ResumableJobMixin": ".bases.resumablemixin", + "ResumableJobMixin": ".bases.resumablejobmixin", "RetryAction": ".definitions.retry_policy", "RetryDecision": ".definitions.retry_policy", "RetryPolicy": ".definitions.retry_policy", diff --git a/task-sdk/src/airflow/sdk/__init__.pyi b/task-sdk/src/airflow/sdk/__init__.pyi index 8acb18026b115..703e3d4f0e604 100644 --- a/task-sdk/src/airflow/sdk/__init__.pyi +++ b/task-sdk/src/airflow/sdk/__init__.pyi @@ -35,6 +35,7 @@ from airflow.sdk.bases.operator import ( cross_downstream as cross_downstream, ) from airflow.sdk.bases.operatorlink import BaseOperatorLink as BaseOperatorLink +from airflow.sdk.bases.resumablejobmixin import ResumableJobMixin as ResumableJobMixin from airflow.sdk.bases.sensor import ( BaseSensorOperator as BaseSensorOperator, PokeReturnValue as PokeReturnValue, @@ -169,6 +170,7 @@ __all__ = [ "RetryDecision", "RetryPolicy", "RetryRule", + "ResumableJobMixin", "RollupMapper", "SecretCache", "SkipMixin", diff --git a/task-sdk/src/airflow/sdk/bases/resumablemixin.py b/task-sdk/src/airflow/sdk/bases/resumablejobmixin.py similarity index 100% rename from task-sdk/src/airflow/sdk/bases/resumablemixin.py rename to task-sdk/src/airflow/sdk/bases/resumablejobmixin.py diff --git a/task-sdk/tests/task_sdk/bases/test_resumablemixin.py b/task-sdk/tests/task_sdk/bases/test_resumablemixin.py index 9e28a53d31d4c..999d041f07a71 100644 --- a/task-sdk/tests/task_sdk/bases/test_resumablemixin.py +++ b/task-sdk/tests/task_sdk/bases/test_resumablemixin.py @@ -20,8 +20,8 @@ import pytest +from airflow.sdk import ResumableJobMixin from airflow.sdk.bases.operator import BaseOperator -from airflow.sdk.bases.resumablemixin import ResumableJobMixin if TYPE_CHECKING: from pydantic import JsonValue