From a3163e6820eb6290144b6bdce904fdef7057e901 Mon Sep 17 00:00:00 2001 From: Marcin Kajor Date: Tue, 18 Jun 2024 12:41:48 +0200 Subject: [PATCH 1/2] [nrfconnect] Fixed Python requirements for factory data generation Recently the SetupPayload module has started utilizing `concrete` package. As a result, it has became an indirect dependency of implementation of the nrfconnect factory data generation. Forward the `setup_payload/python/requirements.txt` to the nrfconnect specific requirements as a fix. Signed-off-by: Marcin Kajor --- scripts/setup/requirements.nrfconnect.txt | 3 ++- .../setup/requirements.setuppayload.txt | 0 2 files changed, 2 insertions(+), 1 deletion(-) rename src/setup_payload/python/requirements.txt => scripts/setup/requirements.setuppayload.txt (100%) diff --git a/scripts/setup/requirements.nrfconnect.txt b/scripts/setup/requirements.nrfconnect.txt index c0c3c285441136..e2ada120811850 100644 --- a/scripts/setup/requirements.nrfconnect.txt +++ b/scripts/setup/requirements.nrfconnect.txt @@ -1,6 +1,7 @@ +-r requirements.setuppayload.txt + jsonschema>=4.4.0 cbor2>=5.4.3 ecdsa>=0.18.0 qrcode==7.4.2 -bitarray==2.6.0 python_stdnum==1.18 diff --git a/src/setup_payload/python/requirements.txt b/scripts/setup/requirements.setuppayload.txt similarity index 100% rename from src/setup_payload/python/requirements.txt rename to scripts/setup/requirements.setuppayload.txt From af16e4bbafef9e21362a25807d86155f04adcb2d Mon Sep 17 00:00:00 2001 From: Damian Krolik Date: Fri, 21 Jun 2024 15:37:12 +0200 Subject: [PATCH 2/2] Fix setup_payload requirements path in build.yaml --- .github/workflows/build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 64e6b99a05d02a..c1073d90678ed2 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -332,7 +332,7 @@ jobs: scripts/run_in_build_env.sh 'scripts/examples/gn_build_example.sh examples/chip-tool out/' scripts/run_in_build_env.sh 'virtualenv pyenv' source pyenv/bin/activate - pip3 install -r src/setup_payload/python/requirements.txt + pip3 install -r scripts/setup/requirements.setuppayload.txt python3 src/setup_payload/tests/run_python_setup_payload_test.py out/chip-tool build_linux_python_lighting_device: