Merge "prereqs: Stop depending on python2"
diff --git a/install-prereqs.sh b/install-prereqs.sh
index 11cb656..9491e84 100755
--- a/install-prereqs.sh
+++ b/install-prereqs.sh
@@ -63,7 +63,6 @@
perl
protobuf-compiler
pv
- python-dev
python3-protobuf
python3
python3-dev
@@ -85,28 +84,25 @@
zlib1g-dev
)
-PYTHON_PACKAGES=(
+PYTHON3_PACKAGES=(
camkes-deps
- sel4-deps
- setuptools
- robotframework==4.0.1
- netifaces
- pandas
- psutil
- pyyaml
hjson
mako
matplotlib
+ meson==0.54.0
+ netifaces
+ pandas
+ psutil
+ pyfzf
+ pyyaml
requests
+ robotframework==4.0.1
+ sel4-deps
+ setuptools
tempita
wget
)
-PYTHON3_PACKAGES=(
- meson==0.54.0
- pyfzf
-)
-
function die {
[[ ! -z "$@" ]] && echo "$@"
exit 1
@@ -141,11 +137,6 @@
die
fi
- for package in "${PYTHON_PACKAGES[@]}"; do
- try pip install "${package}"
- try pip3 install "${package}"
- done
-
for package in "${PYTHON3_PACKAGES[@]}"; do
try pip3 install "${package}"
done