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
20 changes: 16 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -997,7 +997,11 @@ function install_airflow_and_providers_from_docker_context_files(){
"${install_airflow_distribution[@]}" "${install_airflow_core_distribution[@]}" "${airflow_distributions[@]}"
set +x
common::install_packaging_tools
pip check
# Here we should use `pip check` not `uv pip check` to detect any incompatibilities that might happen
# between `pip` and `uv` installations
# However, in the current version of `pip` there is a bug that incorrectly detects `pagefind-bin` as unsupported
# https://github.com/pypa/pip/issues/13709 -> once this is fixed, we should bring `pip check` back.
uv pip check
}

function install_all_other_distributions_from_docker_context_files() {
Expand Down Expand Up @@ -1235,7 +1239,7 @@ function install_airflow_when_building_images() {
set +x
common::install_packaging_tools
echo
echo "${COLOR_BLUE}Running 'uv pip check'${COLOR_RESET}"
echo "${COLOR_BLUE}Running 'pip check'${COLOR_RESET}"
echo
# Here we should use `pip check` not `uv pip check` to detect any incompatibilities that might happen
# between `pip` and `uv` installations
Expand Down Expand Up @@ -1276,7 +1280,11 @@ function install_additional_dependencies() {
echo
echo "${COLOR_BLUE}Running 'pip check'${COLOR_RESET}"
echo
pip check
# Here we should use `pip check` not `uv pip check` to detect any incompatibilities that might happen
# between `pip` and `uv` installations
# However, in the current version of `pip` there is a bug that incorrectly detects `pagefind-bin` as unsupported
# https://github.com/pypa/pip/issues/13709 -> once this is fixed, we should bring `pip check` back.
uv pip check
else
echo
echo "${COLOR_BLUE}Installing additional dependencies upgrading only if needed${COLOR_RESET}"
Expand All @@ -1290,7 +1298,11 @@ function install_additional_dependencies() {
echo
echo "${COLOR_BLUE}Running 'pip check'${COLOR_RESET}"
echo
pip check
# Here we should use `pip check` not `uv pip check` to detect any incompatibilities that might happen
# between `pip` and `uv` installations
# However, in the current version of `pip` there is a bug that incorrectly detects `pagefind-bin` as unsupported
# https://github.com/pypa/pip/issues/13709 -> once this is fixed, we should bring `pip check` back.
uv pip check
fi
}

Expand Down
32 changes: 27 additions & 5 deletions Dockerfile.ci
Original file line number Diff line number Diff line change
Expand Up @@ -988,7 +988,7 @@ function install_airflow_when_building_images() {
set +x
common::install_packaging_tools
echo
echo "${COLOR_BLUE}Running 'uv pip check'${COLOR_RESET}"
echo "${COLOR_BLUE}Running 'pip check'${COLOR_RESET}"
echo
# Here we should use `pip check` not `uv pip check` to detect any incompatibilities that might happen
# between `pip` and `uv` installations
Expand Down Expand Up @@ -1029,7 +1029,11 @@ function install_additional_dependencies() {
echo
echo "${COLOR_BLUE}Running 'pip check'${COLOR_RESET}"
echo
pip check
# Here we should use `pip check` not `uv pip check` to detect any incompatibilities that might happen
# between `pip` and `uv` installations
# However, in the current version of `pip` there is a bug that incorrectly detects `pagefind-bin` as unsupported
# https://github.com/pypa/pip/issues/13709 -> once this is fixed, we should bring `pip check` back.
uv pip check
else
echo
echo "${COLOR_BLUE}Installing additional dependencies upgrading only if needed${COLOR_RESET}"
Expand All @@ -1043,7 +1047,11 @@ function install_additional_dependencies() {
echo
echo "${COLOR_BLUE}Running 'pip check'${COLOR_RESET}"
echo
pip check
# Here we should use `pip check` not `uv pip check` to detect any incompatibilities that might happen
# between `pip` and `uv` installations
# However, in the current version of `pip` there is a bug that incorrectly detects `pagefind-bin` as unsupported
# https://github.com/pypa/pip/issues/13709 -> once this is fixed, we should bring `pip check` back.
uv pip check
fi
}

Expand Down Expand Up @@ -1359,7 +1367,14 @@ function check_downgrade_sqlalchemy() {
echo
# shellcheck disable=SC2086
${PACKAGING_TOOL_CMD} install ${EXTRA_INSTALL_FLAGS} "sqlalchemy[asyncio]==${min_sqlalchemy_version}"
pip check
echo
echo "${COLOR_BLUE}Running 'pip check'${COLOR_RESET}"
echo
# Here we should use `pip check` not `uv pip check` to detect any incompatibilities that might happen
# between `pip` and `uv` installations
# However, in the current version of `pip` there is a bug that incorrectly detects `pagefind-bin` as unsupported
# https://github.com/pypa/pip/issues/13709 -> once this is fixed, we should bring `pip check` back.
uv pip check
}

function check_downgrade_pendulum() {
Expand All @@ -1373,7 +1388,14 @@ function check_downgrade_pendulum() {
echo
# shellcheck disable=SC2086
${PACKAGING_TOOL_CMD} install ${EXTRA_INSTALL_FLAGS} "pendulum==${min_pendulum_version}"
pip check
echo
echo "${COLOR_BLUE}Running 'pip check'${COLOR_RESET}"
echo
# Here we should use `pip check` not `uv pip check` to detect any incompatibilities that might happen
# between `pip` and `uv` installations
# However, in the current version of `pip` there is a bug that incorrectly detects `pagefind-bin` as unsupported
# https://github.com/pypa/pip/issues/13709 -> once this is fixed, we should bring `pip check` back.
uv pip check
}

function check_run_tests() {
Expand Down
18 changes: 16 additions & 2 deletions scripts/docker/entrypoint_ci.sh
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,14 @@ function check_downgrade_sqlalchemy() {
echo
# shellcheck disable=SC2086
${PACKAGING_TOOL_CMD} install ${EXTRA_INSTALL_FLAGS} "sqlalchemy[asyncio]==${min_sqlalchemy_version}"
pip check
echo
echo "${COLOR_BLUE}Running 'pip check'${COLOR_RESET}"
echo
# Here we should use `pip check` not `uv pip check` to detect any incompatibilities that might happen
# between `pip` and `uv` installations
# However, in the current version of `pip` there is a bug that incorrectly detects `pagefind-bin` as unsupported
# https://github.com/pypa/pip/issues/13709 -> once this is fixed, we should bring `pip check` back.
uv pip check
}

# Download minimum supported version of pendulum to run tests with it
Expand All @@ -352,7 +359,14 @@ function check_downgrade_pendulum() {
echo
# shellcheck disable=SC2086
${PACKAGING_TOOL_CMD} install ${EXTRA_INSTALL_FLAGS} "pendulum==${min_pendulum_version}"
pip check
echo
echo "${COLOR_BLUE}Running 'pip check'${COLOR_RESET}"
echo
# Here we should use `pip check` not `uv pip check` to detect any incompatibilities that might happen
# between `pip` and `uv` installations
# However, in the current version of `pip` there is a bug that incorrectly detects `pagefind-bin` as unsupported
# https://github.com/pypa/pip/issues/13709 -> once this is fixed, we should bring `pip check` back.
uv pip check
}

# Check if we should run tests and run them if needed
Expand Down
12 changes: 10 additions & 2 deletions scripts/docker/install_additional_dependencies.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,11 @@ function install_additional_dependencies() {
echo
echo "${COLOR_BLUE}Running 'pip check'${COLOR_RESET}"
echo
pip check
# Here we should use `pip check` not `uv pip check` to detect any incompatibilities that might happen
# between `pip` and `uv` installations
# However, in the current version of `pip` there is a bug that incorrectly detects `pagefind-bin` as unsupported
# https://github.com/pypa/pip/issues/13709 -> once this is fixed, we should bring `pip check` back.
uv pip check
else
echo
echo "${COLOR_BLUE}Installing additional dependencies upgrading only if needed${COLOR_RESET}"
Expand All @@ -52,7 +56,11 @@ function install_additional_dependencies() {
echo
echo "${COLOR_BLUE}Running 'pip check'${COLOR_RESET}"
echo
pip check
# Here we should use `pip check` not `uv pip check` to detect any incompatibilities that might happen
# between `pip` and `uv` installations
# However, in the current version of `pip` there is a bug that incorrectly detects `pagefind-bin` as unsupported
# https://github.com/pypa/pip/issues/13709 -> once this is fixed, we should bring `pip check` back.
uv pip check
fi
}

Expand Down
2 changes: 1 addition & 1 deletion scripts/docker/install_airflow_when_building_images.sh
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ function install_airflow_when_building_images() {
set +x
common::install_packaging_tools
echo
echo "${COLOR_BLUE}Running 'uv pip check'${COLOR_RESET}"
echo "${COLOR_BLUE}Running 'pip check'${COLOR_RESET}"
echo
# Here we should use `pip check` not `uv pip check` to detect any incompatibilities that might happen
# between `pip` and `uv` installations
Expand Down
6 changes: 5 additions & 1 deletion scripts/docker/install_from_docker_context_files.sh
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,11 @@ function install_airflow_and_providers_from_docker_context_files(){
"${install_airflow_distribution[@]}" "${install_airflow_core_distribution[@]}" "${airflow_distributions[@]}"
set +x
common::install_packaging_tools
pip check
# Here we should use `pip check` not `uv pip check` to detect any incompatibilities that might happen
# between `pip` and `uv` installations
# However, in the current version of `pip` there is a bug that incorrectly detects `pagefind-bin` as unsupported
# https://github.com/pypa/pip/issues/13709 -> once this is fixed, we should bring `pip check` back.
uv pip check
}

# Simply install all other (non-apache-airflow) distributions placed in docker-context files
Expand Down
Loading