Unify selecting constraints option when installing airflow

.github/workflows/test-providers.yml

@@ -138,7 +138,8 @@ jobs:
       - name: "Install and verify wheel provider distributions"
         env:
           DISTRIBUTION_FORMAT: ${{ matrix.package-format }}
-          AIRFLOW_SKIP_CONSTRAINTS: "${{ inputs.upgrade-to-newer-dependencies }}"
+          # yamllint disable rule:line-length
+          INSTALL_AIRFLOW_WITH_CONSTRAINTS: "${{ inputs.upgrade-to-newer-dependencies == 'true' && 'false' || 'true' }}"
         run: >
           breeze release-management verify-provider-distributions
           --use-distributions-from-dist

dev/breeze/doc/images/output_release-management_install-provider-distributions.txt

@@ -1 +1 @@
-cfe5f24c120f2db2847a2417ef25c611
+c04ca4aa246f2fd444efed0308474fa1

dev/breeze/doc/images/output_release-management_verify-provider-distributions.txt

@@ -1 +1 @@
-0e329f01241fba5f0dcab0c7e2d77870
+26b34f4a3b053d7114ffc7dee194c87b

dev/breeze/doc/images/output_shell.txt

@@ -1 +1 @@
-f26f35825705d41fba54a52a5383f02e
+00e479003b0f0fd2e7e81d0703a4b829

dev/breeze/doc/images/output_start-airflow.txt

@@ -1 +1 @@
-a99b51b3e51bd9e82e88d4944279dcd9
+055a450825e9a8ff29477615629cffc2

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

@@ -443,6 +443,22 @@ def _set_default_from_parent(ctx: click.core.Context, option: click.core.Option,
     type=VerboseOption(),
     callback=_set_default_from_parent,
 )
+option_install_airflow_with_constraints = click.option(
+    "--install-airflow-with-constraints/--no-install-airflow-with-constraints",
+    is_flag=True,
+    default=False,
+    show_default=True,
+    envvar="INSTALL_AIRFLOW_WITH_CONSTRAINTS",
+    help="Install airflow in a separate step, with constraints determined from package or airflow version.",
+)
+option_install_airflow_with_constraints_default_true = click.option(
+    "--install-airflow-with-constraints/--no-install-airflow-with-constraints",
+    is_flag=True,
+    default=True,
+    show_default=True,
+    envvar="INSTALL_AIRFLOW_WITH_CONSTRAINTS",
+    help="Install airflow in a separate step, with constraints determined from package or airflow version.",
+)
 
 
 def _is_number_greater_than_expected(value: str) -> bool:

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

@@ -55,20 +55,6 @@
     show_default=True,
     help="Mode of constraints for Airflow for CI image building.",
 )
-option_airflow_skip_constraints = click.option(
-    "--airflow-skip-constraints",
-    is_flag=True,
-    help="Do not use constraints when installing airflow.",
-    envvar="AIRFLOW_SKIP_CONSTRAINTS",
-)
-option_install_airflow_with_constraints = click.option(
-    "--install-airflow-with-constraints/--no-install-airflow-with-constraints",
-    is_flag=True,
-    default=False,
-    show_default=True,
-    envvar="INSTALL_AIRFLOW_WITH_CONSTRAINTS",
-    help="Install airflow in a separate step, with constraints determined from package or airflow version.",
-)
 option_install_selected_providers = click.option(
     "--install-selected-providers",
     help="Comma-separated list of providers selected to be installed (implies --use-distributions-from-dist).",

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

@@ -51,6 +51,7 @@
     option_github_repository,
     option_include_not_ready_providers,
     option_include_removed_providers,
+    option_install_airflow_with_constraints_default_true,
     option_installation_distribution_format,
     option_keep_env_variables,
     option_max_time,
@@ -74,7 +75,6 @@
     option_airflow_constraints_location,
     option_airflow_constraints_mode_ci,
     option_airflow_constraints_reference,
-    option_airflow_skip_constraints,
     option_install_selected_providers,
     option_providers_constraints_location,
     option_providers_constraints_mode_ci,
@@ -220,16 +220,6 @@ def run(self):
     is_flag=True,
     envvar="WARN_IMAGE_UPGRADE_NEEDED",
 )
-
-option_install_airflow_with_constraints_default_true = click.option(
-    "--install-airflow-with-constraints/--no-install-airflow-with-constraints",
-    is_flag=True,
-    default=True,
-    show_default=True,
-    envvar="INSTALL_AIRFLOW_WITH_CONSTRAINTS",
-    help="Install airflow in a separate step, with constraints determined from package or airflow version.",
-)
-
 option_install_airflow_python_client = click.option(
     "--install-airflow-python-client",
     is_flag=True,
@@ -286,7 +276,6 @@ def run(self):
 @option_airflow_constraints_mode_ci
 @option_airflow_constraints_reference
 @option_airflow_extras
-@option_airflow_skip_constraints
 @option_answer
 @option_backend
 @option_builder
@@ -344,7 +333,6 @@ def shell(
     airflow_constraints_mode: str,
     airflow_constraints_reference: str,
     airflow_extras: str,
-    airflow_skip_constraints: bool,
     backend: str,
     builder: str,
     celery_broker: str,
@@ -417,7 +405,6 @@ def shell(
         airflow_constraints_mode=airflow_constraints_mode,
         airflow_constraints_reference=airflow_constraints_reference,
         airflow_extras=airflow_extras,
-        airflow_skip_constraints=airflow_skip_constraints,
         allow_pre_releases=allow_pre_releases,
         backend=backend,
         builder=builder,
@@ -513,7 +500,6 @@ def shell(
 @option_airflow_constraints_mode_ci
 @option_airflow_constraints_reference
 @option_airflow_extras
-@option_airflow_skip_constraints
 @option_auth_manager_start_airflow
 @option_answer
 @option_backend
@@ -530,6 +516,7 @@ def shell(
 @option_github_repository
 @option_installation_distribution_format
 @option_install_selected_providers
+@option_install_airflow_with_constraints_default_true
 @option_all_integration
 @option_load_default_connections
 @option_load_example_dags
@@ -556,7 +543,7 @@ def start_airflow(
     airflow_constraints_location: str,
     airflow_constraints_reference: str,
     airflow_extras: str,
-    airflow_skip_constraints: bool,
+    install_airflow_with_constraints: bool,
     allow_pre_releases: bool,
     auth_manager: str,
     backend: str,
@@ -627,7 +614,6 @@ def start_airflow(
         airflow_constraints_mode=airflow_constraints_mode,
         airflow_constraints_reference=airflow_constraints_reference,
         airflow_extras=airflow_extras,
-        airflow_skip_constraints=airflow_skip_constraints,
         allow_pre_releases=allow_pre_releases,
         auth_manager=auth_manager,
         backend=backend,
@@ -645,7 +631,7 @@ def start_airflow(
         github_repository=github_repository,
         integration=integration,
         install_selected_providers=install_selected_providers,
-        install_airflow_with_constraints=True,
+        install_airflow_with_constraints=install_airflow_with_constraints,
         load_default_connections=load_default_connections,
         load_example_dags=load_example_dags,
         mount_sources=mount_sources,

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

@@ -147,7 +147,6 @@
                 "--airflow-constraints-mode",
                 "--airflow-constraints-reference",
                 "--airflow-extras",
-                "--airflow-skip-constraints",
                 "--clean-airflow-installation",
                 "--force-lowest-dependencies",
                 "--test-type",
@@ -273,8 +272,8 @@
                 "--airflow-constraints-mode",
                 "--airflow-constraints-reference",
                 "--airflow-extras",
-                "--airflow-skip-constraints",
                 "--clean-airflow-installation",
+                "--install-airflow-with-constraints",
                 "--install-selected-providers",
                 "--distribution-format",
                 "--providers-constraints-location",

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

@@ -60,6 +60,8 @@
     option_include_not_ready_providers,
     option_include_removed_providers,
     option_include_success_outputs,
+    option_install_airflow_with_constraints,
+    option_install_airflow_with_constraints_default_true,
     option_installation_distribution_format,
     option_mount_sources,
     option_parallelism,
@@ -78,8 +80,6 @@
     option_airflow_constraints_mode_ci,
     option_airflow_constraints_mode_update,
     option_airflow_constraints_reference,
-    option_airflow_skip_constraints,
-    option_install_airflow_with_constraints,
     option_install_selected_providers,
     option_providers_constraints_location,
     option_providers_constraints_mode_ci,
@@ -1443,11 +1443,11 @@ def _run_command_for_providers(
 @option_airflow_constraints_location
 @option_airflow_constraints_reference
 @option_airflow_extras
-@option_airflow_skip_constraints
 @option_clean_airflow_installation
 @option_debug_resources
 @option_dry_run
 @option_github_repository
+@option_install_airflow_with_constraints_default_true
 @option_include_success_outputs
 @option_install_selected_providers
 @option_installation_distribution_format
@@ -1468,7 +1468,7 @@ def install_provider_distributions(
     airflow_constraints_location: str,
     airflow_constraints_mode: str,
     airflow_constraints_reference: str,
-    airflow_skip_constraints: bool,
+    install_airflow_with_constraints: bool,
     airflow_extras: str,
     allow_pre_releases: bool,
     clean_airflow_installation: bool,
@@ -1497,7 +1497,7 @@ def install_provider_distributions(
         airflow_constraints_mode=airflow_constraints_mode,
         airflow_constraints_reference=airflow_constraints_reference,
         airflow_extras=airflow_extras,
-        airflow_skip_constraints=airflow_skip_constraints,
+        install_airflow_with_constraints=install_airflow_with_constraints,
         allow_pre_releases=allow_pre_releases,
         # We just want to install the providers by entrypoint
         # we do not need to run any command in the container
@@ -1595,7 +1595,6 @@ def install_provider_distributions(
 @option_airflow_constraints_location
 @option_airflow_constraints_reference
 @option_airflow_extras
-@option_airflow_skip_constraints
 @option_clean_airflow_installation
 @option_dry_run
 @option_github_repository
@@ -1628,7 +1627,6 @@ def verify_provider_distributions(
     providers_constraints_reference: str,
     providers_skip_constraints: bool,
     python: str,
-    airflow_skip_constraints: bool,
     use_airflow_version: str | None,
     allow_pre_releases: bool,
     use_distributions_from_dist: bool,
@@ -1644,7 +1642,6 @@ def verify_provider_distributions(
         airflow_constraints_mode=airflow_constraints_mode,
         airflow_constraints_reference=airflow_constraints_reference,
         airflow_extras=airflow_extras,
-        airflow_skip_constraints=airflow_skip_constraints,
         allow_pre_releases=allow_pre_releases,
         clean_airflow_installation=clean_airflow_installation,
         github_repository=github_repository,

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

@@ -166,7 +166,6 @@
                 "--airflow-constraints-mode",
                 "--airflow-constraints-reference",
                 "--airflow-extras",
-                "--airflow-skip-constraints",
                 "--clean-airflow-installation",
                 "--install-airflow-with-constraints",
                 "--install-selected-providers",
@@ -197,8 +196,8 @@
                 "--airflow-constraints-mode",
                 "--airflow-constraints-reference",
                 "--airflow-extras",
-                "--airflow-skip-constraints",
                 "--clean-airflow-installation",
+                "--install-airflow-with-constraints",
                 "--install-selected-providers",
                 "--distribution-format",
                 "--providers-constraints-location",

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

@@ -43,6 +43,7 @@
     option_github_repository,
     option_image_name,
     option_include_success_outputs,
+    option_install_airflow_with_constraints,
     option_keep_env_variables,
     option_mount_sources,
     option_mysql_version,
@@ -61,7 +62,6 @@
 )
 from airflow_breeze.commands.common_package_installation_options import (
     option_airflow_constraints_reference,
-    option_install_airflow_with_constraints,
     option_providers_constraints_location,
     option_providers_skip_constraints,
     option_use_distributions_from_dist,

dev/breeze/src/airflow_breeze/params/shell_params.py

@@ -140,7 +140,6 @@ class ShellParams:
     airflow_constraints_mode: str = ALLOWED_CONSTRAINTS_MODES_CI[0]
     airflow_constraints_reference: str = ""
     airflow_extras: str = ""
-    airflow_skip_constraints: bool = False
     allow_pre_releases: bool = False
     auth_manager: str = ALLOWED_AUTH_MANAGERS[0]
     backend: str = ALLOWED_BACKENDS[0]
@@ -525,7 +524,6 @@ def env_variables_for_docker_commands(self) -> dict[str, str]:
         _set_var(_env, "AIRFLOW_CONSTRAINTS_REFERENCE", self.airflow_constraints_reference)
         _set_var(_env, "AIRFLOW_ENV", "development")
         _set_var(_env, "AIRFLOW_EXTRAS", self.airflow_extras)
-        _set_var(_env, "AIRFLOW_SKIP_CONSTRAINTS", self.airflow_skip_constraints)
         _set_var(_env, "AIRFLOW_IMAGE_KUBERNETES", self.airflow_image_kubernetes)
         _set_var(_env, "AIRFLOW_VERSION", self.airflow_version)
         _set_var(_env, "AIRFLOW__API_AUTH__JWT_SECRET", b64encode(os.urandom(16)).decode("utf-8"))

scripts/ci/docker-compose/devcontainer.env

@@ -45,6 +45,7 @@ HOST_GROUP_ID=
 HOST_OS="linux"
 INIT_SCRIPT_FILE="init.sh"
 INSTALL_AIRFLOW_VERSION=
+INSTALL_AIRFLOW_WITH_CONSTRAINTS=
 AIRFLOW_CONSTRAINTS_MODE=
 INSTALL_SELECTED_PROVIDERS=
 USE_AIRFLOW_VERSION=
@@ -60,7 +61,6 @@ POSTGRES_VERSION=10
 PYTHONDONTWRITEBYTECODE="true"
 REMOVE_ARM_PACKAGES="false"
 RUN_TESTS="false"
-AIRFLOW_SKIP_CONSTRAINTS="false"
 SKIP_SSH_SETUP="true"
 SKIP_ENVIRONMENT_INITIALIZATION="false"
 START_AIRFLOW="false"