diff --git a/Dockerfile b/Dockerfile index 5e900ab462791..5c3dfcc8ee9e1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -529,7 +529,7 @@ function common::get_packaging_tool() { export EXTRA_UNINSTALL_FLAGS="" fi export UPGRADE_EAGERLY="--upgrade --resolution highest" - export UPGRADE_IF_NEEDED="--upgrade --resolution lowest-direct" + export UPGRADE_IF_NEEDED="--upgrade" else echo echo "${COLOR_BLUE}Using 'pip' to install Airflow${COLOR_RESET}" @@ -906,7 +906,7 @@ function install_airflow() { echo echo "${COLOR_YELLOW}Likely pyproject.toml has new dependencies conflicting with constraints.${COLOR_RESET}" echo - echo "${COLOR_BLUE}Falling back to no-constraints, lowest-direct resolution installation.${COLOR_RESET}" + echo "${COLOR_BLUE}Falling back to no-constraints installation.${COLOR_RESET}" echo set -x ${PACKAGING_TOOL_CMD} install ${EXTRA_INSTALL_FLAGS} ${UPGRADE_IF_NEEDED} ${ADDITIONAL_PIP_INSTALL_FLAGS} ${installation_command_flags} diff --git a/Dockerfile.ci b/Dockerfile.ci index 84adaf6dadad5..402cc757eb5af 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -476,7 +476,7 @@ function common::get_packaging_tool() { export EXTRA_UNINSTALL_FLAGS="" fi export UPGRADE_EAGERLY="--upgrade --resolution highest" - export UPGRADE_IF_NEEDED="--upgrade --resolution lowest-direct" + export UPGRADE_IF_NEEDED="--upgrade" else echo echo "${COLOR_BLUE}Using 'pip' to install Airflow${COLOR_RESET}" @@ -710,7 +710,7 @@ function install_airflow() { echo echo "${COLOR_YELLOW}Likely pyproject.toml has new dependencies conflicting with constraints.${COLOR_RESET}" echo - echo "${COLOR_BLUE}Falling back to no-constraints, lowest-direct resolution installation.${COLOR_RESET}" + echo "${COLOR_BLUE}Falling back to no-constraints installation.${COLOR_RESET}" echo set -x ${PACKAGING_TOOL_CMD} install ${EXTRA_INSTALL_FLAGS} ${UPGRADE_IF_NEEDED} ${ADDITIONAL_PIP_INSTALL_FLAGS} ${installation_command_flags} diff --git a/scripts/docker/common.sh b/scripts/docker/common.sh index f6f80ff6e865a..e357d9f57e6f2 100644 --- a/scripts/docker/common.sh +++ b/scripts/docker/common.sh @@ -54,7 +54,7 @@ function common::get_packaging_tool() { export EXTRA_UNINSTALL_FLAGS="" fi export UPGRADE_EAGERLY="--upgrade --resolution highest" - export UPGRADE_IF_NEEDED="--upgrade --resolution lowest-direct" + export UPGRADE_IF_NEEDED="--upgrade" else echo echo "${COLOR_BLUE}Using 'pip' to install Airflow${COLOR_RESET}" diff --git a/scripts/docker/install_airflow.sh b/scripts/docker/install_airflow.sh index 51dc3c9e00cb4..63cdc701e21b0 100644 --- a/scripts/docker/install_airflow.sh +++ b/scripts/docker/install_airflow.sh @@ -91,7 +91,7 @@ function install_airflow() { echo echo "${COLOR_YELLOW}Likely pyproject.toml has new dependencies conflicting with constraints.${COLOR_RESET}" echo - echo "${COLOR_BLUE}Falling back to no-constraints, lowest-direct resolution installation.${COLOR_RESET}" + echo "${COLOR_BLUE}Falling back to no-constraints installation.${COLOR_RESET}" echo set -x ${PACKAGING_TOOL_CMD} install ${EXTRA_INSTALL_FLAGS} ${UPGRADE_IF_NEEDED} ${ADDITIONAL_PIP_INSTALL_FLAGS} ${installation_command_flags} diff --git a/scripts/in_container/_in_container_utils.sh b/scripts/in_container/_in_container_utils.sh index 7557d2165a149..54e1b27ba7aba 100644 --- a/scripts/in_container/_in_container_utils.sh +++ b/scripts/in_container/_in_container_utils.sh @@ -79,7 +79,7 @@ function in_container_get_packaging_tool() { export EXTRA_UNINSTALL_FLAGS="" fi export UPGRADE_EAGERLY="--upgrade --resolution highest" - export UPGRADE_IF_NEEDED="--upgrade --resolution lowest-direct" + export UPGRADE_IF_NEEDED="--upgrade" else echo echo "${COLOR_BLUE}Using 'pip' to install Airflow${COLOR_RESET}"