Remove overlooked kubernetes/pod_generator_deprecated.py file

.github/boring-cyborg.yml

@@ -43,9 +43,7 @@ labelPRBasedOnFilePath:
     - providers/apache/druid/**
 
   provider:apache-flink:
-    - providers/src/airflow/providers/apache/flink/**/*
-    - docs/apache-airflow-providers-apache-flink/**/*
-    - providers/tests/apache/flink/**/*
+    - providers/apache/flink/**
 
   provider:apache-hdfs:
     - providers/src/airflow/providers/apache/hdfs/**/*
@@ -59,9 +57,7 @@ labelPRBasedOnFilePath:
     - providers/apache/iceberg/**
 
   provider:apache-impala:
-    - providers/src/airflow/providers/apache/impala/**/*
-    - docs/apache-airflow-providers-apache-impala/**/*
-    - providers/tests/apache/impala/**/*
+    - providers/apache/impala/**
 
   provider:apache-kafka:
     - providers/apache/kafka/**
@@ -99,19 +95,10 @@ labelPRBasedOnFilePath:
     - providers/celery/**
 
   provider:cloudant:
-    - providers/src/airflow/providers/cloudant/**/*
-    - docs/apache-airflow-providers-cloudant/**/*
-    - providers/tests/cloudant/**/*
+    - providers/cloudant/**
 
   provider:cncf-kubernetes:
-    - airflow/example_dags/example_kubernetes_executor.py
-    - airflow/example_dags/example_local_kubernetes_executor.py
-    - providers/src/airflow/providers/cncf/kubernetes/**/*
-    - providers/celery/src/airflow/providers/celery/executors/celery_kubernetes_executor.py
-    - docs/apache-airflow-providers-cncf-kubernetes/**/*
-    - kubernetes_tests/**/*
-    - providers/tests/cncf/kubernetes/**/*
-    - providers/tests/system/cncf/kubernetes/**/*
+    - providers/cncf/kubernetes/**
 
   provider:cohere:
     - providers/cohere/**
@@ -207,10 +194,7 @@ labelPRBasedOnFilePath:
     - providers/microsoft/psrp/**
 
   provider:microsoft-winrm:
-    - providers/src/airflow/providers/microsoft/winrm/**/*
-    - docs/apache-airflow-providers-microsoft-winrm/**/*
-    - providers/tests/microsoft/winrm/**/*
-    - providers/tests/system/microsoft/winrm/**/*
+    - providers/microsoft/winrm/**
 
   provider:mongo:
     - providers/mongo/**
@@ -320,10 +304,7 @@ labelPRBasedOnFilePath:
     - providers/weaviate/**
 
   provider:yandex:
-    - providers/src/airflow/providers/yandex/**/*
-    - docs/apache-airflow-providers-yandex/**/*
-    - providers/tests/yandex/**/*
-    - providers/tests/system/yandex/**/*
+    - providers/yandex/**
 
   provider:ydb:
     - providers/ydb/**

.github/workflows/release_dockerhub_image.yml

@@ -177,7 +177,7 @@ jobs:
           ${SKIP_LATEST}
           ${LIMIT_PLATFORM}
           --limit-python ${PYTHON_VERSION}
-          --chicken-egg-providers ${CHICKEN_EGG_PROVIDERS}
+          --chicken-egg-providers "${CHICKEN_EGG_PROVIDERS}"
       - name: >
           Release slim images: ${{ github.event.inputs.airflowVersion }}, ${{ matrix.python-version }}
         env:

.pre-commit-config.yaml

@@ -641,11 +641,11 @@ repos:
           ^providers/google/src/airflow/providers/google/cloud/operators/dataproc.py$|
           ^providers/google/src/airflow/providers/google/cloud/operators/mlengine.py$|
           ^providers/src/airflow/providers/microsoft/azure/hooks/cosmos.py$|
-          ^providers/src/airflow/providers/microsoft/winrm/hooks/winrm.py$|
+          ^providers/microsoft/winrm/src/airflow/providers/microsoft/winrm/hooks/winrm.py$|
           ^airflow/www/fab_security/manager.py$|
           ^docs/.*commits.rst$|
           ^docs/apache-airflow-providers-apache-cassandra/connections/cassandra.rst$|
-          ^providers/src/airflow/providers/microsoft/winrm/operators/winrm.py$|
+          ^providers/microsoft/winrm/src/airflow/providers/microsoft/winrm/operators/winrm.py$|
           ^providers/opsgenie/src/airflow/providers/opsgenie/hooks/opsgenie.py$|
           ^providers/redis/src/airflow/providers/redis/provider.yaml$|
           ^airflow/serialization/serialized_objects.py$|
@@ -665,7 +665,7 @@ repos:
           ^providers/fab/docs/auth-manager/webserver-authentication.rst$|
           ^providers/google/docs/operators/cloud/kubernetes_engine.rst$|
           ^docs/apache-airflow-providers-microsoft-azure/connections/azure_cosmos.rst$|
-          ^docs/apache-airflow-providers-cncf-kubernetes/operators.rst$|
+          ^providers/cncf/kubernetes/docs/operators.rst$|
           ^docs/conf.py$|
           ^docs/exts/removemarktransform.py$|
           ^newsfragments/41761.significant.rst$|
@@ -1223,12 +1223,12 @@ repos:
           ^airflow/serialization/serde.py$ |
           ^airflow/utils/file.py$ |
           ^airflow/utils/helpers.py$ |
-          ^airflow/utils/log/secrets_masker.py$ |
           ^providers/ |
           ^tests/ |
           ^providers/tests/ |
           ^providers/.*/tests/ |
           ^task_sdk/src/airflow/sdk/definitions/dag.py$ |
+          ^task_sdk/src/airflow/sdk/execution_time/secrets_masker.py$ |
           ^task_sdk/src/airflow/sdk/definitions/_internal/node.py$ |
           ^dev/.*\.py$ |
           ^scripts/.*\.py$ |

Dockerfile.ci

@@ -930,17 +930,12 @@ function check_boto_upgrade() {
     echo
     echo "${COLOR_BLUE}Upgrading boto3, botocore to latest version to run Amazon tests with them${COLOR_RESET}"
     echo
-    # shellcheck disable=SC2086
-    ${PACKAGING_TOOL_CMD} uninstall ${EXTRA_UNINSTALL_FLAGS} aiobotocore s3fs yandexcloud opensearch-py || true
-    # We need to include few dependencies to pass pip check with other dependencies:
-    #   * oss2 as dependency as otherwise jmespath will be bumped (sync with alibaba provider)
-    #   * cryptography is kept for snowflake-connector-python limitation (sync with snowflake provider)
     set -x
     # shellcheck disable=SC2086
-    ${PACKAGING_TOOL_CMD} install ${EXTRA_INSTALL_FLAGS} --upgrade boto3 botocore \
-       "oss2>=2.14.0" "cryptography<43.0.0" "opensearch-py"
+    ${PACKAGING_TOOL_CMD} uninstall ${EXTRA_UNINSTALL_FLAGS} aiobotocore s3fs || true
+    # shellcheck disable=SC2086
+    ${PACKAGING_TOOL_CMD} install ${EXTRA_INSTALL_FLAGS} --upgrade boto3 botocore
     set +x
-    pip check
 }
 
 function check_downgrade_sqlalchemy() {

airflow/api_connexion/schemas/connection_schema.py

@@ -53,7 +53,7 @@ class ConnectionSchema(ConnectionCollectionItemSchema):
     def serialize_extra(obj: Connection):
         if obj.extra is None:
             return
-        from airflow.utils.log.secrets_masker import redact
+        from airflow.sdk.execution_time.secrets_masker import redact
 
         try:
             extra = json.loads(obj.extra)

airflow/api_fastapi/app.py

@@ -79,6 +79,7 @@ def create_app(apps: str = "all") -> FastAPI:
 
     if "execution" in apps_list or "all" in apps_list:
         task_exec_api_app = create_task_execution_api_app(app)
+        init_error_handlers(task_exec_api_app)
         app.mount("/execution", task_exec_api_app)
 
     init_config(app)

airflow/api_fastapi/core_api/datamodels/assets.py

@@ -22,7 +22,7 @@
 from pydantic import Field, field_validator
 
 from airflow.api_fastapi.core_api.base import BaseModel, StrictBaseModel
-from airflow.utils.log.secrets_masker import redact
+from airflow.sdk.execution_time.secrets_masker import redact
 
 
 class DagScheduleAssetReference(StrictBaseModel):

airflow/api_fastapi/core_api/datamodels/connections.py

@@ -23,7 +23,7 @@
 from pydantic_core.core_schema import ValidationInfo
 
 from airflow.api_fastapi.core_api.base import BaseModel, StrictBaseModel
-from airflow.utils.log.secrets_masker import redact
+from airflow.sdk.execution_time.secrets_masker import redact
 
 
 # Response Models

airflow/api_fastapi/core_api/datamodels/dag_tags.py

@@ -17,16 +17,12 @@
 
 from __future__ import annotations
 
-from pydantic import ConfigDict
-
 from airflow.api_fastapi.core_api.base import BaseModel
 
 
 class DagTagResponse(BaseModel):
     """DAG Tag serializer for responses."""
 
-    model_config = ConfigDict(populate_by_name=True, from_attributes=True)
-
     name: str
     dag_id: str
 

airflow/api_fastapi/core_api/datamodels/event_logs.py

@@ -19,16 +19,14 @@
 
 from datetime import datetime
 
-from pydantic import ConfigDict, Field
+from pydantic import Field
 
 from airflow.api_fastapi.core_api.base import BaseModel
 
 
 class EventLogResponse(BaseModel):
     """Event Log Response."""
 
-    model_config = ConfigDict(populate_by_name=True, from_attributes=True)
-
     id: int = Field(alias="event_log_id")
     dttm: datetime = Field(alias="when")
     dag_id: str | None

airflow/api_fastapi/core_api/datamodels/import_error.py

@@ -18,16 +18,14 @@
 
 from datetime import datetime
 
-from pydantic import ConfigDict, Field
+from pydantic import Field
 
 from airflow.api_fastapi.core_api.base import BaseModel
 
 
 class ImportErrorResponse(BaseModel):
     """Import Error Response."""
 
-    model_config = ConfigDict(populate_by_name=True, from_attributes=True)
-
     id: int = Field(alias="import_error_id")
     timestamp: datetime
     filename: str

airflow/api_fastapi/core_api/datamodels/pools.py

@@ -19,7 +19,7 @@
 
 from typing import Annotated, Callable
 
-from pydantic import BeforeValidator, ConfigDict, Field
+from pydantic import BeforeValidator, Field
 
 from airflow.api_fastapi.core_api.base import BaseModel, StrictBaseModel
 
@@ -63,8 +63,6 @@ class PoolCollectionResponse(BaseModel):
 class PoolPatchBody(StrictBaseModel):
     """Pool serializer for patch bodies."""
 
-    model_config = ConfigDict(populate_by_name=True, from_attributes=True)
-
     name: str | None = Field(default=None, alias="pool")
     slots: int | None = None
     description: str | None = None

airflow/api_fastapi/core_api/datamodels/task_instances.py

@@ -23,7 +23,6 @@
     AliasPath,
     AwareDatetime,
     BeforeValidator,
-    ConfigDict,
     Field,
     NonNegativeInt,
     StringConstraints,
@@ -42,8 +41,6 @@
 class TaskInstanceResponse(BaseModel):
     """TaskInstance serializer for responses."""
 
-    model_config = ConfigDict(populate_by_name=True, from_attributes=True)
-
     id: str
     task_id: str
     dag_id: str
@@ -126,8 +123,6 @@ class TaskInstancesBatchBody(StrictBaseModel):
 class TaskInstanceHistoryResponse(BaseModel):
     """TaskInstanceHistory serializer for responses."""
 
-    model_config = ConfigDict(populate_by_name=True, from_attributes=True)
-
     task_id: str
     dag_id: str
 
@@ -154,6 +149,7 @@ class TaskInstanceHistoryResponse(BaseModel):
     pid: int | None
     executor: str | None
     executor_config: Annotated[str, BeforeValidator(str)]
+    dag_version: DagVersionResponse | None
 
 
 class TaskInstanceHistoryCollectionResponse(BaseModel):

airflow/api_fastapi/core_api/datamodels/variables.py

@@ -19,19 +19,17 @@
 
 import json
 
-from pydantic import ConfigDict, Field, model_validator
+from pydantic import Field, model_validator
 
 from airflow.api_fastapi.core_api.base import BaseModel, StrictBaseModel
 from airflow.models.base import ID_LEN
+from airflow.sdk.execution_time.secrets_masker import redact
 from airflow.typing_compat import Self
-from airflow.utils.log.secrets_masker import redact
 
 
 class VariableResponse(BaseModel):
     """Variable serializer for responses."""
 
-    model_config = ConfigDict(populate_by_name=True, from_attributes=True)
-
     key: str
     val: str = Field(alias="value")
     description: str | None

airflow/api_fastapi/core_api/datamodels/xcom.py

@@ -65,3 +65,10 @@ class XComCreateBody(StrictBaseModel):
     key: str
     value: Any
     map_index: int = -1
+
+
+class XComUpdateBody(StrictBaseModel):
+    """Payload serializer for updating an XCom entry."""
+
+    value: Any
+    map_index: int = -1