Merge remote-tracking branch 'origin/master' into ci

commaai · Jul 5, 2024 · fcc644c · fcc644c
2 parents 3445286 + ebc6887
commit fcc644c
Show file tree

Hide file tree

Showing 4 changed files with 1,194 additions and 1,281 deletions.
diff --git a/userspace/files/profile b/userspace/files/profile
@@ -33,7 +33,7 @@ export QT_QPA_PLATFORM="wayland-egl"
 # python setup
 export PYTHONPATH="/data/pythonpath"
 export PATH="/usr/local/pyenv/bin:$PATH"
-export PYENV_VERSION="3.12.3"
+export PYENV_VERSION="3.11.4"
 export PYENV_ROOT="/usr/local/pyenv"
 
 # output of "pyenv init - --no-rehash"

diff --git a/userspace/openpilot_python_dependencies.sh b/userspace/openpilot_python_dependencies.sh
@@ -8,11 +8,11 @@ curl https://pyenv.run | bash
 export PATH="$PYENV_ROOT/bin:$PATH"
 eval "$(pyenv init -)"
 
-PYTHON_VERSION="3.12.3"
+PYTHON_VERSION="3.11.4"
 if [ "$(uname -p)" == "aarch64" ]; then
   pyenv install --verbose $PYTHON_VERSION
 else
-  MAKEFLAGS="-j16" MAKE_OPTS="-j16" pyenv install --verbose $PYTHON_VERSION
+  MAKEFLAGS="-j1" MAKE_OPTS="-j1" taskset --cpu-list 0 pyenv install --verbose $PYTHON_VERSION
 fi
 
 echo "Setting global python version"