Merge "Use "upgrade-strategy eager" for pip install"

diff --git a/releasenotes/notes/python-dep-resolution-8122bc59b6ac886c.yaml b/releasenotes/notes/python-dep-resolution-8122bc59b6ac886c.yaml
new file mode 100644 (file)
index 0000000..cec7151
--- /dev/null
+++ b/releasenotes/notes/python-dep-resolution-8122bc59b6ac886c.yaml
@@ -0,0 +1,9 @@
+---
+fixes:
+  - |
+    Change pip's upgrade-strategy to "eager" for python-tools-install.sh.
+    Pip changed its default upgrade-strategy to "only-if-required", which
+    is not correctly upgrading requests (and potentially other packages
+    in the future) to meet other packages' requirements. This results in
+    errors in the build log. By using the upgrade-strategy "eager", pip
+    is able to properly install what is needed.

diff --git a/shell/python-tools-install.sh b/shell/python-tools-install.sh
index 1f5beec..660d5f2 100644 (file)
--- a/shell/python-tools-install.sh
+++ b/shell/python-tools-install.sh
@@ -56,6 +56,6 @@ EOF
     python3 -m venv ~/.local
     python3 -m pip install --user --quiet --upgrade pip
     python3 -m pip install --user --quiet --upgrade setuptools
-    python3 -m pip install --user --quiet --upgrade -r "$requirements_file"
+    python3 -m pip install --user --quiet --upgrade --upgrade-strategy eager -r "$requirements_file"
     rm -rf "$requirements_file"
 fi