Merge branch 'main' into fix-46402-trigger-dagrun-dynamic-dag-id-links

Author: hwang-cadent

.github/actions/breeze/action.yml

@@ -24,7 +24,7 @@ inputs:
     default: "3.10"
   uv-version:
     description: 'uv version to use'
-    default: "0.9.8"  # Keep this comment to allow automatic replacement of uv version
+    default: "0.9.9"  # Keep this comment to allow automatic replacement of uv version
 outputs:
   host-python-version:
     description: Python version used in host

.github/actions/install-prek/action.yml

@@ -24,7 +24,7 @@ inputs:
     default: "3.10"
   uv-version:
     description: 'uv version to use'
-    default: "0.9.8"  # Keep this comment to allow automatic replacement of uv version
+    default: "0.9.9"  # Keep this comment to allow automatic replacement of uv version
   prek-version:
     description: 'prek version to use'
     default: "0.2.13"  # Keep this comment to allow automatic replacement of prek version

.github/workflows/basic-tests.yml

@@ -66,7 +66,7 @@ on:  # yamllint disable-line rule:truthy
         type: string
       uv-version:
         description: 'uv version to use'
-        default: "0.9.8"  # Keep this comment to allow automatic replacement of uv version
+        default: "0.9.9"  # Keep this comment to allow automatic replacement of uv version
         type: string
       platform:
         description: 'Platform for the build - linux/amd64 or linux/arm64'
@@ -324,6 +324,7 @@ jobs:
           UPGRADE_RICH: "false"
           UPGRADE_RUFF: "false"
           UPGRADE_MYPY: "false"
+          UPGRADE_PROTOC: "false"
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
       - name: "Run automated upgrade for important versions minus uv (failing if needed)"
         run: |
@@ -348,6 +349,7 @@ jobs:
           UPGRADE_RICH: "true"
           UPGRADE_RUFF: "true"
           UPGRADE_MYPY: "true"
+          UPGRADE_PROTOC: "false"
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   test-airflow-release-commands:

.github/workflows/release_dockerhub_image.yml

@@ -58,7 +58,7 @@ jobs:
       AIRFLOW_VERSION: ${{ github.event.inputs.airflowVersion }}
       AMD_ONLY: ${{ github.event.inputs.amdOnly }}
       LIMIT_PYTHON_VERSIONS: ${{ github.event.inputs.limitPythonVersions }}
-      UV_VERSION: "0.9.8"  # Keep this comment to allow automatic replacement of uv version
+      UV_VERSION: "0.9.9"  # Keep this comment to allow automatic replacement of uv version
     if: contains(fromJSON('[
       "ashb",
       "eladkal",

.pre-commit-config.yaml

@@ -555,6 +555,7 @@ repos:
           ^.*RELEASE_NOTES\.rst$|
           ^scripts/ci/docker-compose/integration-keycloak\.yml$|
           ^scripts/ci/docker-compose/keycloak/keycloak-entrypoint\.sh$|
+          ^scripts/ci/prek/upgrade_important_versions.py$|
           ^scripts/ci/prek/vendor_k8s_json_schema\.py$
       - id: check-template-context-variable-in-sync
         name: Sync template context variable refs

Dockerfile

@@ -56,7 +56,7 @@ ARG AIRFLOW_PYTHON_VERSION="3.12.12"
 # Also use `force pip` label on your PR to swap all places we use `uv` to `pip`
 ARG AIRFLOW_PIP_VERSION=25.3
 # ARG AIRFLOW_PIP_VERSION="git+https://github.com/pypa/pip.git@main"
-ARG AIRFLOW_UV_VERSION=0.9.8
+ARG AIRFLOW_UV_VERSION=0.9.9
 ARG AIRFLOW_USE_UV="false"
 ARG UV_HTTP_TIMEOUT="300"
 ARG AIRFLOW_IMAGE_REPOSITORY="https://github.com/apache/airflow"

Dockerfile.ci

@@ -1653,7 +1653,7 @@ COPY --from=scripts common.sh install_packaging_tools.sh install_additional_depe
 # Also use `force pip` label on your PR to swap all places we use `uv` to `pip`
 ARG AIRFLOW_PIP_VERSION=25.3
 # ARG AIRFLOW_PIP_VERSION="git+https://github.com/pypa/pip.git@main"
-ARG AIRFLOW_UV_VERSION=0.9.8
+ARG AIRFLOW_UV_VERSION=0.9.9
 ARG AIRFLOW_PREK_VERSION="0.2.13"
 
 # UV_LINK_MODE=copy is needed since we are using cache mounted from the host

airflow-core/src/airflow/jobs/job.py

@@ -164,7 +164,7 @@ def executors(self):
 
     @cached_property
     def heartrate(self) -> float:
-        return Job._heartrate(self.job_type)
+        return Job._heartrate(str(self.job_type))
 
     def is_alive(self) -> bool:
         """
@@ -232,7 +232,7 @@ def heartbeat(
                     self.kill()
 
                 # Figure out how long to sleep for
-                sleep_for = 0
+                sleep_for: float = 0
                 if self.latest_heartbeat:
                     seconds_remaining = (
                         self.heartrate - (timezone.utcnow() - self.latest_heartbeat).total_seconds()
@@ -247,7 +247,11 @@ def heartbeat(
                     session.merge(self)
                     self.latest_heartbeat = timezone.utcnow()
                     session.commit()
-                    time_since_last_heartbeat = (timezone.utcnow() - previous_heartbeat).total_seconds()
+                    time_since_last_heartbeat: float = (
+                        0
+                        if previous_heartbeat is None
+                        else (timezone.utcnow() - previous_heartbeat).total_seconds()
+                    )
                     health_check_threshold_value = health_check_threshold(self.job_type, self.heartrate)
                     if time_since_last_heartbeat > health_check_threshold_value:
                         self.log.info("Heartbeat recovered after %.2f seconds", time_since_last_heartbeat)
@@ -304,7 +308,7 @@ def complete_execution(self, session: Session = NEW_SESSION):
     @provide_session
     def most_recent_job(self, session: Session = NEW_SESSION) -> Job | None:
         """Return the most recent job of this type, if any, based on last heartbeat received."""
-        return most_recent_job(self.job_type, session=session)
+        return most_recent_job(str(self.job_type), session=session)
 
     @staticmethod
     def _heartrate(job_type: str) -> float:

airflow-core/tests/unit/api_fastapi/core_api/routes/ui/test_grid.py

@@ -369,7 +369,7 @@ def test_runs_should_response_200_date_filters(self, test_client, params, expect
         assert response.json() == expected
 
     @pytest.mark.parametrize(
-        ("params, expected, expected_queries_count"),
+        ("params", "expected", "expected_queries_count"),
         [
             (
                 {

airflow-core/tests/unit/models/test_dag.py

@@ -1188,7 +1188,7 @@ def test_create_dagrun_job_id_is_set(self, testing_dag_bundle):
         )
         assert dr.creating_job_id == job_id
 
-    @pytest.mark.parametrize(["partition_key"], [[None], ["my-key"], [123]])
+    @pytest.mark.parametrize("partition_key", [None, "my-key", 123])
     def test_create_dagrun_partition_key(self, partition_key, dag_maker):
         with dag_maker("test_create_dagrun_partition_key"):
             ...