From 26614832f20292e482daaf36bd100d68f45ea231 Mon Sep 17 00:00:00 2001 From: Pieter De Gendt Date: Mon, 25 Nov 2024 15:23:05 +0100 Subject: [PATCH] modules: nanopb: Move pip dependencies to optional module The west packages extension can be used to install module dependencies. Upstream nanopb has added the pip package dependencies to the zephyr/module.yml file. Remove in-tree pip package dependencies. Signed-off-by: Pieter De Gendt --- doc/services/serialization/nanopb.rst | 1 + scripts/requirements-extras.txt | 4 ---- submanifests/optional.yaml | 2 +- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/doc/services/serialization/nanopb.rst b/doc/services/serialization/nanopb.rst index 79525600ac8..9c996af7c72 100644 --- a/doc/services/serialization/nanopb.rst +++ b/doc/services/serialization/nanopb.rst @@ -45,6 +45,7 @@ Additionally, Nanopb is an optional module and needs to be added explicitly to t west config manifest.project-filter -- +nanopb west update + west packages pip --install Configuration ************* diff --git a/scripts/requirements-extras.txt b/scripts/requirements-extras.txt index 0dd10bfbf52..6f8c32cca27 100644 --- a/scripts/requirements-extras.txt +++ b/scripts/requirements-extras.txt @@ -21,10 +21,6 @@ Pillow>=10.0 # can be used to sign a Zephyr application binary for consumption by a bootloader imgtool>=2.1.0 -# used by nanopb module to generate sources from .proto files -grpcio-tools>=1.47.0 -protobuf>=3.20.3 - # used by scripts/release/bug_bash.py for generating top ten bug squashers PyGithub diff --git a/submanifests/optional.yaml b/submanifests/optional.yaml index 8365f5d5b02..b3ea7af684f 100644 --- a/submanifests/optional.yaml +++ b/submanifests/optional.yaml @@ -23,7 +23,7 @@ manifest: groups: - optional - name: nanopb - revision: 98bf4db69897b53434f3d0ba72e0a3ab1a902824 + revision: 0a3b5050a28faeca3cfa2f566e043807431c8d7f path: modules/lib/nanopb remote: upstream groups: