From d178252b632cc0c515e69308fd01ae33375d2cd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20Amundsen?= Date: Thu, 17 Oct 2024 11:46:41 +0200 Subject: [PATCH] scripts: bump nrf-regtool to 7.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is needed for new UICR layout. Signed-off-by: Håkon Amundsen --- scripts/requirements-build.txt | 2 +- scripts/requirements-fixed.txt | 22 +++++++++++++--------- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/scripts/requirements-build.txt b/scripts/requirements-build.txt index f4d4235ef097..c467dfebe351 100644 --- a/scripts/requirements-build.txt +++ b/scripts/requirements-build.txt @@ -6,4 +6,4 @@ imagesize>=1.2.0 intelhex pylint zcbor~=0.8.0 -nrf-regtool~=6.0.0 +nrf-regtool~=7.0.0 diff --git a/scripts/requirements-fixed.txt b/scripts/requirements-fixed.txt index f52c2a265568..4fc4093c81ec 100644 --- a/scripts/requirements-fixed.txt +++ b/scripts/requirements-fixed.txt @@ -20,7 +20,7 @@ certifi==2024.7.4 # via -r nrf/scripts/requirements-base.txt, requests cffi==1.16.0 # via cmsis-pack-manager, cryptography, milksnake, pygit2, pynacl chardet==5.2.0 # via -r nrf/scripts/requirements-ci.txt charset-normalizer==3.2.0 # via requests -clang-format==17.0.1 # via -r nrf/scripts/requirements-build.txt, -r zephyr/scripts/requirements-extras.txt +clang-format==17.0.1 # via -r nrf/scripts/requirements-build.txt, -r zephyr/scripts/requirements-compliance.txt click==8.0.3 # via -r bootloader/mcuboot/scripts/requirements.txt, gitlint-core, imgtool, nrf-regtool cmsis-pack-manager==0.5.2 # via pyocd colorama==0.4.6 # via -r zephyr/scripts/requirements-build-test.txt, pyocd, west @@ -37,13 +37,13 @@ gcovr==6.0 # via -r zephyr/scripts/requirements-build-test.txt gitdb==4.0.10 # via gitpython gitlint==0.18.0 # via -r nrf/scripts/requirements-ci.txt, -r zephyr/scripts/requirements-extras.txt gitlint-core==0.18.0 # via gitlint -gitpython==3.1.41 # via -r nrf/scripts/requirements-ci.txt +gitpython==3.1.41 # via -r nrf/scripts/requirements-ci.txt, -r zephyr/scripts/requirements-extras.txt graphviz==0.20.1 # via -r zephyr/scripts/requirements-extras.txt grpcio==1.64.1 # via grpcio-tools grpcio-tools==1.64.1 # via -r zephyr/scripts/requirements-extras.txt idna==3.7 # via -r nrf/scripts/requirements-extra.txt, requests imagesize==1.4.1 # via -r nrf/scripts/requirements-build.txt -imgtool==2.0.0 # via -r zephyr/scripts/requirements-extras.txt +imgtool==2.1.0 # via -r zephyr/scripts/requirements-extras.txt importlib-metadata==6.8.0 # via pyocd importlib-resources==6.1.0 # via pyocd iniconfig==2.0.0 # via pytest @@ -69,16 +69,18 @@ msgpack==1.0.5 # via python-can mypy==1.5.1 # via -r zephyr/scripts/requirements-build-test.txt mypy-extensions==1.0.0 # via mypy natsort==8.4.0 # via pyocd -nrf-regtool==6.0.0 # via -r nrf/scripts/requirements-build.txt +nrf-regtool==7.0.0 # via -r nrf/scripts/requirements-build.txt nrfcredstore==1.0.0 # via -r nrf/scripts/requirements-extra.txt numpy==1.26.4 # via svada packaging==24.0 # via -r zephyr/scripts/requirements-base.txt, pkg-about, pytest, python-can, setuptools-scm, west pathspec==0.11.2 # via yamllint +patool==3.0.1 # via -r zephyr/scripts/requirements-base.txt pillow==10.3.0 # via -r nrf/scripts/requirements-extra.txt, -r zephyr/scripts/requirements-extras.txt pkg-about==1.1.5 # via libusb platformdirs==3.10.0 # via pylint pluggy==1.3.0 # via pytest ply==3.11 # via -r zephyr/scripts/requirements-build-test.txt +polib==1.2.0 # via sphinx-lint prettytable==3.9.0 # via pyocd progress==1.6 # via -r zephyr/scripts/requirements-base.txt protobuf==5.27.1 # via -r zephyr/scripts/requirements-extras.txt, grpcio-tools @@ -98,8 +100,8 @@ pyocd==0.35.1 # via -r zephyr/scripts/requirements-run-test.txt pyparsing==3.1.1 # via -r nrf/scripts/requirements-ci.txt pypng==0.20220715.0 # via qrcode pyserial==3.5 # via -r zephyr/scripts/requirements-base.txt, nrfcredstore -pytest==7.4.2 # via -r zephyr/scripts/requirements-build-test.txt -python-can==4.2.2 # via canopen +pytest==7.4.2 # via -r bootloader/mcuboot/scripts/requirements.txt, -r zephyr/scripts/requirements-build-test.txt +python-can==4.4.2 # via -r zephyr/scripts/requirements-run-test.txt, canopen python-dateutil==2.8.2 # via arrow, pykwalify python-magic==0.4.27 # via -r zephyr/scripts/requirements-compliance.txt python-stdnum==1.19 # via -r nrf/scripts/requirements-ci.txt @@ -108,15 +110,17 @@ pyusb==1.2.1 # via -r nrf/scripts/requirements-ci.txt, pyocd pyyaml==6.0.1 # via -r bootloader/mcuboot/scripts/requirements.txt, -r zephyr/scripts/requirements-base.txt, cmsis-pack-manager, devicetree, pyocd, west, yamllint, zcbor qrcode==7.4.2 # via -r nrf/scripts/requirements-ci.txt referencing==0.30.2 # via jsonschema, jsonschema-specifications -regex==2024.7.24 # via zcbor +regex==2024.7.24 # via sphinx-lint, zcbor requests==2.32.0 # via -r zephyr/scripts/requirements-base.txt, pygithub rpds-py==0.20.0 # via jsonschema, referencing ruamel-yaml==0.17.32 # via pykwalify +semver==3.0.2 # via -r zephyr/scripts/requirements-base.txt setuptools-scm==8.0.4 # via svada sh==1.14.2 # via gitlint-core six==1.16.0 # via anytree, ecdsa, pylink-square, pyocd, python-dateutil smmap==5.0.1 # via gitdb sortedcontainers==2.4.0 # via intervaltree +sphinx-lint==1.0.0 # via -r zephyr/scripts/requirements-compliance.txt stringcase==1.2.0 # via -r nrf/scripts/requirements-ci.txt svada==2.0.2 # via nrf-regtool tabulate==0.9.0 # via -r zephyr/scripts/requirements-run-test.txt @@ -124,7 +128,7 @@ toml==0.10.2 # via -r nrf/scripts/requirements-ci.txt tomli==2.0.1 # via nrf-regtool tomlkit==0.12.1 # via pylint typing-extensions==4.8.0 # via mypy, pyocd, python-can, qrcode, setuptools-scm, svada -unidiff==0.7.5 +unidiff==0.7.5 # via -r zephyr/scripts/requirements-compliance.txt urllib3==2.2.2 # via requests wcwidth==0.2.6 # via prettytable west==1.2.0 # via -r nrf/scripts/requirements-base.txt, -r zephyr/scripts/requirements-base.txt @@ -135,4 +139,4 @@ zcbor==0.8.1 # via -r nrf/scripts/requirements-build.txt, -r nrf/sc zipp==3.17.0 # via importlib-metadata # The following packages are considered to be unsafe in a requirements file: -setuptools==74.1.1 # via grpcio-tools, libusb, pkg-about, python-can, setuptools-scm, west +setuptools==74.1.1 # via -r bootloader/mcuboot/scripts/requirements.txt, grpcio-tools, libusb, pkg-about, setuptools-scm, west