pyenv to uv based python and venv

Dockerfile.agnos

@@ -42,9 +42,6 @@ FROM agnos-base AS agnos-compiler
 RUN apt-fast update && apt-fast install --no-install-recommends -yq checkinstall
 
 # Individual compiling images
-FROM agnos-compiler AS agnos-compiler-pyqt5
-COPY ./userspace/compile-pyqt5.sh /tmp/agnos/
-RUN /tmp/agnos/compile-pyqt5.sh
 
 FROM agnos-compiler AS agnos-compiler-capnp
 COPY ./userspace/compile-capnp.sh /tmp/agnos/
@@ -83,29 +80,34 @@ RUN cd /tmp && apt-get -o Dpkg::Options::="--force-overwrite" install -yq ./capn
 COPY --from=agnos-compiler-ffmpeg /tmp/ffmpeg.deb /tmp/ffmpeg.deb
 RUN cd /tmp && apt-get -o Dpkg::Options::="--force-overwrite" install -yq ./ffmpeg.deb
 
-# Use pre-compiled PyQt5 wheel
-COPY --from=agnos-compiler-pyqt5 /tmp/PyQt5-5.15.9/PyQt5-5.15.9-cp38-abi3-manylinux_2_17_aarch64.whl /tmp/PyQt5-5.15.9-cp38-abi3-manylinux_2_17_aarch64.whl
+ARG XDG_DATA_HOME="/usr/local"
+ARG PATH="$XDG_DATA_HOME/.cargo/bin:$PATH"
+ARG rebuildpyqt5=0
 
-RUN export PATH="/usr/local/pyenv/bin:/usr/local/pyenv/shims:$PATH" && \
-    export PYENV_ROOT="/usr/local/pyenv" && \
-    eval "$(pyenv init -)" && \
-    eval "$(pyenv virtualenv-init -)" && \
-    export MAKEFLAGS="-j$(nproc)" && \
-    pip install pyqt5-sip==12.12.1 && \
-    pip install /tmp/PyQt5-5.15.9-cp38-abi3-manylinux_2_17_aarch64.whl --verbose --config-settings --confirm-license= && \
-    pyenv rehash
+COPY ./userspace/files/PyQt5-5.15.9-cp38-abi3-manylinux_2_17_aarch64.whl /tmp/agnos/
+RUN export MAKEFLAGS="-j$(nproc)" && \
+    source $XDG_DATA_HOME/venv/bin/activate && \
+    uv pip install pyqt5-sip==12.12.1 && \
+    if [ "$rebuildpyqt5" -eq "0" ]; then \
+        uv pip install /tmp/agnos/PyQt5-5.15.9-cp38-abi3-manylinux_2_17_aarch64.whl; \
+    else \
+        pip wheel pyqt5==5.15.9 --verbose --config-settings --confirm-license=; \
+    fi
 
 # Install openpilot python packages
 RUN mkdir -p /tmp/agnos/uv
 COPY ./userspace/pyproject.toml ./userspace/uv.lock /tmp/agnos/uv
-RUN export PATH="/usr/local/pyenv/bin:/usr/local/pyenv/shims:$PATH" && \
-    export PYENV_ROOT="/usr/local/pyenv" && \
-    eval "$(pyenv init -)" && \
-    eval "$(pyenv virtualenv-init -)" && \
+RUN source $XDG_DATA_HOME/venv/bin/activate && \
     cd /tmp/agnos/uv && \
-    export PYOPENCL_CL_PRETEND_VERSION="2.0" && \
-    MAKEFLAGS="-j$(nproc)" UV_NO_CACHE=1 uv pip install --no-cache-dir --system . && \
-    pyenv rehash
+    export PYOPENCL_CL_PRETEND_VERSION="2.0" && \    
+    pc="$(python -c "import sysconfig;print(sysconfig.get_config_vars('installed_base')[0])")" && \
+    pcpath=$pc"/lib/pkgconfig" && \
+    export PKG_CONFIG_PATH="$pcpath:$PKG_CONFIG_PATH" && \
+    pypcpath=$pcpath"/python-3.12.pc" && \
+    sed -i 's|prefix=/install|prefix='$pc'|' $pypcpath && \
+    pypcpathembed=$pcpath"/python-3.12-embed.pc" && \
+    sed -i 's|prefix=/install|prefix='$pc'|' $pypcpathembed && \
+    MAKEFLAGS="-j$(nproc)" UV_NO_CACHE=1 uv pip install --no-cache-dir . 
 
 # Install nice to haves
 COPY ./userspace/install_extras.sh /tmp/agnos/

userspace/files/brightnessd.service

@@ -3,7 +3,7 @@ Description=Limit display brightness with uptime
 
 [Service]
 Restart=on-failure
-ExecStart=/usr/local/pyenv/shims/python -u /usr/comma/brightnessd.py
+ExecStart=/usr/local/venv/bin/python -u /usr/comma/brightnessd.py
 
 [Install]
 WantedBy=multi-user.target

userspace/files/phantom_touch_logger.service

@@ -4,7 +4,7 @@ After=multi-user.target
 [Service]
 User=comma
 Restart=no
-ExecStart=/usr/local/pyenv/shims/python -u /usr/comma/phantom_touch_logger.py
+ExecStart=/usr/local/venv/bin/python -u /usr/comma/phantom_touch_logger.py
 
 [Install]
 WantedBy=multi-user.target

userspace/files/power_drop_monitor.service

@@ -3,7 +3,7 @@ After=multi-user.target
 
 [Service]
 Restart=always
-ExecStart=/usr/local/pyenv/shims/python -u /usr/comma/power_drop_monitor.py
+ExecStart=/usr/local/venv/bin/python -u /usr/comma/power_drop_monitor.py
 
 [Install]
 WantedBy=multi-user.target

userspace/files/profile

@@ -32,32 +32,9 @@ export QT_QPA_PLATFORM="wayland-egl"
 
 # python setup
 export PYTHONPATH="/data/pythonpath"
-export PATH="/usr/local/pyenv/bin:$PATH"
-export PYENV_VERSION="3.11.4"
-export PYENV_ROOT="/usr/local/pyenv"
-
-# output of "pyenv init - --no-rehash"
-export PATH="/usr/local/pyenv/shims:${PATH}"
-export PYENV_SHELL=bash
-source '/usr/local/pyenv/libexec/../completions/pyenv.bash'
-pyenv() {
-  local command
-  command="${1:-}"
-  if [ "$#" -gt 0 ]; then
-    shift
-  fi
-
-  case "$command" in
-  activate|deactivate|rehash|shell)
-    eval "$(pyenv "sh-$command" "$@")";;
-  *)
-    command pyenv "$command" "$@";;
-  esac
-}
-
-# custom shims
-export PATH="/usr/comma/shims:${PATH}"
 
+export PATH="/usr/local/.cargo/bin:$PATH"
+source /usr/local/venv/bin/activate
 
 # nice AT command helper
 atc() {

userspace/openpilot_python_dependencies.sh

@@ -1,21 +1,14 @@
 #!/bin/bash -e
 
-echo "Installing python for openpilot"
+echo "installing uv..."
 
-# Install pyenv
-export PYENV_ROOT="/usr/local/pyenv"
-curl https://pyenv.run | bash
-export PATH="$PYENV_ROOT/bin:$PATH"
-eval "$(pyenv init -)"
+export XDG_DATA_HOME="/usr/local"
+export CARGO_HOME="$XDG_DATA_HOME/.cargo"
 
-PYTHON_VERSION="3.11.4"
-if [ "$(uname -p)" == "aarch64" ]; then
-  pyenv install --verbose $PYTHON_VERSION
-else
-  MAKEFLAGS="-j1" MAKE_OPTS="-j1" taskset --cpu-list 0 pyenv install --verbose $PYTHON_VERSION
-fi
+curl -LsSf https://astral.sh/uv/install.sh | sh
+eval ". $CARGO_HOME/env"
 
-echo "Setting global python version"
-pyenv global $PYTHON_VERSION
+PYTHON_VERSION="3.12.3"
 
-pip3 install --no-cache-dir --upgrade pip uv
+# uv requires virtual env either managed or system before installing dependencies
+uv venv $XDG_DATA_HOME/venv --seed --python-preference only-managed --python=$PYTHON_VERSION

userspace/usr/comma/shims/pip

@@ -1,6 +1,6 @@
 #!/usr/bin/bash
 
-PIP_PATH=/usr/local/pyenv/shims/pip
+PIP_PATH=/usr/local/venv/bin/pip
 export TMPDIR=/tmp/pip-tmp
 
 # setup large tmp for install

userspace/usr/comma/sound/sound_init.sh

@@ -16,4 +16,4 @@ echo "sound card online"
 /usr/comma/sound/tinymix set "TERT_MI2S_TX Channels" Two
 
 # setup the amplifier registers
-/usr/local/pyenv/shims/python /usr/comma/sound/amplifier.py
+/usr/local/venv/bin/python /usr/comma/sound/amplifier.py