From d7a4fc50bf8de2768443fbe2bc214b83819c9e70 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Thu, 30 Apr 2026 19:44:28 -0700 Subject: [PATCH] sync openpilot dependencies --- userspace/uv/openpilot/pyproject.toml | 2 ++ userspace/uv/uv.lock | 40 ++++++++++++++++++--------- 2 files changed, 29 insertions(+), 13 deletions(-) diff --git a/userspace/uv/openpilot/pyproject.toml b/userspace/uv/openpilot/pyproject.toml index 7b06f1e..70c75bd 100644 --- a/userspace/uv/openpilot/pyproject.toml +++ b/userspace/uv/openpilot/pyproject.toml @@ -28,6 +28,7 @@ dependencies = [ # vendored native dependencies "bzip2 @ git+https://github.com/commaai/dependencies.git@release-bzip2#subdirectory=bzip2", "capnproto @ git+https://github.com/commaai/dependencies.git@release-capnproto#subdirectory=capnproto", + "catch2 @ git+https://github.com/commaai/dependencies.git@release-catch2#subdirectory=catch2", "acados @ git+https://github.com/commaai/dependencies.git@release-acados#subdirectory=acados", "eigen @ git+https://github.com/commaai/dependencies.git@release-eigen#subdirectory=eigen", "ffmpeg @ git+https://github.com/commaai/dependencies.git@release-ffmpeg#subdirectory=ffmpeg", @@ -39,6 +40,7 @@ dependencies = [ "libusb @ git+https://github.com/commaai/dependencies.git@release-libusb#subdirectory=libusb", "git-lfs @ git+https://github.com/commaai/dependencies.git@release-git-lfs#subdirectory=git-lfs", "gcc-arm-none-eabi @ git+https://github.com/commaai/dependencies.git@release-gcc-arm-none-eabi#subdirectory=gcc-arm-none-eabi", + "xvfb @ git+https://github.com/commaai/dependencies.git@release-xvfb#subdirectory=xvfb", # body / webrtcd "av", diff --git a/userspace/uv/uv.lock b/userspace/uv/uv.lock index 8f9f064..d6a1e93 100644 --- a/userspace/uv/uv.lock +++ b/userspace/uv/uv.lock @@ -5,7 +5,7 @@ requires-python = ">=3.12.3, <3.13" [[package]] name = "acados" version = "0.2.2" -source = { git = "https://github.com/commaai/dependencies.git?subdirectory=acados&rev=release-acados#946daa695ae02173affd8c7c285286e3bfcd6c34" } +source = { git = "https://github.com/commaai/dependencies.git?subdirectory=acados&rev=release-acados#8fd972019085ac7210a55623d5b7964e852269fd" } dependencies = [ { name = "numpy" }, ] @@ -205,12 +205,12 @@ wheels = [ [[package]] name = "bzip2" version = "1.0.8" -source = { git = "https://github.com/commaai/dependencies.git?subdirectory=bzip2&rev=release-bzip2#1d3cf44628a4dc8e2dfba7e3085deebeb6dab496" } +source = { git = "https://github.com/commaai/dependencies.git?subdirectory=bzip2&rev=release-bzip2#7876f40b7a3e9f0d634a60586043395169ef1a82" } [[package]] name = "capnproto" version = "1.0.1" -source = { git = "https://github.com/commaai/dependencies.git?subdirectory=capnproto&rev=release-capnproto#1049bb499c867bc30366b717e994f14878ac2243" } +source = { git = "https://github.com/commaai/dependencies.git?subdirectory=capnproto&rev=release-capnproto#bcd0c43cb9dbd3b48aad36812bae9498fb5c7be1" } [[package]] name = "casadi" @@ -229,6 +229,11 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/3e/b9/5b984124f539656efdf079f3d8f09d73667808ec8d0546e6bce6dc60ade6/casadi-3.7.2-cp312-none-win_amd64.whl", hash = "sha256:81d677d2b020c1307c1eb25eae15686e5de199bb066828c3eaabdfaaaf457ffd", size = 50991347, upload-time = "2025-09-10T08:10:46.629Z" }, ] +[[package]] +name = "catch2" +version = "2.13.10" +source = { git = "https://github.com/commaai/dependencies.git?subdirectory=catch2&rev=release-catch2#7a05367ad5e3705a23f00ebc41b629960b8996b0" } + [[package]] name = "certifi" version = "2026.4.22" @@ -432,7 +437,7 @@ wheels = [ [[package]] name = "eigen" version = "3.4.0" -source = { git = "https://github.com/commaai/dependencies.git?subdirectory=eigen&rev=release-eigen#7a3527e305803b20b50e72622fa207e726123c30" } +source = { git = "https://github.com/commaai/dependencies.git?subdirectory=eigen&rev=release-eigen#2549bb084fb942f7861bfd8e0e1f16e619a544cf" } [[package]] name = "evdev" @@ -461,7 +466,7 @@ wheels = [ [[package]] name = "ffmpeg" version = "7.1.0" -source = { git = "https://github.com/commaai/dependencies.git?subdirectory=ffmpeg&rev=release-ffmpeg#372b67b48f8a216be9a35ff14432d2d1090d76d4" } +source = { git = "https://github.com/commaai/dependencies.git?subdirectory=ffmpeg&rev=release-ffmpeg#783ee0c31f422295af7b3f8943c9d878603a34e9" } [[package]] name = "flaky" @@ -500,12 +505,12 @@ wheels = [ [[package]] name = "gcc-arm-none-eabi" version = "13.2.1" -source = { git = "https://github.com/commaai/dependencies.git?subdirectory=gcc-arm-none-eabi&rev=release-gcc-arm-none-eabi#29e28168c055299fb2ee3c9650a04cab56bc226e" } +source = { git = "https://github.com/commaai/dependencies.git?subdirectory=gcc-arm-none-eabi&rev=release-gcc-arm-none-eabi#95a94097e4214ba85718bf63ebffd2b4e3427e10" } [[package]] name = "git-lfs" version = "3.6.1" -source = { git = "https://github.com/commaai/dependencies.git?subdirectory=git-lfs&rev=release-git-lfs#38d8696ee24f2d8ad6432434d2ae84a1f3e1797b" } +source = { git = "https://github.com/commaai/dependencies.git?subdirectory=git-lfs&rev=release-git-lfs#a170e4e7bfed8809673bf1ef6656ba710e084c8c" } [[package]] name = "google-crc32c" @@ -653,12 +658,12 @@ wheels = [ [[package]] name = "libjpeg" version = "3.1.0" -source = { git = "https://github.com/commaai/dependencies.git?subdirectory=libjpeg&rev=release-libjpeg#ac01d6d4b8192418df2d71204b72b8fdf0bd7001" } +source = { git = "https://github.com/commaai/dependencies.git?subdirectory=libjpeg&rev=release-libjpeg#52c4510d20025fb9daac88acbe08438c9038a60f" } [[package]] name = "libusb" version = "1.0.29" -source = { git = "https://github.com/commaai/dependencies.git?subdirectory=libusb&rev=release-libusb#13c111ad4fa10880932e8e8a071a8ff9d7b0c3bd" } +source = { git = "https://github.com/commaai/dependencies.git?subdirectory=libusb&rev=release-libusb#9f64ef9804e51d64b49d75011f4acfc582791645" } [[package]] name = "libusb1" @@ -674,7 +679,7 @@ wheels = [ [[package]] name = "libyuv" version = "1922.0" -source = { git = "https://github.com/commaai/dependencies.git?subdirectory=libyuv&rev=release-libyuv#a7bbe1c0f506d8d13b7b6ce97e7e5631a73b8cc2" } +source = { git = "https://github.com/commaai/dependencies.git?subdirectory=libyuv&rev=release-libyuv#a5a47cab68fe194e0ee6e8ba694960dd0e8f3ac5" } [[package]] name = "matplotlib-inline" @@ -727,7 +732,7 @@ wheels = [ [[package]] name = "ncurses" version = "6.5" -source = { git = "https://github.com/commaai/dependencies.git?subdirectory=ncurses&rev=release-ncurses#eea8acaa6c487295f5ec16a395e0df7f78e34836" } +source = { git = "https://github.com/commaai/dependencies.git?subdirectory=ncurses&rev=release-ncurses#0e85f809441d49e7b2ec3123ee786fefa95b2052" } [[package]] name = "numpy" @@ -760,6 +765,7 @@ dependencies = [ { name = "bzip2" }, { name = "capnproto" }, { name = "casadi" }, + { name = "catch2" }, { name = "cffi" }, { name = "crcmod-plus" }, { name = "cython" }, @@ -795,6 +801,7 @@ dependencies = [ { name = "tqdm" }, { name = "websocket-client" }, { name = "xattr" }, + { name = "xvfb" }, { name = "zeromq" }, { name = "zstandard" }, { name = "zstd" }, @@ -825,6 +832,7 @@ requires-dist = [ { name = "bzip2", git = "https://github.com/commaai/dependencies.git?subdirectory=bzip2&rev=release-bzip2" }, { name = "capnproto", git = "https://github.com/commaai/dependencies.git?subdirectory=capnproto&rev=release-capnproto" }, { name = "casadi", specifier = ">=3.6.6" }, + { name = "catch2", git = "https://github.com/commaai/dependencies.git?subdirectory=catch2&rev=release-catch2" }, { name = "cffi" }, { name = "codespell", marker = "extra == 'testing'" }, { name = "coverage", marker = "extra == 'testing'" }, @@ -877,6 +885,7 @@ requires-dist = [ { name = "ty", marker = "extra == 'testing'" }, { name = "websocket-client" }, { name = "xattr" }, + { name = "xvfb", git = "https://github.com/commaai/dependencies.git?subdirectory=xvfb&rev=release-xvfb" }, { name = "zensical", marker = "extra == 'docs'" }, { name = "zeromq", git = "https://github.com/commaai/dependencies.git?subdirectory=zeromq&rev=release-zeromq" }, { name = "zstandard" }, @@ -1604,6 +1613,11 @@ wheels = [ { url = "https://files.pythonhosted.org/packages/38/63/188f7cb41ab35d795558325d5cc8ab552171d5498cfb178fd14409651e18/xattr-1.3.0-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:2aaa5d66af6523332189108f34e966ca120ff816dfa077ca34b31e6263f8a236", size = 37754, upload-time = "2025-10-13T22:16:15.306Z" }, ] +[[package]] +name = "xvfb" +version = "1.20.11.post1" +source = { git = "https://github.com/commaai/dependencies.git?subdirectory=xvfb&rev=release-xvfb#8dbb2f0e4a8b22402e8f7029dc7fd06c8e4fd865" } + [[package]] name = "yarl" version = "1.23.0" @@ -1639,7 +1653,7 @@ wheels = [ [[package]] name = "zeromq" version = "4.3.5" -source = { git = "https://github.com/commaai/dependencies.git?subdirectory=zeromq&rev=release-zeromq#37534be1c38db94a13e1d98995caa93fdc74dc34" } +source = { git = "https://github.com/commaai/dependencies.git?subdirectory=zeromq&rev=release-zeromq#39acf5d6cbd996fe61e8e8727e1b403e79bc2b7b" } [[package]] name = "zstandard" @@ -1669,4 +1683,4 @@ wheels = [ [[package]] name = "zstd" version = "1.5.6" -source = { git = "https://github.com/commaai/dependencies.git?subdirectory=zstd&rev=release-zstd#80add1f4e37b134937563bb7169ac9bd042d9e33" } +source = { git = "https://github.com/commaai/dependencies.git?subdirectory=zstd&rev=release-zstd#59e9ca4ecfda299d4861ea53a5fcc1eacadc5524" }