Skip to content

Commit 2a9b4cf

Browse files
authored
Switch to pip check compliant pagefind (#59816)
The pagefind before 1.5.0 had multiple tags published in a way that broke `pip check`. This has been tracked in pypa/pip#13709
1 parent e9c2a6f commit 2a9b4cf

File tree

7 files changed

+34
-76
lines changed

7 files changed

+34
-76
lines changed

Dockerfile

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -997,11 +997,8 @@ function install_airflow_and_providers_from_docker_context_files(){
997997
"${install_airflow_distribution[@]}" "${install_airflow_core_distribution[@]}" "${airflow_distributions[@]}"
998998
set +x
999999
common::install_packaging_tools
1000-
# Here we should use `pip check` not `uv pip check` to detect any incompatibilities that might happen
1001-
# between `pip` and `uv` installations
1002-
# However, in the current version of `pip` there is a bug that incorrectly detects `pagefind-bin` as unsupported
1003-
# https://github.com/pypa/pip/issues/13709 -> once this is fixed, we should bring `pip check` back.
1004-
uv pip check
1000+
# We use pip check here to make sure that whatever `uv` installs, is also "correct" according to `pip`
1001+
pip check
10051002
}
10061003

10071004
function install_all_other_distributions_from_docker_context_files() {
@@ -1241,11 +1238,8 @@ function install_airflow_when_building_images() {
12411238
echo
12421239
echo "${COLOR_BLUE}Running 'pip check'${COLOR_RESET}"
12431240
echo
1244-
# Here we should use `pip check` not `uv pip check` to detect any incompatibilities that might happen
1245-
# between `pip` and `uv` installations
1246-
# However, in the current version of `pip` there is a bug that incorrectly detects `pagefind-bin` as unsupported
1247-
# https://github.com/pypa/pip/issues/13709 -> once this is fixed, we should bring `pip check` back.
1248-
uv pip check
1241+
# We use pip check here to make sure that whatever `uv` installs, is also "correct" according to `pip`
1242+
pip check
12491243
}
12501244

12511245
common::get_colors
@@ -1280,11 +1274,8 @@ function install_additional_dependencies() {
12801274
echo
12811275
echo "${COLOR_BLUE}Running 'pip check'${COLOR_RESET}"
12821276
echo
1283-
# Here we should use `pip check` not `uv pip check` to detect any incompatibilities that might happen
1284-
# between `pip` and `uv` installations
1285-
# However, in the current version of `pip` there is a bug that incorrectly detects `pagefind-bin` as unsupported
1286-
# https://github.com/pypa/pip/issues/13709 -> once this is fixed, we should bring `pip check` back.
1287-
uv pip check
1277+
# We use pip check here to make sure that whatever `uv` installs, is also "correct" according to `pip`
1278+
pip check
12881279
else
12891280
echo
12901281
echo "${COLOR_BLUE}Installing additional dependencies upgrading only if needed${COLOR_RESET}"
@@ -1298,11 +1289,8 @@ function install_additional_dependencies() {
12981289
echo
12991290
echo "${COLOR_BLUE}Running 'pip check'${COLOR_RESET}"
13001291
echo
1301-
# Here we should use `pip check` not `uv pip check` to detect any incompatibilities that might happen
1302-
# between `pip` and `uv` installations
1303-
# However, in the current version of `pip` there is a bug that incorrectly detects `pagefind-bin` as unsupported
1304-
# https://github.com/pypa/pip/issues/13709 -> once this is fixed, we should bring `pip check` back.
1305-
uv pip check
1292+
# We use pip check here to make sure that whatever `uv` installs, is also "correct" according to `pip`
1293+
pip check
13061294
fi
13071295
}
13081296

Dockerfile.ci

Lines changed: 10 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -990,11 +990,8 @@ function install_airflow_when_building_images() {
990990
echo
991991
echo "${COLOR_BLUE}Running 'pip check'${COLOR_RESET}"
992992
echo
993-
# Here we should use `pip check` not `uv pip check` to detect any incompatibilities that might happen
994-
# between `pip` and `uv` installations
995-
# However, in the current version of `pip` there is a bug that incorrectly detects `pagefind-bin` as unsupported
996-
# https://github.com/pypa/pip/issues/13709 -> once this is fixed, we should bring `pip check` back.
997-
uv pip check
993+
# We use pip check here to make sure that whatever `uv` installs, is also "correct" according to `pip`
994+
pip check
998995
}
999996

1000997
common::get_colors
@@ -1029,11 +1026,8 @@ function install_additional_dependencies() {
10291026
echo
10301027
echo "${COLOR_BLUE}Running 'pip check'${COLOR_RESET}"
10311028
echo
1032-
# Here we should use `pip check` not `uv pip check` to detect any incompatibilities that might happen
1033-
# between `pip` and `uv` installations
1034-
# However, in the current version of `pip` there is a bug that incorrectly detects `pagefind-bin` as unsupported
1035-
# https://github.com/pypa/pip/issues/13709 -> once this is fixed, we should bring `pip check` back.
1036-
uv pip check
1029+
# We use pip check here to make sure that whatever `uv` installs, is also "correct" according to `pip`
1030+
pip check
10371031
else
10381032
echo
10391033
echo "${COLOR_BLUE}Installing additional dependencies upgrading only if needed${COLOR_RESET}"
@@ -1047,11 +1041,8 @@ function install_additional_dependencies() {
10471041
echo
10481042
echo "${COLOR_BLUE}Running 'pip check'${COLOR_RESET}"
10491043
echo
1050-
# Here we should use `pip check` not `uv pip check` to detect any incompatibilities that might happen
1051-
# between `pip` and `uv` installations
1052-
# However, in the current version of `pip` there is a bug that incorrectly detects `pagefind-bin` as unsupported
1053-
# https://github.com/pypa/pip/issues/13709 -> once this is fixed, we should bring `pip check` back.
1054-
uv pip check
1044+
# We use pip check here to make sure that whatever `uv` installs, is also "correct" according to `pip`
1045+
pip check
10551046
fi
10561047
}
10571048

@@ -1370,11 +1361,8 @@ function check_downgrade_sqlalchemy() {
13701361
echo
13711362
echo "${COLOR_BLUE}Running 'pip check'${COLOR_RESET}"
13721363
echo
1373-
# Here we should use `pip check` not `uv pip check` to detect any incompatibilities that might happen
1374-
# between `pip` and `uv` installations
1375-
# However, in the current version of `pip` there is a bug that incorrectly detects `pagefind-bin` as unsupported
1376-
# https://github.com/pypa/pip/issues/13709 -> once this is fixed, we should bring `pip check` back.
1377-
uv pip check
1364+
# We use pip check here to make sure that whatever `uv` installs, is also "correct" according to `pip`
1365+
pip check
13781366
}
13791367

13801368
function check_downgrade_pendulum() {
@@ -1391,11 +1379,8 @@ function check_downgrade_pendulum() {
13911379
echo
13921380
echo "${COLOR_BLUE}Running 'pip check'${COLOR_RESET}"
13931381
echo
1394-
# Here we should use `pip check` not `uv pip check` to detect any incompatibilities that might happen
1395-
# between `pip` and `uv` installations
1396-
# However, in the current version of `pip` there is a bug that incorrectly detects `pagefind-bin` as unsupported
1397-
# https://github.com/pypa/pip/issues/13709 -> once this is fixed, we should bring `pip check` back.
1398-
uv pip check
1382+
# We use pip check here to make sure that whatever `uv` installs, is also "correct" according to `pip`
1383+
pip check
13991384
}
14001385

14011386
function check_run_tests() {

devel-common/pyproject.toml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,10 @@ dependencies = [
7676
"rich-click>=1.7.1",
7777
"click>=8.1.8",
7878
"docutils>=0.21",
79-
"pagefind[bin]",
79+
# TODO: replace with "pagefind[bin]>=1.5.0" when released - you need to have "release" version to get
80+
# the new pagefind-bin installed
81+
"pagefind>=1.5.0a3",
82+
"pagefind-bin>=1.5.0a3",
8083
"sphinx-airflow-theme@https://github.com/apache/airflow-site/releases/download/0.3.0/sphinx_airflow_theme-0.3.0-py3-none-any.whl",
8184
"sphinx-argparse>=0.4.0",
8285
"sphinx-autoapi>=3",

scripts/docker/entrypoint_ci.sh

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -340,11 +340,8 @@ function check_downgrade_sqlalchemy() {
340340
echo
341341
echo "${COLOR_BLUE}Running 'pip check'${COLOR_RESET}"
342342
echo
343-
# Here we should use `pip check` not `uv pip check` to detect any incompatibilities that might happen
344-
# between `pip` and `uv` installations
345-
# However, in the current version of `pip` there is a bug that incorrectly detects `pagefind-bin` as unsupported
346-
# https://github.com/pypa/pip/issues/13709 -> once this is fixed, we should bring `pip check` back.
347-
uv pip check
343+
# We use pip check here to make sure that whatever `uv` installs, is also "correct" according to `pip`
344+
pip check
348345
}
349346

350347
# Download minimum supported version of pendulum to run tests with it
@@ -362,11 +359,8 @@ function check_downgrade_pendulum() {
362359
echo
363360
echo "${COLOR_BLUE}Running 'pip check'${COLOR_RESET}"
364361
echo
365-
# Here we should use `pip check` not `uv pip check` to detect any incompatibilities that might happen
366-
# between `pip` and `uv` installations
367-
# However, in the current version of `pip` there is a bug that incorrectly detects `pagefind-bin` as unsupported
368-
# https://github.com/pypa/pip/issues/13709 -> once this is fixed, we should bring `pip check` back.
369-
uv pip check
362+
# We use pip check here to make sure that whatever `uv` installs, is also "correct" according to `pip`
363+
pip check
370364
}
371365

372366
# Check if we should run tests and run them if needed

scripts/docker/install_additional_dependencies.sh

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,8 @@ function install_additional_dependencies() {
3838
echo
3939
echo "${COLOR_BLUE}Running 'pip check'${COLOR_RESET}"
4040
echo
41-
# Here we should use `pip check` not `uv pip check` to detect any incompatibilities that might happen
42-
# between `pip` and `uv` installations
43-
# However, in the current version of `pip` there is a bug that incorrectly detects `pagefind-bin` as unsupported
44-
# https://github.com/pypa/pip/issues/13709 -> once this is fixed, we should bring `pip check` back.
45-
uv pip check
41+
# We use pip check here to make sure that whatever `uv` installs, is also "correct" according to `pip`
42+
pip check
4643
else
4744
echo
4845
echo "${COLOR_BLUE}Installing additional dependencies upgrading only if needed${COLOR_RESET}"
@@ -56,11 +53,8 @@ function install_additional_dependencies() {
5653
echo
5754
echo "${COLOR_BLUE}Running 'pip check'${COLOR_RESET}"
5855
echo
59-
# Here we should use `pip check` not `uv pip check` to detect any incompatibilities that might happen
60-
# between `pip` and `uv` installations
61-
# However, in the current version of `pip` there is a bug that incorrectly detects `pagefind-bin` as unsupported
62-
# https://github.com/pypa/pip/issues/13709 -> once this is fixed, we should bring `pip check` back.
63-
uv pip check
56+
# We use pip check here to make sure that whatever `uv` installs, is also "correct" according to `pip`
57+
pip check
6458
fi
6559
}
6660

scripts/docker/install_airflow_when_building_images.sh

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -203,11 +203,8 @@ function install_airflow_when_building_images() {
203203
echo
204204
echo "${COLOR_BLUE}Running 'pip check'${COLOR_RESET}"
205205
echo
206-
# Here we should use `pip check` not `uv pip check` to detect any incompatibilities that might happen
207-
# between `pip` and `uv` installations
208-
# However, in the current version of `pip` there is a bug that incorrectly detects `pagefind-bin` as unsupported
209-
# https://github.com/pypa/pip/issues/13709 -> once this is fixed, we should bring `pip check` back.
210-
uv pip check
206+
# We use pip check here to make sure that whatever `uv` installs, is also "correct" according to `pip`
207+
pip check
211208
}
212209

213210
common::get_colors

scripts/docker/install_from_docker_context_files.sh

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -122,11 +122,8 @@ function install_airflow_and_providers_from_docker_context_files(){
122122
"${install_airflow_distribution[@]}" "${install_airflow_core_distribution[@]}" "${airflow_distributions[@]}"
123123
set +x
124124
common::install_packaging_tools
125-
# Here we should use `pip check` not `uv pip check` to detect any incompatibilities that might happen
126-
# between `pip` and `uv` installations
127-
# However, in the current version of `pip` there is a bug that incorrectly detects `pagefind-bin` as unsupported
128-
# https://github.com/pypa/pip/issues/13709 -> once this is fixed, we should bring `pip check` back.
129-
uv pip check
125+
# We use pip check here to make sure that whatever `uv` installs, is also "correct" according to `pip`
126+
pip check
130127
}
131128

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

0 commit comments

Comments
 (0)