Skip to content

Commit 2d37418

Browse files
use new vendored deps from commaai/dependencies (#531)
* sync * remove apt packages now vendored in commaai/dependencies - bzip2: commaai/openpilot#37342, commaai/openpilot#37459 - libbz2-dev: commaai/openpilot#37342, commaai/openpilot#37459 - libeigen3-dev: commaai/openpilot#37339 - libzmq3-dev: commaai/openpilot#37333 - libzstd-dev: commaai/openpilot#37376 - zstd: commaai/openpilot#37376 - libssl-dev: commaai/openpilot#37381 - libjpeg-dev: commaai/openpilot#37371, commaai/openpilot#37381 - cppcheck: commaai/openpilot#34248 - gettext: commaai/openpilot#37372 * update * trim down list * revert that * rm old capnp build --------- Co-authored-by: Adeeb Shihadeh <adeebshihadeh@gmail.com>
1 parent 684c6a9 commit 2d37418

File tree

6 files changed

+460
-666
lines changed

6 files changed

+460
-666
lines changed

Dockerfile.agnos

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,6 @@ RUN apt-get update && apt-get install -yq --no-install-recommends \
2121
# Enable ccache
2222
ENV PATH="/usr/lib/ccache:$PATH"
2323

24-
# capnproto
25-
FROM agnos-compiler AS agnos-compiler-capnp
26-
COPY ./userspace/compile-capnp.sh /tmp/agnos/
27-
RUN --mount=type=cache,target=/root/.ccache,id=capnp,sharing=shared \
28-
/tmp/agnos/compile-capnp.sh
29-
3024
# ffmpeg
3125
FROM agnos-compiler AS agnos-compiler-ffmpeg
3226
COPY ./userspace/compile-ffmpeg.sh /tmp/agnos/
@@ -124,10 +118,6 @@ RUN cd /tmp && \
124118
apt-get -o Dpkg::Options::="--force-overwrite" install -yq ./libqmi.deb && \
125119
apt-get -o Dpkg::Options::="--force-overwrite" install -yq ./modemmanager.deb
126120

127-
# Pre-compiled capnp (must be before python install)
128-
COPY --from=agnos-compiler-capnp /tmp/capnproto.deb /tmp/capnproto.deb
129-
RUN cd /tmp && apt-get -o Dpkg::Options::="--force-overwrite" install -yq ./capnproto.deb
130-
131121
# Use other pre-compiled packages
132122
COPY --from=agnos-compiler-ffmpeg /tmp/ffmpeg.deb /tmp/ffmpeg.deb
133123
RUN cd /tmp && apt-get -o Dpkg::Options::="--force-overwrite" install -yq ./ffmpeg.deb

userspace/compile-capnp.sh

Lines changed: 0 additions & 23 deletions
This file was deleted.

userspace/openpilot_dependencies.sh

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,36 +8,29 @@ apt-fast install --no-install-recommends -yq \
88
autoconf \
99
automake \
1010
build-essential \
11-
bzip2 \
1211
casync \
1312
clang \
1413
clinfo \
1514
cmake \
16-
cppcheck \
1715
curl \
1816
darkstat \
1917
dkms \
20-
gettext \
2118
gpiod \
2219
libarchive-dev \
2320
libass-dev \
24-
libbz2-dev \
2521
libcurl4-openssl-dev \
2622
libczmq-dev \
2723
libdbus-1-dev \
28-
libeigen3-dev \
2924
libffi-dev \
3025
libfreetype6-dev \
3126
libglfw3-dev \
3227
libglib2.0-0t64 \
3328
libi2c-dev \
34-
libjpeg-dev \
3529
liblzma-dev \
3630
libomp-dev \
3731
libportaudio2 \
3832
libsdl2-dev \
3933
libsqlite3-dev \
40-
libssl-dev \
4134
libsystemd-dev \
4235
libtool \
4336
libusb-1.0-0-dev \
@@ -56,8 +49,6 @@ apt-fast install --no-install-recommends -yq \
5649
libxcb-xkb1 \
5750
libxcb1-dev \
5851
libxkbcommon-x11-0 \
59-
libzmq3-dev \
60-
libzstd-dev \
6152
locales \
6253
nethogs \
6354
ocl-icd-libopencl1 \
@@ -69,5 +60,4 @@ apt-fast install --no-install-recommends -yq \
6960
vnstat \
7061
wget \
7162
xvfb \
72-
zlib1g-dev \
73-
zstd
63+
zlib1g-dev

userspace/uv/openpilot/pyproject.toml

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,24 @@ dependencies = [
2525
"setuptools",
2626
"numpy >=2.0",
2727

28+
# vendored native dependencies
29+
"bzip2 @ git+https://github.com/commaai/dependencies.git@releases#subdirectory=bzip2",
30+
"capnproto @ git+https://github.com/commaai/dependencies.git@releases#subdirectory=capnproto",
31+
"eigen @ git+https://github.com/commaai/dependencies.git@releases#subdirectory=eigen",
32+
"ffmpeg @ git+https://github.com/commaai/dependencies.git@releases#subdirectory=ffmpeg",
33+
"libjpeg @ git+https://github.com/commaai/dependencies.git@releases#subdirectory=libjpeg",
34+
"libyuv @ git+https://github.com/commaai/dependencies.git@releases#subdirectory=libyuv",
35+
"python3-dev @ git+https://github.com/commaai/dependencies.git@releases#subdirectory=python3-dev",
36+
"zstd @ git+https://github.com/commaai/dependencies.git@releases#subdirectory=zstd",
37+
"ncurses @ git+https://github.com/commaai/dependencies.git@releases#subdirectory=ncurses",
38+
"zeromq @ git+https://github.com/commaai/dependencies.git@releases#subdirectory=zeromq",
39+
"git-lfs @ git+https://github.com/commaai/dependencies.git@releases#subdirectory=git-lfs",
40+
"gcc-arm-none-eabi @ git+https://github.com/commaai/dependencies.git@releases#subdirectory=gcc-arm-none-eabi",
41+
2842
# body / webrtcd
2943
"av",
3044
"aiohttp",
3145
"aiortc",
32-
"pyaudio",
3346

3447
# panda
3548
"libusb1",
@@ -60,7 +73,7 @@ dependencies = [
6073
"zstandard",
6174

6275
# ui
63-
#"raylib > 5.5.0.3",
76+
"raylib > 5.5.0.3",
6477
"qrcode",
6578
"jeepney",
6679
]
@@ -94,7 +107,6 @@ dev = [
94107

95108
tools = [
96109
"metadrive-simulator @ git+https://github.com/commaai/metadrive.git@minimal ; (platform_machine != 'aarch64')",
97-
"dearpygui>=2.1.0; (sys_platform != 'linux' or platform_machine != 'aarch64')", # not vended for linux aarch64
98110
]
99111

100112
[project.urls]
@@ -112,7 +124,7 @@ allow-direct-references = true
112124

113125
[tool.pytest.ini_options]
114126
minversion = "6.0"
115-
addopts = "--ignore=openpilot/ --ignore=opendbc/ --ignore=panda/ --ignore=rednose_repo/ --ignore=tinygrad_repo/ --ignore=teleoprtc_repo/ --ignore=msgq/ -Werror --strict-config --strict-markers --durations=20 --maxprocesses=8 -n auto --dist=loadgroup"
127+
addopts = "--ignore=openpilot/ --ignore=opendbc/ --ignore=panda/ --ignore=rednose_repo/ --ignore=tinygrad_repo/ --ignore=teleoprtc_repo/ --ignore=msgq/ -Werror --strict-config --strict-markers --durations=10 -n auto --dist=loadgroup"
116128
cpp_files = "test_*"
117129
cpp_harness = "selfdrive/test/cpp_harness.py"
118130
python_files = "test_*.py"
@@ -133,7 +145,7 @@ testpaths = [
133145
[tool.codespell]
134146
quiet-level = 3
135147
# if you've got a short variable name that's getting flagged, add it here
136-
ignore-words-list = "bu,ro,te,ue,alo,hda,ois,nam,nams,ned,som,parm,setts,inout,warmup,bumb,nd,sie,preints,whit,indexIn,ws,uint,grey,deque,stdio,amin,BA,LITE,atEnd,UIs,errorString,arange,FocusIn,od,tim,relA,hist,copyable,jupyter,thead,TGE,abl,lite"
148+
ignore-words-list = "bu,ro,te,ue,alo,hda,ois,nam,nams,ned,som,parm,setts,inout,warmup,bumb,nd,sie,preints,whit,indexIn,ws,uint,grey,deque,stdio,amin,BA,LITE,atEnd,UIs,errorString,arange,FocusIn,od,tim,relA,hist,copyable,jupyter,thead,TGE,abl,lite,ser"
137149
builtin = "clear,rare,informal,code,names,en-GB_to_en-US"
138150
skip = "./third_party/*, ./tinygrad/*, ./tinygrad_repo/*, ./msgq/*, ./panda/*, ./opendbc/*, ./opendbc_repo/*, ./rednose/*, ./rednose_repo/*, ./teleoprtc/*, ./teleoprtc_repo/*, *.po, uv.lock, *.onnx, ./cereal/gen/*, */c_generated_code/*, docs/assets/*, tools/plotjuggler/layouts/*, selfdrive/assets/offroad/mici_fcc.html"
139151

userspace/uv/pyproject.toml

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,13 @@ requires-python = ">=3.12.3, <3.13"
66
description = ""
77
dependencies = [
88
"openpilot",
9-
"openpilot[dev]",
109
"openpilot[testing]",
1110

1211
# hardware.py
1312
"dbus-python",
1413
# amplifier.py
1514
"smbus2",
1615

17-
# pandad
18-
"libusb1 == 3.1.0", # recent versions segfault on comma three
19-
20-
# tinygrad
21-
"pyopencl == 2024.1", # pinned until cmake update coming with 24.04
22-
2316
# provisioning
2417
"pyusb",
2518
"paramiko",
@@ -32,7 +25,7 @@ dependencies = [
3225
"flaky",
3326

3427
# GUIs
35-
"raylib @ https://github.com/commaai/raylib-python-cffi/releases/download/8/raylib-5.5.0.2-cp312-cp312-linux_aarch64.whl",
28+
"raylib @ git+https://github.com/commaai/dependencies.git@releases#subdirectory=raylib",
3629
]
3730

3831
[tool.uv.sources]

0 commit comments

Comments
 (0)