From 4a649608e964f4a0f9cc7db457f2e1785edd2c4a Mon Sep 17 00:00:00 2001
From: Peter Barker <pbarker@barker.dropbear.id.au>
Date: Tue, 28 Jan 2025 14:46:03 +1100
Subject: [PATCH] Tools: use python3 -m pip to install Python packages

---
 Tools/AP_Periph/wscript                                |  4 ++--
 Tools/environment_install/install-prereqs-arch.sh      |  2 +-
 Tools/environment_install/install-prereqs-mac.sh       |  2 +-
 .../install-prereqs-openSUSE-Tumbleweed.sh             |  4 ++--
 Tools/ros2/README.md                                   |  2 +-
 Tools/scripts/configure-ci.sh                          | 10 +++++-----
 Tools/scripts/esp32_get_idf.sh                         |  6 +++---
 Tools/scripts/size_compare_branches.py                 |  2 +-
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Tools/AP_Periph/wscript b/Tools/AP_Periph/wscript
index 0d275bdf80a8d..e5504b2b43419 100644
--- a/Tools/AP_Periph/wscript
+++ b/Tools/AP_Periph/wscript
@@ -7,13 +7,13 @@ import sys
 try:
     import em
 except ImportError:
-    print("you need to install empy with 'python -m pip install empy==3.3.4'")
+    print("you need to install empy with 'python3 -m pip install empy==3.3.4'")
     sys.exit(1)
 
 try:
     import pexpect
 except ImportError:
-    print("you need to install pexpect with 'python -m pip install pexpect'")
+    print("you need to install pexpect with 'python3 -m pip install pexpect'")
     sys.exit(1)
     
 
diff --git a/Tools/environment_install/install-prereqs-arch.sh b/Tools/environment_install/install-prereqs-arch.sh
index 6abdb7f5926b8..93f5893bed28c 100755
--- a/Tools/environment_install/install-prereqs-arch.sh
+++ b/Tools/environment_install/install-prereqs-arch.sh
@@ -71,7 +71,7 @@ else
     echo "Please use \`$SOURCE_LINE\` to activate the ArduPilot venv"
 fi
 
-pip3 -q install -U $PYTHON_PKGS
+python3 -m pip -q install -U $PYTHON_PKGS
 
 (
     cd /usr/lib/ccache
diff --git a/Tools/environment_install/install-prereqs-mac.sh b/Tools/environment_install/install-prereqs-mac.sh
index 0703782d2e5b3..c665574f61d2e 100755
--- a/Tools/environment_install/install-prereqs-mac.sh
+++ b/Tools/environment_install/install-prereqs-mac.sh
@@ -108,7 +108,7 @@ find /usr/local/bin -lname '*/Library/Frameworks/Python.framework/*' -delete
 brew update
 brew install --force --overwrite gawk coreutils wget
 
-PIP=pip
+PIP="python3 -m pip"
 if maybe_prompt_user "Install python using pyenv [N/y]?" ; then
     echo "Checking pyenv..."
     {
diff --git a/Tools/environment_install/install-prereqs-openSUSE-Tumbleweed.sh b/Tools/environment_install/install-prereqs-openSUSE-Tumbleweed.sh
index c1280fef1bd51..3663a35083288 100755
--- a/Tools/environment_install/install-prereqs-openSUSE-Tumbleweed.sh
+++ b/Tools/environment_install/install-prereqs-openSUSE-Tumbleweed.sh
@@ -35,9 +35,9 @@ ZYPPER="sudo zypper in --no-recommends"
 if $ASSUME_YES; then
     ZYPPER="sudo zypper in -y --no-recommends"
 fi
-PIP3=pip3
+PIP3="python3 -m pip"
 if $QUIET; then
-    PIP3="pip3 -q"
+    PIP3="$PIP3 -q"
 fi
 
 function package_is_installed() {
diff --git a/Tools/ros2/README.md b/Tools/ros2/README.md
index 4fd2e6e6bf8f5..bbf16475d6361 100644
--- a/Tools/ros2/README.md
+++ b/Tools/ros2/README.md
@@ -191,7 +191,7 @@ install MAVProxy if it is not available on the container.
 
 
 ```bash
-pip install -U MAVProxy
+python3 -m pip install -U MAVProxy
 ```
 
 
diff --git a/Tools/scripts/configure-ci.sh b/Tools/scripts/configure-ci.sh
index 207ee51959d9f..99ae8c780f1af 100755
--- a/Tools/scripts/configure-ci.sh
+++ b/Tools/scripts/configure-ci.sh
@@ -97,8 +97,8 @@ fi
 
 . ~/.profile
 
-python -m pip install --progress-bar off --user -U argparse pyserial pexpect future lxml
-python -m pip install --progress-bar off --user -U intelhex
-python -m pip install --progress-bar off --user -U numpy
-python -m pip install --progress-bar off --user -U edn_format
-python -m pip install --progress-bar off --user -U empy==3.3.4
+python3 -m pip install --progress-bar off --user -U argparse pyserial pexpect future lxml
+python3 -m pip install --progress-bar off --user -U intelhex
+python3 -m pip install --progress-bar off --user -U numpy
+python3 -m pip install --progress-bar off --user -U edn_format
+python3 -m pip install --progress-bar off --user -U empy==3.3.4
diff --git a/Tools/scripts/esp32_get_idf.sh b/Tools/scripts/esp32_get_idf.sh
index a7ec191701677..0b756f1063f44 100755
--- a/Tools/scripts/esp32_get_idf.sh
+++ b/Tools/scripts/esp32_get_idf.sh
@@ -58,9 +58,9 @@ git submodule update --init --recursive
 
 echo
 echo "installing missing python modules"
-python -m pip install empy==3.3.4
-python -m pip install pexpect
-python -m pip install future
+python3 -m pip install empy==3.3.4
+python3 -m pip install pexpect
+python3 -m pip install future
 
 cd ../..
 
diff --git a/Tools/scripts/size_compare_branches.py b/Tools/scripts/size_compare_branches.py
index 53f5361da370f..b52e49f2991ae 100755
--- a/Tools/scripts/size_compare_branches.py
+++ b/Tools/scripts/size_compare_branches.py
@@ -5,7 +5,7 @@
 to create a html report comparing an ArduPilot build across two
 branches
 
-pip3 install --user elf_diff weasyprint
+python3 -m pip install --user elf_diff weasyprint
 
 AP_FLAKE8_CLEAN