From f5969badf297766fdb647ee846dc1001c98c82af Mon Sep 17 00:00:00 2001 From: Karsten Koenig Date: Fri, 10 Jan 2025 09:19:02 +0100 Subject: [PATCH 1/2] scripts: requirements: bump nrf-regtool to 8.1.2 Introduce latest fixes and changes from nrf-regtool 8.1.2 Signed-off-by: Karsten Koenig (cherry picked from commit 1fd75880e3d3418155f785912e7720ef5ce5aed1) --- scripts/requirements-build.txt | 2 +- scripts/requirements-fixed.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/requirements-build.txt b/scripts/requirements-build.txt index 8ccb70ed0ef6..c711cf067536 100644 --- a/scripts/requirements-build.txt +++ b/scripts/requirements-build.txt @@ -9,6 +9,6 @@ intelhex pylint setuptools==75.2.0 zcbor~=0.8.0 -nrf-regtool~=8.0.0 +nrf-regtool~=8.1.2 windows-curses; sys_platform == 'win32' unidiff diff --git a/scripts/requirements-fixed.txt b/scripts/requirements-fixed.txt index 6d64c9746359..333c76b730a9 100644 --- a/scripts/requirements-fixed.txt +++ b/scripts/requirements-fixed.txt @@ -94,13 +94,13 @@ markupsafe==2.1.3 ; python_version >= "3.10" and python_version < "4.0" mccabe==0.7.0 ; python_version >= "3.10" and python_version < "4.0" milksnake==0.1.6 ; python_version >= "3.10" and python_version < "4.0" mock==5.1.0 ; python_version >= "3.10" and python_version < "4.0" -more-itertools==10.2.0 ; python_version >= "3.10" and python_version < "4.0" +more-itertools==10.2.0 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64" msgpack==1.0.5 ; python_version >= "3.10" and python_version < "4.0" and platform_system != "Windows" mypy-extensions==1.0.0 ; python_version >= "3.10" and python_version < "4.0" mypy==1.13.0 ; python_version >= "3.10" and python_version < "4.0" natsort==8.4.0 ; python_version >= "3.10" and python_version < "4.0" normality==2.5.0 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64" -nrf-regtool==8.0.0 ; python_version >= "3.10" and python_version < "4.0" +nrf-regtool==8.1.2 ; python_version >= "3.10" and python_version < "4.0" nrfcredstore==1.0.0 ; python_version >= "3.10" and python_version < "4.0" nrfprovision==0.9.0 ; python_version >= "3.10" and python_version < "4.0" numpy==2.1.3 ; python_version >= "3.10" and python_version < "4.0" From c57e7f3e668acc410025a148e7adc8e22d3f4e6e Mon Sep 17 00:00:00 2001 From: Thomas Stilwell Date: Fri, 10 Jan 2025 13:19:00 +0100 Subject: [PATCH 2/2] scripts: requirements: bump jinja2>=3.1.5 https://github.com/pallets/jinja/security/advisories/GHSA-q2x7-8rv6-6q7h Signed-off-by: Karsten Koenig Signed-off-by: Thomas Stilwell (cherry picked from commit a1941eb89c58f03d638baea3c0dae097dc0f9a7a) --- scripts/requirements-extra.txt | 2 +- scripts/requirements-fixed.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/requirements-extra.txt b/scripts/requirements-extra.txt index 8348d62e9298..21a3cd807f3b 100644 --- a/scripts/requirements-extra.txt +++ b/scripts/requirements-extra.txt @@ -2,7 +2,7 @@ pygit2>=1.15.0 Pillow>=10.3.0 # https://github.com/advisories/GHSA-44wm-f244-xhp3 editdistance>=0.5.0 PyGithub -jinja2>=3.1.4 # https://github.com/pallets/jinja/security/advisories/GHSA-h75v-3vvj-5mfj +jinja2>=3.1.5 # https://github.com/pallets/jinja/security/advisories/GHSA-q2x7-8rv6-6q7h zcbor>=0.8.0 nrfcredstore>=1.0.0,<2 idna>=3.7 # https://github.com/advisories/GHSA-jjg7-2v4v-x38h diff --git a/scripts/requirements-fixed.txt b/scripts/requirements-fixed.txt index 333c76b730a9..f9b1ccd85b25 100644 --- a/scripts/requirements-fixed.txt +++ b/scripts/requirements-fixed.txt @@ -78,7 +78,7 @@ isodate==0.7.2 ; python_version >= "3.10" and python_version < "3.11" and platfo isort==5.12.0 ; python_version >= "3.10" and python_version < "4.0" jaraco-functools==4.1.0 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64" javaproperties==0.8.1 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64" -jinja2==3.1.4 ; python_version >= "3.10" and python_version < "4.0" +jinja2==3.1.5 ; python_version >= "3.10" and python_version < "4.0" jsonschema-specifications==2023.7.1 ; python_version >= "3.10" and python_version < "4.0" jsonschema==4.23.0 ; python_version >= "3.10" and python_version < "4.0" jsonstreams==0.6.0 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"