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

Dockerfile.openpilot

@@ -8,23 +8,6 @@ ENV PYTHONPATH ${OPENPILOT_PATH}:${PYTHONPATH}
 RUN mkdir -p ${OPENPILOT_PATH}
 WORKDIR ${OPENPILOT_PATH}
 
-COPY SConstruct ${OPENPILOT_PATH}
-
-COPY ./openpilot ${OPENPILOT_PATH}/openpilot
-COPY ./third_party ${OPENPILOT_PATH}/third_party
-COPY ./site_scons ${OPENPILOT_PATH}/site_scons
-COPY ./rednose ${OPENPILOT_PATH}/rednose
-COPY ./rednose_repo/site_scons ${OPENPILOT_PATH}/rednose_repo/site_scons
-COPY ./tools ${OPENPILOT_PATH}/tools
-COPY ./release ${OPENPILOT_PATH}/release
-COPY ./common ${OPENPILOT_PATH}/common
-COPY ./opendbc ${OPENPILOT_PATH}/opendbc
-COPY ./cereal ${OPENPILOT_PATH}/cereal
-COPY ./msgq_repo ${OPENPILOT_PATH}/msgq_repo
-COPY ./msgq ${OPENPILOT_PATH}/msgq
-COPY ./panda ${OPENPILOT_PATH}/panda
-COPY ./selfdrive ${OPENPILOT_PATH}/selfdrive
-COPY ./system ${OPENPILOT_PATH}/system
-COPY ./body ${OPENPILOT_PATH}/body
+COPY . ${OPENPILOT_PATH}/
 
 RUN scons --cache-readonly -j$(nproc)

tools/install_python_dependencies.sh

@@ -1,6 +1,9 @@
 #!/usr/bin/env bash
 set -e
 
+# Increase the pip timeout to handle TimeoutError
+export PIP_DEFAULT_TIMEOUT=200
+
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
 ROOT=$DIR/../
 cd $ROOT
@@ -13,7 +16,7 @@ fi
 if ! command -v "pyenv" > /dev/null 2>&1; then
   echo "pyenv install ..."
   curl -L https://github.com/pyenv/pyenv-installer/raw/master/bin/pyenv-installer | bash
-  PYENV_PATH_SETUP="export PATH=\$HOME/.pyenv/bin:\$HOME/.pyenv/shims:\$PATH"
+  PYENV_PATH_SETUP="export PATH=\$HOME/.pyenv/bin:\$HOME/.pyenv/shims:\$HOME/.pyenv/versions/${PYENV_PYTHON_VERSION}/bin:\$PATH"
 fi
 
 if [ -z "$PYENV_SHELL" ] || [ -n "$PYENV_PATH_SETUP" ]; then
@@ -51,7 +54,12 @@ if ! pyenv prefix ${PYENV_PYTHON_VERSION} &> /dev/null; then
   echo "python ${PYENV_PYTHON_VERSION} install ..."
   CONFIGURE_OPTS="--enable-shared" pyenv install -f ${PYENV_PYTHON_VERSION}
 fi
+
 eval "$(pyenv init --path)"
+eval "$(pyenv init -)"
+eval "$(pyenv virtualenv-init -)"
+pyenv local ${PYENV_PYTHON_VERSION}
+pyenv rehash
 
 echo "update pip"
 pip install pip==24.0

tools/install_ubuntu_dependencies.sh

@@ -93,7 +93,8 @@ function install_ubuntu_lts_latest_requirements() {
     qtchooser \
     qt5-qmake \
     qtbase5-dev-tools \
-    python3-dev
+    python3-dev \
+    tk-dev
 }
 
 # Install Ubuntu 20.04 packages