From ecac2d386b7f8cb2f17e75dc046c78a2f70f2fcd Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Sun, 19 Jul 2026 09:02:02 -0700 Subject: [PATCH] these go in tools --- pyproject.toml | 9 ++++----- uv.lock | 21 +++++++++------------ 2 files changed, 13 insertions(+), 17 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 597f7a4489..da04c77f1e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -22,16 +22,12 @@ dependencies = [ "numpy >=2.0", # vendored native dependencies - "comma-deps-bzip2", - "comma-deps-bootstrap-icons", "comma-deps-capnproto", "comma-deps-catch2", "comma-deps-acados", "comma-deps-ffmpeg", "comma-deps-zstd", - "comma-deps-ncurses", "comma-deps-zeromq", - "comma-deps-libusb", "comma-deps-json11", "comma-deps-git-lfs", "comma-deps-gcc-arm-none-eabi", @@ -86,6 +82,10 @@ dev = [ tools = [ "comma-deps-imgui", + "comma-deps-bzip2", + "comma-deps-bootstrap-icons", + "comma-deps-libusb", + "comma-deps-ncurses", # this can be added back once it's stripped down some more #"metadrive-simulator @ git+https://github.com/commaai/metadrive.git@minimal ; (platform_machine != 'aarch64')", @@ -200,7 +200,6 @@ python-preference = "only-managed" default-groups = ["standalone"] override-dependencies = [ "opendbc", # panda pins opendbc from git for standalone use; always use our submodule - "av", # teleoprtc's av<13 pin is stale ] [tool.uv.sources] diff --git a/uv.lock b/uv.lock index cb6f859b50..9aef9c9a01 100644 --- a/uv.lock +++ b/uv.lock @@ -3,10 +3,7 @@ revision = 3 requires-python = ">=3.12.3, <3.13" [manifest] -overrides = [ - { name = "av" }, - { name = "opendbc", editable = "opendbc_repo" }, -] +overrides = [{ name = "opendbc", editable = "opendbc_repo" }] [[package]] name = "attrs" @@ -704,16 +701,12 @@ source = { editable = "." } dependencies = [ { name = "cffi" }, { name = "comma-deps-acados" }, - { name = "comma-deps-bootstrap-icons" }, - { name = "comma-deps-bzip2" }, { name = "comma-deps-capnproto" }, { name = "comma-deps-catch2" }, { name = "comma-deps-ffmpeg" }, { name = "comma-deps-gcc-arm-none-eabi" }, { name = "comma-deps-git-lfs" }, { name = "comma-deps-json11" }, - { name = "comma-deps-libusb" }, - { name = "comma-deps-ncurses" }, { name = "comma-deps-raylib" }, { name = "comma-deps-zeromq" }, { name = "comma-deps-zstd" }, @@ -765,7 +758,11 @@ testing = [ { name = "ty" }, ] tools = [ + { name = "comma-deps-bootstrap-icons" }, + { name = "comma-deps-bzip2" }, { name = "comma-deps-imgui" }, + { name = "comma-deps-libusb" }, + { name = "comma-deps-ncurses" }, ] [package.dev-dependencies] @@ -778,8 +775,8 @@ requires-dist = [ { name = "cffi" }, { name = "codespell", marker = "extra == 'testing'" }, { name = "comma-deps-acados" }, - { name = "comma-deps-bootstrap-icons" }, - { name = "comma-deps-bzip2" }, + { name = "comma-deps-bootstrap-icons", marker = "extra == 'tools'" }, + { name = "comma-deps-bzip2", marker = "extra == 'tools'" }, { name = "comma-deps-capnproto" }, { name = "comma-deps-catch2" }, { name = "comma-deps-ffmpeg" }, @@ -787,8 +784,8 @@ requires-dist = [ { name = "comma-deps-git-lfs" }, { name = "comma-deps-imgui", marker = "extra == 'tools'" }, { name = "comma-deps-json11" }, - { name = "comma-deps-libusb" }, - { name = "comma-deps-ncurses" }, + { name = "comma-deps-libusb", marker = "extra == 'tools'" }, + { name = "comma-deps-ncurses", marker = "extra == 'tools'" }, { name = "comma-deps-raylib" }, { name = "comma-deps-zeromq" }, { name = "comma-deps-zstd" },