From 1bacfa5445db5f69c72e0623422d5fef9a667269 Mon Sep 17 00:00:00 2001
From: Mateusz Neumann <mateumann@gmail.com>
Date: Mon, 8 Mar 2021 12:51:02 +0100
Subject: [PATCH 1/2] Update GET_PIP_URL

The bootstrap.pypa.io URLs for pip installation changed.
---
 plugins/python-build/bin/python-build | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build
index 650a6821..0ac8e669 100755
--- a/plugins/python-build/bin/python-build
+++ b/plugins/python-build/bin/python-build
@@ -2091,22 +2091,22 @@ if [ -z "${GET_PIP_URL}" ]; then
     # Use custom get-pip URL based on the target version (#1127)
     case "${DEFINITION_PATH##*/}" in
     2.6 | 2.6.* )
-      GET_PIP_URL="https://bootstrap.pypa.io/2.6/get-pip.py"
+      GET_PIP_URL="https://bootstrap.pypa.io/pip/2.6/get-pip.py"
       ;;
     2.7 | 2.7.* )
-      GET_PIP_URL="https://bootstrap.pypa.io/2.7/get-pip.py"
+      GET_PIP_URL="https://bootstrap.pypa.io/pip/2.7/get-pip.py"
       ;;
     3.2 | 3.2.* )
-      GET_PIP_URL="https://bootstrap.pypa.io/3.2/get-pip.py"
+      GET_PIP_URL="https://bootstrap.pypa.io/pip/3.2/get-pip.py"
       ;;
     3.3 | 3.3.* )
-      GET_PIP_URL="https://bootstrap.pypa.io/3.3/get-pip.py"
+      GET_PIP_URL="https://bootstrap.pypa.io/pip/3.3/get-pip.py"
       ;;
     3.4 | 3.4.* )
-      GET_PIP_URL="https://bootstrap.pypa.io/3.4/get-pip.py"
+      GET_PIP_URL="https://bootstrap.pypa.io/pip/3.4/get-pip.py"
       ;;
     3.5 | 3.5.* )
-      GET_PIP_URL="https://bootstrap.pypa.io/3.5/get-pip.py"
+      GET_PIP_URL="https://bootstrap.pypa.io/pip/3.5/get-pip.py"
       ;;
     * )
       GET_PIP_URL="https://bootstrap.pypa.io/get-pip.py"

From 3bdafde5bf6a450c3bcd1846568a8ba5b2f756d1 Mon Sep 17 00:00:00 2001
From: Mateusz Neumann <mateumann@gmail.com>
Date: Mon, 8 Mar 2021 13:02:52 +0100
Subject: [PATCH 2/2] Fix URLs in the tests

---
 plugins/python-build/test/pyenv_ext.bats | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/plugins/python-build/test/pyenv_ext.bats b/plugins/python-build/test/pyenv_ext.bats
index 5f6d5037..e5149003 100644
--- a/plugins/python-build/test/pyenv_ext.bats
+++ b/plugins/python-build/test/pyenv_ext.bats
@@ -360,7 +360,7 @@ OUT
   run_inline_definition_with_name --name=2.6 <<OUT
 echo "\${GET_PIP_URL}"
 OUT
-  assert_output "https://bootstrap.pypa.io/2.6/get-pip.py"
+  assert_output "https://bootstrap.pypa.io/pip/2.6/get-pip.py"
   assert_success
 }
 
@@ -368,7 +368,7 @@ OUT
   run_inline_definition_with_name --name=3.2 <<OUT
 echo "\${GET_PIP_URL}"
 OUT
-  assert_output "https://bootstrap.pypa.io/3.2/get-pip.py"
+  assert_output "https://bootstrap.pypa.io/pip/3.2/get-pip.py"
   assert_success
 }
 
@@ -376,6 +376,6 @@ OUT
   run_inline_definition_with_name --name=3.3 <<OUT
 echo "\${GET_PIP_URL}"
 OUT
-  assert_output "https://bootstrap.pypa.io/3.3/get-pip.py"
+  assert_output "https://bootstrap.pypa.io/pip/3.3/get-pip.py"
   assert_success
 }