Sort build options in breeze commands

dev/breeze/src/airflow_breeze/commands/ci_image_commands.py

@@ -234,87 +234,84 @@ def get_exitcode(status: int) -> int:
 
 
 @ci_image.command(name="build")
-@option_python
-@option_debian_version
-@option_upgrade_to_newer_dependencies
-@option_upgrade_on_failure
-@option_platform_multiple
-@option_github_token
-@option_docker_cache
-@option_image_tag_for_building
-@option_prepare_buildx_cache
-@option_push
-@option_install_providers_from_sources
 @option_additional_airflow_extras
-@option_additional_dev_apt_deps
-@option_additional_python_deps
 @option_additional_dev_apt_command
+@option_additional_dev_apt_deps
 @option_additional_dev_apt_env
-@option_builder
+@option_additional_pip_install_flags
+@option_additional_python_deps
+@option_airflow_constraints_location
+@option_airflow_constraints_mode_ci
+@option_airflow_constraints_reference_build
+@option_answer
 @option_build_progress
+@option_build_timeout_minutes
+@option_builder
 @option_commit_sha
+@option_debian_version
+@option_debug_resources
 @option_dev_apt_command
 @option_dev_apt_deps
-@option_python_image
+@option_docker_cache
+@option_dry_run
 @option_eager_upgrade_additional_requirements
-@option_airflow_constraints_location
-@option_airflow_constraints_mode_ci
-@option_airflow_constraints_reference_build
-@option_tag_as_latest
-@option_additional_pip_install_flags
 @option_github_repository
-@option_version_suffix_for_pypi_ci
-@option_build_timeout_minutes
-@option_run_in_parallel
-@option_parallelism
-@option_skip_cleanup
-@option_debug_resources
+@option_github_token
+@option_image_tag_for_building
 @option_include_success_outputs
+@option_install_providers_from_sources
+@option_parallelism
+@option_platform_multiple
+@option_prepare_buildx_cache
+@option_push
+@option_python
+@option_python_image
 @option_python_versions
+@option_run_in_parallel
+@option_skip_cleanup
+@option_tag_as_latest
+@option_upgrade_on_failure
+@option_upgrade_to_newer_dependencies
 @option_verbose
-@option_dry_run
-@option_answer
+@option_version_suffix_for_pypi_ci
 def build(
-    # Build options
-    python: str,
-    debian_version: str,
-    upgrade_to_newer_dependencies: bool,
-    upgrade_on_failure: bool,
-    platform: str | None,
-    github_token: str | None,
-    docker_cache: str,
-    image_tag: str,
-    prepare_buildx_cache: bool,
-    push: bool,
-    install_providers_from_sources: bool,
     additional_airflow_extras: str | None,
-    additional_dev_apt_deps: str | None,
-    additional_python_deps: str | None,
     additional_dev_apt_command: str | None,
+    additional_dev_apt_deps: str | None,
     additional_dev_apt_env: str | None,
-    builder: str,
+    additional_pip_install_flags: str | None,
+    additional_python_deps: str | None,
+    airflow_constraints_location: str | None,
+    airflow_constraints_mode: str,
+    airflow_constraints_reference: str,
     build_progress: str,
+    build_timeout_minutes: int | None,
+    builder: str,
     commit_sha: str | None,
+    debian_version: str,
+    debug_resources: bool,
     dev_apt_command: str | None,
     dev_apt_deps: str | None,
+    docker_cache: str,
     eager_upgrade_additional_requirements: str | None,
-    airflow_constraints_location: str | None,
-    airflow_constraints_mode: str,
-    airflow_constraints_reference: str,
-    tag_as_latest: bool,
-    additional_pip_install_flags: str | None,
     github_repository: str,
+    github_token: str | None,
+    image_tag: str,
+    include_success_outputs,
+    install_providers_from_sources: bool,
+    parallelism: int,
+    platform: str | None,
+    prepare_buildx_cache: bool,
+    push: bool,
+    python: str,
     python_image: str | None,
-    version_suffix_for_pypi: str,
-    # Parallel building
+    python_versions: str,
     run_in_parallel: bool,
-    parallelism: int,
     skip_cleanup: bool,
-    debug_resources: bool,
-    include_success_outputs,
-    python_versions: str,
-    # Other options
-    build_timeout_minutes: int | None,
+    tag_as_latest: bool,
+    upgrade_on_failure: bool,
+    upgrade_to_newer_dependencies: bool,
+    version_suffix_for_pypi: str,
 ):
     """Build CI image. Include building multiple images for all python versions."""
 
@@ -351,34 +348,34 @@ def run_build(ci_image_params: BuildCiParams) -> None:
     check_remote_ghcr_io_commands()
     fix_group_permissions()
     base_build_params = BuildCiParams(
-        force_build=True,
-        python=python,
-        debian_version=debian_version,
-        upgrade_to_newer_dependencies=upgrade_to_newer_dependencies,
-        upgrade_on_failure=upgrade_on_failure,
-        github_token=github_token,
-        docker_cache=docker_cache,
-        image_tag=image_tag,
-        prepare_buildx_cache=prepare_buildx_cache,
-        push=push,
-        install_providers_from_sources=install_providers_from_sources,
         additional_airflow_extras=additional_airflow_extras,
-        additional_python_deps=additional_python_deps,
         additional_dev_apt_command=additional_dev_apt_command,
         additional_dev_apt_env=additional_dev_apt_env,
-        builder=builder,
+        additional_pip_install_flags=additional_pip_install_flags,
+        additional_python_deps=additional_python_deps,
+        airflow_constraints_location=airflow_constraints_location,
+        airflow_constraints_mode=airflow_constraints_mode,
+        airflow_constraints_reference=airflow_constraints_reference,
         build_progress=build_progress,
+        builder=builder,
         commit_sha=commit_sha,
+        debian_version=debian_version,
         dev_apt_command=dev_apt_command,
         dev_apt_deps=dev_apt_deps,
+        docker_cache=docker_cache,
         eager_upgrade_additional_requirements=eager_upgrade_additional_requirements,
-        airflow_constraints_location=airflow_constraints_location,
-        airflow_constraints_mode=airflow_constraints_mode,
-        airflow_constraints_reference=airflow_constraints_reference,
-        tag_as_latest=tag_as_latest,
-        additional_pip_install_flags=additional_pip_install_flags,
+        force_build=True,
         github_repository=github_repository,
+        github_token=github_token,
+        image_tag=image_tag,
+        install_providers_from_sources=install_providers_from_sources,
+        prepare_buildx_cache=prepare_buildx_cache,
+        push=push,
+        python=python,
         python_image=python_image,
+        tag_as_latest=tag_as_latest,
+        upgrade_on_failure=upgrade_on_failure,
+        upgrade_to_newer_dependencies=upgrade_to_newer_dependencies,
         version_suffix_for_pypi=version_suffix_for_pypi,
     )
     if platform:
@@ -799,15 +796,15 @@ def rebuild_or_pull_ci_image_if_needed(command_params: ShellParams | BuildCiPara
         BUILD_CACHE_DIR, command_params.airflow_branch, f".built_{command_params.python}"
     )
     ci_image_params = BuildCiParams(
-        python=command_params.python,
         builder=command_params.builder,
+        force_build=command_params.force_build,
         github_repository=command_params.github_repository,
-        upgrade_to_newer_dependencies=False,
         image_tag=command_params.image_tag,
         platform=command_params.platform,
-        force_build=command_params.force_build,
-        skip_provider_dependencies_check=command_params.skip_provider_dependencies_check,
+        python=command_params.python,
         skip_image_upgrade_check=command_params.skip_image_upgrade_check,
+        skip_provider_dependencies_check=command_params.skip_provider_dependencies_check,
+        upgrade_to_newer_dependencies=False,
         warn_image_upgrade_needed=command_params.warn_image_upgrade_needed,
     )
     if command_params.image_tag is not None and command_params.image_tag != "latest":