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
2 changes: 1 addition & 1 deletion .github/workflows/basic-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/ci-amd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-image-checks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
4 changes: 4 additions & 0 deletions Dockerfile.ci
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
28 changes: 22 additions & 6 deletions dev/breeze/doc/images/output_run.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion dev/breeze/doc/images/output_run.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
a091135537dd5028ed149ca9660fdc1e
b0dbcbb353dc722c2004dddcdf574a2c
10 changes: 10 additions & 0 deletions dev/breeze/src/airflow_breeze/commands/common_options.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
ALLOWED_MYSQL_VERSIONS,
ALLOWED_POSTGRES_VERSIONS,
ALLOWED_PYTHON_MAJOR_MINOR_VERSIONS,
ALLOWED_TTY,
ALLOWED_USE_AIRFLOW_VERSIONS,
APACHE_AIRFLOW_GITHUB_REPOSITORY,
AUTOCOMPLETE_ALL_INTEGRATIONS,
Expand Down Expand Up @@ -380,6 +381,15 @@ def _set_default_from_parent(ctx: click.core.Context, option: click.core.Option,
help="Run standalone dag processor for start-airflow (required for Airflow 3).",
envvar="STANDALONE_DAG_PROCESSOR",
)
option_tty = click.option(
"--tty",
envvar="TTY",
type=BetterChoice(ALLOWED_TTY),
default=ALLOWED_TTY[0],
show_default=True,
help="Whether to allocate pseudo-tty when running docker command"
" (useful for pre-commit and CI to force-enable it).",
)
option_upgrade_boto = click.option(
"--upgrade-boto",
help="Remove aiobotocore and upgrade botocore and boto to the latest version.",
Expand Down
16 changes: 5 additions & 11 deletions dev/breeze/src/airflow_breeze/commands/developer_commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
option_run_db_tests_only,
option_skip_db_tests,
option_standalone_dag_processor,
option_tty,
option_upgrade_boto,
option_use_airflow_version,
option_use_uv,
Expand All @@ -89,7 +90,6 @@
ALLOWED_CELERY_BROKERS,
ALLOWED_CELERY_EXECUTORS,
ALLOWED_EXECUTORS,
ALLOWED_TTY,
DEFAULT_ALLOWED_EXECUTOR,
DEFAULT_CELERY_BROKER,
DEFAULT_PYTHON_MAJOR_MINOR_VERSION,
Expand Down Expand Up @@ -255,15 +255,7 @@ def run(self):
@main.command()
@click.argument("extra-args", nargs=-1, type=click.UNPROCESSED)
@click.option("--quiet", is_flag=True, envvar="QUIET", help="Suppress initialization output when starting.")
@click.option(
"--tty",
envvar="TTY",
type=BetterChoice(ALLOWED_TTY),
default=ALLOWED_TTY[0],
show_default=True,
help="Whether to allocate pseudo-tty when running docker command"
" (useful for pre-commit and CI to force-enable it).",
)
@option_tty
@click.option(
"--verbose-commands",
help="Show details of commands executed.",
Expand Down Expand Up @@ -1222,6 +1214,7 @@ def doctor(ctx):
@option_project_name
@option_python
@option_skip_image_upgrade_check
@option_tty
@option_use_uv
@option_uv_http_timeout
@option_verbose
Expand All @@ -1240,6 +1233,7 @@ def run(
project_name: str,
python: str,
skip_image_upgrade_check: bool,
tty: str,
use_uv: bool,
uv_http_timeout: int,
):
Expand Down Expand Up @@ -1307,7 +1301,7 @@ def run(
# Optimizations for non-interactive execution
quiet=True,
skip_environment_initialization=True,
tty="disabled",
tty=tty,
# Set extra_args to empty tuple since we'll pass the command directly
extra_args=(),
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,7 @@
"--backend",
"--postgres-version",
"--mysql-version",
"--tty",
],
},
{
Expand Down
7 changes: 5 additions & 2 deletions dev/breeze/src/airflow_breeze/utils/console.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,15 @@ def escaped_title(self) -> str:
return self.title.replace("[", "\\[")


CONSOLE_WIDTH: int | None = int(os.environ.get("CI_WIDTH", "202")) if os.environ.get("CI") else None


@clearable_cache
def get_console(output: Output | None = None) -> Console:
return Console(
force_terminal=True,
color_system="standard",
width=202 if not recording_width else int(recording_width),
width=CONSOLE_WIDTH if not recording_width else int(recording_width),
file=output.file if output else None,
theme=get_theme(),
record=True if recording_file else False,
Expand All @@ -110,7 +113,7 @@ def get_stderr_console(output: Output | None = None) -> Console:
color_system="standard",
stderr=True,
file=output.file if output else None,
width=202 if not recording_width else int(recording_width),
width=CONSOLE_WIDTH if not recording_width else int(recording_width),
theme=get_theme(),
record=True if recording_file else False,
)
Expand Down
4 changes: 4 additions & 0 deletions scripts/docker/entrypoint_ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
Loading