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
28 changes: 14 additions & 14 deletions dev/breeze/src/airflow_breeze/breeze.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
from __future__ import annotations

from airflow_breeze.commands.main_command import main
from airflow_breeze.commands.workflow_commands import workflow_run
from airflow_breeze.commands.workflow_commands import workflow_run_group
from airflow_breeze.utils.path_utils import (
create_directories_and_files,
find_airflow_root_path_to_operate_on,
Expand All @@ -32,27 +32,27 @@

from airflow_breeze.commands import developer_commands # noqa: I001, E402, F401
from airflow_breeze.commands.ci_commands import ci_group # noqa: E402
from airflow_breeze.commands.ci_image_commands import ci_image # noqa: E402
from airflow_breeze.commands.ci_image_commands import ci_image_group # noqa: E402
from airflow_breeze.commands.kubernetes_commands import kubernetes_group # noqa: E402
from airflow_breeze.commands.production_image_commands import prod_image # noqa: E402
from airflow_breeze.commands.production_image_commands import prod_image_group # noqa: E402
from airflow_breeze.commands.minor_release_command import create_minor_version_branch # noqa: E402, F401
from airflow_breeze.commands.release_command import airflow_release # noqa: E402, F401
from airflow_breeze.commands.release_candidate_command import release_management # noqa: E402
from airflow_breeze.commands.sbom_commands import sbom # noqa: E402
from airflow_breeze.commands.setup_commands import setup # noqa: E402
from airflow_breeze.commands.testing_commands import group_for_testing # noqa: E402
from airflow_breeze.commands.release_candidate_command import release_management_group # noqa: E402
from airflow_breeze.commands.sbom_commands import sbom_group # noqa: E402
from airflow_breeze.commands.setup_commands import setup_group # noqa: E402
from airflow_breeze.commands.testing_commands import testing_group # noqa: E402
from airflow_breeze.commands.ui_commands import ui_group # noqa: E402

main.add_command(group_for_testing)
main.add_command(testing_group)
main.add_command(kubernetes_group)
main.add_command(ci_group)
main.add_command(ci_image)
main.add_command(prod_image)
main.add_command(setup)
main.add_command(release_management)
main.add_command(sbom)
main.add_command(ci_image_group)
main.add_command(prod_image_group)
main.add_command(setup_group)
main.add_command(release_management_group)
main.add_command(sbom_group)
main.add_command(ui_group)
main.add_command(workflow_run)
main.add_command(workflow_run_group)

if __name__ == "__main__":
main()
16 changes: 8 additions & 8 deletions dev/breeze/src/airflow_breeze/commands/ci_image_commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
@click.group(
cls=BreezeGroup, name="ci-image", help="Tools that developers can use to manually manage CI images"
)
def ci_image():
def ci_image_group():
pass


Expand Down Expand Up @@ -235,7 +235,7 @@ def get_exitcode(status: int) -> int:
)


@ci_image.command(name="build")
@ci_image_group.command(name="build")
@option_additional_airflow_extras
@option_additional_dev_apt_command
@option_additional_dev_apt_deps
Expand Down Expand Up @@ -404,7 +404,7 @@ def run_build(ci_image_params: BuildCiParams) -> None:
run_build(ci_image_params=base_build_params)


@ci_image.command(name="pull")
@ci_image_group.command(name="pull")
@option_python
@option_run_in_parallel
@option_parallelism
Expand Down Expand Up @@ -512,7 +512,7 @@ def run_verify_in_parallel(
)


@ci_image.command(name="save")
@ci_image_group.command(name="save")
@option_ci_image_file_to_save
@option_github_repository
@option_image_file_dir
Expand Down Expand Up @@ -551,7 +551,7 @@ def save(
sys.exit(result.returncode)


@ci_image.command(name="load")
@ci_image_group.command(name="load")
@option_ci_image_file_to_load
@option_dry_run
@option_from_run
Expand Down Expand Up @@ -630,7 +630,7 @@ def load(
mark_image_as_rebuilt(ci_image_params=build_ci_params)


@ci_image.command(
@ci_image_group.command(
name="verify",
context_settings=dict(
ignore_unknown_options=True,
Expand Down Expand Up @@ -915,7 +915,7 @@ def rebuild_or_pull_ci_image_if_needed(command_params: ShellParams | BuildCiPara
sys.exit(return_code)


@ci_image.command(name="export-mount-cache")
@ci_image_group.command(name="export-mount-cache")
@click.option(
"--cache-file",
required=True,
Expand Down Expand Up @@ -980,7 +980,7 @@ def export_mount_cache(
get_console().print(f"[success]Exported mount cache to {cache_file}[/]")


@ci_image.command(name="import-mount-cache")
@ci_image_group.command(name="import-mount-cache")
@click.option(
"--cache-file",
required=True,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import click

from airflow_breeze.commands.common_options import option_answer, option_dry_run, option_verbose
from airflow_breeze.commands.release_management_group import release_management
from airflow_breeze.commands.release_management_group import release_management_group
from airflow_breeze.utils.confirm import confirm_action
from airflow_breeze.utils.console import console_print
from airflow_breeze.utils.path_utils import AIRFLOW_ROOT_PATH
Expand Down Expand Up @@ -154,7 +154,7 @@ def create_constraints(version_branch):
)


@release_management.command(
@release_management_group.command(
name="create-minor-branch",
help="Create a new version branch and update the default branches in main",
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -181,11 +181,11 @@ def prepare_for_building_prod_image(params: BuildProdParams):
@click.group(
cls=BreezeGroup, name="prod-image", help="Tools that developers can use to manually manage PROD images"
)
def prod_image():
def prod_image_group():
pass


@prod_image.command(name="build")
@prod_image_group.command(name="build")
@click.option(
"--installation-method",
help="Install Airflow from: sources or PyPI.",
Expand Down Expand Up @@ -427,7 +427,7 @@ def run_build(prod_image_params: BuildProdParams) -> None:
run_build(prod_image_params=base_build_params)


@prod_image.command(name="pull")
@prod_image_group.command(name="pull")
@option_python
@option_run_in_parallel
@option_parallelism
Expand Down Expand Up @@ -534,7 +534,7 @@ def run_verify_in_parallel(
)


@prod_image.command(
@prod_image_group.command(
name="verify",
context_settings=dict(
ignore_unknown_options=True,
Expand Down Expand Up @@ -646,7 +646,7 @@ def verify(
sys.exit(return_code)


@prod_image.command(name="save")
@prod_image_group.command(name="save")
@option_github_repository
@option_image_file_dir
@option_platform_single
Expand Down Expand Up @@ -685,7 +685,7 @@ def save(
sys.exit(result.returncode)


@prod_image.command(name="load")
@prod_image_group.command(name="load")
@option_dry_run
@option_from_run
@option_from_pr
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
option_verbose,
option_version_suffix,
)
from airflow_breeze.commands.release_management_group import release_management
from airflow_breeze.commands.release_management_group import release_management_group
from airflow_breeze.global_constants import (
TarBallType,
get_airflow_version,
Expand Down Expand Up @@ -602,7 +602,7 @@ def remove_old_releases(version, repo_root):
os.chdir(repo_root)


@release_management.command(
@release_management_group.command(
name="prepare-tarball",
help="Prepare source tarball.",
)
Expand Down Expand Up @@ -637,7 +637,7 @@ def prepare_tarball(
)


@release_management.command(
@release_management_group.command(
name="start-rc-process",
short_help="Start RC process",
help="Start the process for releasing a new RC.",
Expand Down
4 changes: 2 additions & 2 deletions dev/breeze/src/airflow_breeze/commands/release_command.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import click

from airflow_breeze.commands.common_options import option_answer, option_dry_run, option_verbose
from airflow_breeze.commands.release_management_group import release_management
from airflow_breeze.commands.release_management_group import release_management_group
from airflow_breeze.utils.confirm import confirm_action
from airflow_breeze.utils.console import console_print
from airflow_breeze.utils.path_utils import AIRFLOW_ROOT_PATH
Expand Down Expand Up @@ -265,7 +265,7 @@ def push_tag_for_final_version(version, release_candidate, task_sdk_version=None
run_command(["git", "push", "origin", "tag", f"task-sdk/{task_sdk_version}"], check=True)


@release_management.command(
@release_management_group.command(
name="start-release",
short_help="Start Airflow release process",
help="Start the process of releasing an Airflow version. "
Expand Down
Loading