Skip to content

Commit 6a9d3f9

Browse files
committed
Tools: use python3 -m pip to install Python packages
1 parent d7be789 commit 6a9d3f9

File tree

8 files changed

+16
-16
lines changed

8 files changed

+16
-16
lines changed

Tools/AP_Periph/wscript

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ import sys
77
try:
88
import em
99
except ImportError:
10-
print("you need to install empy with 'python -m pip install empy==3.3.4'")
10+
print("you need to install empy with 'python3 -m pip install empy==3.3.4'")
1111
sys.exit(1)
1212

1313
try:
1414
import pexpect
1515
except ImportError:
16-
print("you need to install pexpect with 'python -m pip install pexpect'")
16+
print("you need to install pexpect with 'python3 -m pip install pexpect'")
1717
sys.exit(1)
1818

1919

Tools/environment_install/install-prereqs-arch.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ else
7171
echo "Please use \`$SOURCE_LINE\` to activate the ArduPilot venv"
7272
fi
7373

74-
pip3 -q install -U $PYTHON_PKGS
74+
python3 -m pip -q install -U $PYTHON_PKGS
7575

7676
(
7777
cd /usr/lib/ccache

Tools/environment_install/install-prereqs-mac.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ find /usr/local/bin -lname '*/Library/Frameworks/Python.framework/*' -delete
108108
brew update
109109
brew install --force --overwrite gawk coreutils wget
110110

111-
PIP=pip
111+
PIP="python3 -m pip"
112112
if maybe_prompt_user "Install python using pyenv [N/y]?" ; then
113113
echo "Checking pyenv..."
114114
{

Tools/environment_install/install-prereqs-openSUSE-Tumbleweed.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ ZYPPER="sudo zypper in --no-recommends"
3535
if $ASSUME_YES; then
3636
ZYPPER="sudo zypper in -y --no-recommends"
3737
fi
38-
PIP3=pip3
38+
PIP3="python3 -m pip"
3939
if $QUIET; then
40-
PIP3="pip3 -q"
40+
PIP3="$PIP3 -q"
4141
fi
4242

4343
function package_is_installed() {

Tools/ros2/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ install MAVProxy if it is not available on the container.
191191

192192

193193
```bash
194-
pip install -U MAVProxy
194+
python3 -m pip install -U MAVProxy
195195
```
196196

197197

Tools/scripts/configure-ci.sh

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ fi
9797

9898
. ~/.profile
9999

100-
python -m pip install --progress-bar off --user -U argparse pyserial pexpect future lxml
101-
python -m pip install --progress-bar off --user -U intelhex
102-
python -m pip install --progress-bar off --user -U numpy
103-
python -m pip install --progress-bar off --user -U edn_format
104-
python -m pip install --progress-bar off --user -U empy==3.3.4
100+
python3 -m pip install --progress-bar off --user -U argparse pyserial pexpect future lxml
101+
python3 -m pip install --progress-bar off --user -U intelhex
102+
python3 -m pip install --progress-bar off --user -U numpy
103+
python3 -m pip install --progress-bar off --user -U edn_format
104+
python3 -m pip install --progress-bar off --user -U empy==3.3.4

Tools/scripts/esp32_get_idf.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ git submodule update --init --recursive
5858

5959
echo
6060
echo "installing missing python modules"
61-
python -m pip install empy==3.3.4
62-
python -m pip install pexpect
63-
python -m pip install future
61+
python3 -m pip install empy==3.3.4
62+
python3 -m pip install pexpect
63+
python3 -m pip install future
6464

6565
cd ../..
6666

Tools/scripts/size_compare_branches.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
to create a html report comparing an ArduPilot build across two
66
branches
77
8-
pip3 install --user elf_diff weasyprint
8+
python3 -m pip install --user elf_diff weasyprint
99
1010
AP_FLAKE8_CLEAN
1111

0 commit comments

Comments
 (0)