This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch v3-1-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/v3-1-test by this push:
new f1e9b0bc45b [v3-1-test] Switch to `pip check` compliant pagefind
(#59816) (#59836)
f1e9b0bc45b is described below
commit f1e9b0bc45bdf48119205d7cc96836bdcbf226b4
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Dec 26 23:42:04 2025 +0100
[v3-1-test] Switch to `pip check` compliant pagefind (#59816) (#59836)
The pagefind before 1.5.0 had multiple tags published in a way
that broke `pip check`.
This has been tracked in https://github.com/pypa/pip/issues/13709
(cherry picked from commit 2a9b4cf66e32a7ffb19c08d8b318e7403dc0e940)
Co-authored-by: Jarek Potiuk <[email protected]>
---
Dockerfile | 28 +++++------------
Dockerfile.ci | 35 +++++++---------------
devel-common/pyproject.toml | 5 +++-
scripts/docker/entrypoint_ci.sh | 14 +++------
scripts/docker/install_additional_dependencies.sh | 14 +++------
.../docker/install_airflow_when_building_images.sh | 7 ++---
.../docker/install_from_docker_context_files.sh | 7 ++---
7 files changed, 34 insertions(+), 76 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index 69a2788f290..9877120ab58 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -998,11 +998,8 @@ function
install_airflow_and_providers_from_docker_context_files(){
"${install_airflow_distribution[@]}"
"${install_airflow_core_distribution[@]}" "${airflow_distributions[@]}"
set +x
common::install_packaging_tools
- # 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
+ # We use pip check here to make sure that whatever `uv` installs, is also
"correct" according to `pip`
+ pip check
}
function install_all_other_distributions_from_docker_context_files() {
@@ -1241,11 +1238,8 @@ function install_airflow_when_building_images() {
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
+ # We use pip check here to make sure that whatever `uv` installs, is also
"correct" according to `pip`
+ pip check
}
common::get_colors
@@ -1280,11 +1274,8 @@ function install_additional_dependencies() {
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
+ # We use pip check here to make sure that whatever `uv` installs, is
also "correct" according to `pip`
+ pip check
else
echo
echo "${COLOR_BLUE}Installing additional dependencies upgrading only
if needed${COLOR_RESET}"
@@ -1298,11 +1289,8 @@ function install_additional_dependencies() {
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
+ # We use pip check here to make sure that whatever `uv` installs, is
also "correct" according to `pip`
+ pip check
fi
}
diff --git a/Dockerfile.ci b/Dockerfile.ci
index b32aaefc9f3..6223b0a2835 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -991,11 +991,8 @@ function install_airflow_when_building_images() {
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
+ # We use pip check here to make sure that whatever `uv` installs, is also
"correct" according to `pip`
+ pip check
}
common::get_colors
@@ -1030,11 +1027,8 @@ function install_additional_dependencies() {
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
+ # We use pip check here to make sure that whatever `uv` installs, is
also "correct" according to `pip`
+ pip check
else
echo
echo "${COLOR_BLUE}Installing additional dependencies upgrading only
if needed${COLOR_RESET}"
@@ -1048,11 +1042,8 @@ function install_additional_dependencies() {
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
+ # We use pip check here to make sure that whatever `uv` installs, is
also "correct" according to `pip`
+ pip check
fi
}
@@ -1371,11 +1362,8 @@ function check_downgrade_sqlalchemy() {
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
+ # We use pip check here to make sure that whatever `uv` installs, is also
"correct" according to `pip`
+ pip check
}
function check_downgrade_pendulum() {
@@ -1392,11 +1380,8 @@ function check_downgrade_pendulum() {
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
+ # We use pip check here to make sure that whatever `uv` installs, is also
"correct" according to `pip`
+ pip check
}
function check_run_tests() {
diff --git a/devel-common/pyproject.toml b/devel-common/pyproject.toml
index 80cb849b4a5..02d82050a3b 100644
--- a/devel-common/pyproject.toml
+++ b/devel-common/pyproject.toml
@@ -76,7 +76,10 @@ dependencies = [
"rich-click>=1.7.1",
"click>=8.1.8",
"docutils>=0.21",
- "pagefind[bin]",
+ # TODO: replace with "pagefind[bin]>=1.5.0" when released - you need to
have "release" version to get
+ # the new pagefind-bin installed
+ "pagefind>=1.5.0a3",
+ "pagefind-bin>=1.5.0a3",
"sphinx-airflow-theme@https://github.com/apache/airflow-site/releases/download/0.3.0/sphinx_airflow_theme-0.3.0-py3-none-any.whl";,
"sphinx-argparse>=0.4.0",
"sphinx-autoapi>=3",
diff --git a/scripts/docker/entrypoint_ci.sh b/scripts/docker/entrypoint_ci.sh
index ab339400aea..cd0b3edfc05 100755
--- a/scripts/docker/entrypoint_ci.sh
+++ b/scripts/docker/entrypoint_ci.sh
@@ -340,11 +340,8 @@ function check_downgrade_sqlalchemy() {
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
+ # We use pip check here to make sure that whatever `uv` installs, is also
"correct" according to `pip`
+ pip check
}
# Download minimum supported version of pendulum to run tests with it
@@ -362,11 +359,8 @@ function check_downgrade_pendulum() {
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
+ # We use pip check here to make sure that whatever `uv` installs, is also
"correct" according to `pip`
+ pip check
}
# Check if we should run tests and run them if needed
diff --git a/scripts/docker/install_additional_dependencies.sh
b/scripts/docker/install_additional_dependencies.sh
index 09455f2b8d2..5b59e9ecb63 100644
--- a/scripts/docker/install_additional_dependencies.sh
+++ b/scripts/docker/install_additional_dependencies.sh
@@ -38,11 +38,8 @@ function install_additional_dependencies() {
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
+ # We use pip check here to make sure that whatever `uv` installs, is
also "correct" according to `pip`
+ pip check
else
echo
echo "${COLOR_BLUE}Installing additional dependencies upgrading only
if needed${COLOR_RESET}"
@@ -56,11 +53,8 @@ function install_additional_dependencies() {
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
+ # We use pip check here to make sure that whatever `uv` installs, is
also "correct" according to `pip`
+ pip check
fi
}
diff --git a/scripts/docker/install_airflow_when_building_images.sh
b/scripts/docker/install_airflow_when_building_images.sh
index 4eab54aa20d..69829099d6f 100644
--- a/scripts/docker/install_airflow_when_building_images.sh
+++ b/scripts/docker/install_airflow_when_building_images.sh
@@ -202,11 +202,8 @@ function install_airflow_when_building_images() {
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
+ # We use pip check here to make sure that whatever `uv` installs, is also
"correct" according to `pip`
+ pip check
}
common::get_colors
diff --git a/scripts/docker/install_from_docker_context_files.sh
b/scripts/docker/install_from_docker_context_files.sh
index dad7477f6ee..987582f35b6 100644
--- a/scripts/docker/install_from_docker_context_files.sh
+++ b/scripts/docker/install_from_docker_context_files.sh
@@ -122,11 +122,8 @@ function
install_airflow_and_providers_from_docker_context_files(){
"${install_airflow_distribution[@]}"
"${install_airflow_core_distribution[@]}" "${airflow_distributions[@]}"
set +x
common::install_packaging_tools
- # 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
+ # We use pip check here to make sure that whatever `uv` installs, is also
"correct" according to `pip`
+ pip check
}
# Simply install all other (non-apache-airflow) distributions placed in
docker-context files
