prereqs: Stop depending on python2 This removes all traces of python2 from the install list, and migrates all of the packages we previously had in the python2 list to python3 and installs all of them with pip3. Change-Id: I3d5896fb07531c5317bd7acb46419b460b4da6af
diff --git a/install-prereqs.sh b/install-prereqs.sh index a920904..cd2206b 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 @@ -140,11 +136,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