From c3995b68db0dbc7fb61f7cc185ec375cb63f0a20 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Sun, 30 Apr 2023 12:27:45 -0700 Subject: [PATCH] add back PyQt5 (#131) * doesn't work from poetry * move * pin version --- Dockerfile.agnos | 10 +++++++++- userspace/openpilot_python_dependencies.sh | 2 ++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Dockerfile.agnos b/Dockerfile.agnos index 182fd1f..0673189 100644 --- a/Dockerfile.agnos +++ b/Dockerfile.agnos @@ -78,13 +78,21 @@ 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 COPY --from=agnos-compiler-mapbox-gl-native /tmp/libqmapboxgl.so /lib/aarch64-linux-gnu/libqmapboxgl.so +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="-j40" && \ + pip install pyqt5-sip==12.9.0 && \ + pip install pyqt5==5.15.9 --verbose --config-settings --confirm-license= && \ + pyenv rehash + # Install openpilot python packages COPY ./userspace/pyproject.toml ./userspace/poetry.lock /tmp/agnos/ 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 -)" && \ - pip3 install --no-cache-dir --upgrade pip==22.3.1 poetry==1.2.2 && \ cd /tmp/agnos && \ poetry config virtualenvs.prefer-active-python true --local && \ poetry config virtualenvs.create false --local && \ diff --git a/userspace/openpilot_python_dependencies.sh b/userspace/openpilot_python_dependencies.sh index a725e34..89b9747 100755 --- a/userspace/openpilot_python_dependencies.sh +++ b/userspace/openpilot_python_dependencies.sh @@ -17,3 +17,5 @@ fi echo "Setting global python version" pyenv global $PYTHON_VERSION + +pip3 install --no-cache-dir --upgrade pip==22.3.1 poetry==1.2.2