Merge branch 'main' into wire-in-update-scripts-in-finalize-job

potiuk · web-flow · commit 57f390eeefa5 · 2025-06-29T14:23:42.000+02:00
diff --git a/.github/workflows/basic-tests.yml b/.github/workflows/basic-tests.yml
@@ -223,7 +223,7 @@ jobs:
           VERBOSE: "false"
           SKIP_BREEZE_PRE_COMMITS: "true"
           SKIP: ${{ inputs.skip-pre-commits }}
-          COLUMNS: "250"
+          COLUMNS: "202"
 
   test-git-clone-on-windows:
     timeout-minutes: 5
diff --git a/.github/workflows/ci-amd.yml b/.github/workflows/ci-amd.yml
@@ -248,7 +248,6 @@ jobs:
       contents: read
       packages: write
       id-token: write
-    if: needs.build-info.outputs.canary-run == 'true'
     with:
       runners: ${{ needs.build-info.outputs.amd-runners }}
       platform: "linux/amd64"
@@ -820,12 +819,19 @@ jobs:
           go-version: 1.24
           cache-dependency-path: go-sdk/go.sum
 
+      # keep this in sync with go.mod in go-sdk/
+      - name: Setup Gotestsum
+        shell: bash
+        run: |
+          go install gotest.tools/gotestsum@ddd0b05a6878e2e8257a2abe6e7df66cebc53d0e  # v1.12.3
+          gotestsum --version
+
       - name: "Cleanup dist files"
         run: rm -fv ./dist/*
 
       - name: Run Go tests
         working-directory: ./go-sdk
-        run: go test -v ./...
+        run: gotestsum --format testname ./...
 
   tests-airflow-ctl:
     name: "Airflow CTL tests"
diff --git a/.github/workflows/ci-image-checks.yml b/.github/workflows/ci-image-checks.yml
@@ -193,7 +193,7 @@ jobs:
         env:
           VERBOSE: "false"
           SKIP: ${{ inputs.skip-pre-commits }}
-          COLUMNS: "250"
+          COLUMNS: "202"
           SKIP_GROUP_OUTPUT: "true"
           DEFAULT_BRANCH: ${{ inputs.branch }}
           RUFF_FORMAT: "github"
@@ -235,7 +235,7 @@ jobs:
         run: pre-commit run --color always --verbose --hook-stage manual "$MYPY_CHECK" --all-files
         env:
           VERBOSE: "false"
-          COLUMNS: "250"
+          COLUMNS: "202"
           SKIP_GROUP_OUTPUT: "true"
           DEFAULT_BRANCH: ${{ inputs.branch }}
           RUFF_FORMAT: "github"
diff --git a/Dockerfile.ci b/Dockerfile.ci
@@ -848,6 +848,10 @@ mkdir "${AIRFLOW_HOME}/sqlite" -p || true
 
 ASSET_COMPILATION_WAIT_MULTIPLIER=${ASSET_COMPILATION_WAIT_MULTIPLIER:=1}
 
+if [[ "${CI=}" == "true" ]]; then
+    export COLUMNS="202"
+fi
+
 . "${IN_CONTAINER_DIR}/check_connectivity.sh"
 
 function wait_for_asset_compilation() {
diff --git a/dev/breeze/src/airflow_breeze/utils/console.py b/dev/breeze/src/airflow_breeze/utils/console.py
@@ -91,7 +91,7 @@ def escaped_title(self) -> str:
         return self.title.replace("[", "\\[")
 
 
-CONSOLE_WIDTH: int | None = int(os.environ.get("CI_WIDTH", "400")) if os.environ.get("CI") else None
+CONSOLE_WIDTH: int | None = int(os.environ.get("CI_WIDTH", "202")) if os.environ.get("CI") else None
 
 
 @clearable_cache
diff --git a/providers/apache/spark/src/airflow/providers/apache/spark/operators/spark_sql.py b/providers/apache/spark/src/airflow/providers/apache/spark/operators/spark_sql.py
@@ -20,8 +20,8 @@
 from collections.abc import Sequence
 from typing import TYPE_CHECKING, Any
 
-from airflow.models import BaseOperator
 from airflow.providers.apache.spark.hooks.spark_sql import SparkSqlHook
+from airflow.providers.apache.spark.version_compat import BaseOperator
 
 if TYPE_CHECKING:
     from airflow.utils.context import Context
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
@@ -21,8 +21,8 @@
 from typing import TYPE_CHECKING, Any
 
 from airflow.configuration import conf
-from airflow.models import BaseOperator
 from airflow.providers.apache.spark.hooks.spark_submit import SparkSubmitHook
+from airflow.providers.apache.spark.version_compat import BaseOperator
 from airflow.providers.common.compat.openlineage.utils.spark import (
     inject_parent_job_information_into_spark_properties,
     inject_transport_information_into_spark_properties,
diff --git a/providers/apache/spark/src/airflow/providers/apache/spark/version_compat.py b/providers/apache/spark/src/airflow/providers/apache/spark/version_compat.py
@@ -33,3 +33,13 @@ def get_base_airflow_version_tuple() -> tuple[int, int, int]:
 
 
 AIRFLOW_V_3_0_PLUS = get_base_airflow_version_tuple() >= (3, 0, 0)
+
+if AIRFLOW_V_3_0_PLUS:
+    from airflow.sdk import BaseOperator
+else:
+    from airflow.models import BaseOperator
+
+__all__ = [
+    "AIRFLOW_V_3_0_PLUS",
+    "BaseOperator",
+]
diff --git a/providers/edge3/docs/deployment.rst b/providers/edge3/docs/deployment.rst
@@ -50,9 +50,9 @@ Minimum Airflow configuration settings for the Edge Worker to make it running is
 
 - Section ``[core]``
 
-  - ``execution_api_server_url``: The url of the execution api server. Default is ``{BASE_URL}/execution/``
-    where {BASE_URL} is the base url of the API Server. If ``{BASE_URL}`` is not set, it will use
-    ``http://localhost:8080`` as the default base url.
+  - ``execution_api_server_url``: If not set, the base URL from ``edge.api_url`` will be used. For example,
+    when ``edge.api_url`` is set to ``https://your-hostname-and-port/edge_worker/v1/rpcapi``, it will
+    default to ``https://your-hostname-and-port/execution/``.
   - ``executor``: Executor must be set or added to be ``airflow.providers.edge3.executors.EdgeExecutor``
   - ``internal_api_secret_key``: An encryption key must be set on api-server and Edge Worker component as
     shared secret to authenticate traffic. It should be a random string like the fernet key
diff --git a/scripts/docker/entrypoint_ci.sh b/scripts/docker/entrypoint_ci.sh
@@ -49,6 +49,10 @@ mkdir "${AIRFLOW_HOME}/sqlite" -p || true
 
 ASSET_COMPILATION_WAIT_MULTIPLIER=${ASSET_COMPILATION_WAIT_MULTIPLIER:=1}
 
+if [[ "${CI=}" == "true" ]]; then
+    export COLUMNS="202"
+fi
+
 # shellcheck disable=SC1091
 . "${IN_CONTAINER_DIR}/check_connectivity.sh"
 
