From 179908f6ae460ad356c5714f1f99157430c4da36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20Ga=C5=82da?= Date: Mon, 9 Sep 2024 12:44:23 +0200 Subject: [PATCH] tools: Use pip-compile-cross-platform MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit pip-compile does not support generating one output file for different environments (operating systems) If we run it on Linux, it drops all packages which available only onl Windows (like windows-curses). pip-compile-cross-platform passes conditional markers from input files to output one. Signed-off-by: Jan Gałda --- scripts/requirements-build.txt | 2 + scripts/requirements-ci.txt | 2 +- scripts/requirements-fixed.txt | 273 +++++++++++++++++---------------- 3 files changed, 142 insertions(+), 135 deletions(-) diff --git a/scripts/requirements-build.txt b/scripts/requirements-build.txt index f4d4235ef09..4bdf07a45e6 100644 --- a/scripts/requirements-build.txt +++ b/scripts/requirements-build.txt @@ -1,5 +1,6 @@ cbor2>=5.4.2.post1 clang-format +click==8.1.3 ecdsa cryptography>=42.0.4 imagesize>=1.2.0 @@ -7,3 +8,4 @@ intelhex pylint zcbor~=0.8.0 nrf-regtool~=6.0.0 +windows-curses; sys_platform == 'win32' diff --git a/scripts/requirements-ci.txt b/scripts/requirements-ci.txt index 873b1a36a4e..271a227bebc 100644 --- a/scripts/requirements-ci.txt +++ b/scripts/requirements-ci.txt @@ -1,7 +1,7 @@ aenum bitarray chardet -gitlint==0.18.0 +gitlint==0.19.1 GitPython==3.1.41 jsonschema milksnake diff --git a/scripts/requirements-fixed.txt b/scripts/requirements-fixed.txt index bfa3c1c5447..1d1548172fe 100644 --- a/scripts/requirements-fixed.txt +++ b/scripts/requirements-fixed.txt @@ -1,137 +1,142 @@ # -# This file is autogenerated by pip-compile with Python 3.12 -# by the following command: +# This file is autogenerated by pip-compile-cross-platform +# To update, run: # -# pip-compile --allow-unsafe --annotation-style=line --output-file=nrf/scripts/requirements-fixed.txt --strip-extras bootloader/mcuboot/scripts/requirements.txt nrf/scripts/requirements-ci.txt nrf/scripts/requirements-extra.txt nrf/scripts/requirements.txt zephyr/scripts/requirements.txt +# pip-compile-cross-platform bootloader/mcuboot/scripts/requirements.txt nrf/scripts/requirements-ci.txt nrf/scripts/requirements-extra.txt nrf/scripts/requirements.txt zephyr/scripts/requirements.txt --output-file nrf/scripts/requirements-fixed.txt --min-python-version 3.9 # -aenum==3.1.15 # via -r nrf/scripts/requirements-ci.txt -anytree==2.9.0 # via -r zephyr/scripts/requirements-base.txt, -r zephyr/scripts/requirements-extras.txt -appdirs==1.4.4 # via cmsis-pack-manager -arrow==1.2.1 # via gitlint-core -astroid==3.0.1 # via pylint -attrs==23.1.0 # via jsonschema, referencing -bitarray==2.9.2 # via -r nrf/scripts/requirements-ci.txt -bz==1.0 # via -r zephyr/scripts/requirements-run-test.txt -canopen==2.1.0 # via -r zephyr/scripts/requirements-base.txt -capstone==4.0.2 # via pyocd -cbor==1.0.0 # via -r zephyr/scripts/requirements-run-test.txt -cbor2==5.4.6 # via -r bootloader/mcuboot/scripts/requirements.txt, -r nrf/scripts/requirements-build.txt, imgtool, zcbor -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 -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 -coverage==7.3.1 # via -r zephyr/scripts/requirements-build-test.txt -cryptography==43.0.1 # via -r bootloader/mcuboot/scripts/requirements.txt, -r nrf/scripts/requirements-build.txt, imgtool, pyjwt -deprecated==1.2.14 # via pygithub -devicetree==0.0.2 # via nrf-regtool -dill==0.3.7 # via pylint -docopt==0.6.2 # via pykwalify -ecdsa==0.18.0 # via -r nrf/scripts/requirements-build.txt -editdistance==0.8.1 # via -r nrf/scripts/requirements-extra.txt -future==0.18.3 # via junitparser -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 -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 -importlib-metadata==6.8.0 # via pyocd -importlib-resources==6.1.0 # via pyocd -iniconfig==2.0.0 # via pytest -intelhex==2.3.0 # via -r bootloader/mcuboot/scripts/requirements.txt, -r nrf/scripts/requirements-build.txt, -r zephyr/scripts/requirements-base.txt, imgtool, lpc-checksum, nrf-regtool, pyocd -intervaltree==3.1.0 # via pyocd -isort==5.12.0 # via pylint -jinja2==3.1.4 # via -r nrf/scripts/requirements-extra.txt, gcovr, junit2html -jsonschema==4.19.1 # via -r nrf/scripts/requirements-ci.txt -jsonschema-specifications==2023.7.1 # via jsonschema -junit2html==30.1.3 # via -r zephyr/scripts/requirements-extras.txt -junitparser==3.1.0 # via -r zephyr/scripts/requirements-compliance.txt -lark==1.1.7 # via pyocd -libusb==1.0.27 # via -r nrf/scripts/requirements-extra.txt -libusb-package==1.0.26.1 # via pyocd -lpc-checksum==2.2.0 # via -r zephyr/scripts/requirements-extras.txt -lxml==4.9.3 # via -r zephyr/scripts/requirements-compliance.txt, gcovr, svada -markupsafe==2.1.3 # via jinja2 -mccabe==0.7.0 # via pylint -milksnake==0.1.5 # via -r nrf/scripts/requirements-ci.txt -mock==5.1.0 # via -r zephyr/scripts/requirements-build-test.txt -more-itertools==10.2.0 # via nrf-regtool -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 -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 -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 -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 -psutil==5.9.5 # via -r zephyr/scripts/requirements-base.txt, -r zephyr/scripts/requirements-run-test.txt, pylink-square -py==1.11.0 # via -r nrf/scripts/requirements-ci.txt -pycparser==2.21 # via cffi -pyelftools==0.30 # via -r zephyr/scripts/requirements-base.txt, pyocd -pygit2==1.15.0 # via -r nrf/scripts/requirements-extra.txt -pygithub==1.59.1 # via -r nrf/scripts/requirements-extra.txt, -r zephyr/scripts/requirements-extras.txt -pygments==2.16.1 # via gcovr -pyjwt==2.8.0 # via pygithub -pykwalify==1.8.0 # via -r zephyr/scripts/requirements-base.txt, west -pylink-square==1.2.0 # via -r zephyr/scripts/requirements-base.txt, pyocd -pylint==3.0.2 # via -r nrf/scripts/requirements-build.txt, -r zephyr/scripts/requirements-compliance.txt -pynacl==1.5.0 # via pygithub -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 -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 -pytz==2023.3.post1 # via -r nrf/scripts/requirements-ci.txt -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 -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 -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 -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 -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 -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 -wget==3.2 # via -r nrf/scripts/requirements-ci.txt -wrapt==1.15.0 # via deprecated, python-can -yamllint==1.32.0 # via -r zephyr/scripts/requirements-compliance.txt -zcbor==0.8.1 # via -r nrf/scripts/requirements-build.txt, -r nrf/scripts/requirements-extra.txt, -r zephyr/scripts/requirements-extras.txt -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 +aenum==3.1.15 ; python_version >= "3.9" and python_version < "4.0" +anytree==2.12.1 ; python_version >= "3.9" and python_version < "4" +appdirs==1.4.4 ; python_version >= "3.9" and python_version < "4.0" +arrow==1.2.3 ; python_version >= "3.9" and python_version < "4.0" +astroid==3.0.1 ; python_version >= "3.9" and python_version < "4.0" +attrs==23.1.0 ; python_version >= "3.9" and python_version < "4.0" +bitarray==2.9.2 ; python_version >= "3.9" and python_version < "4.0" +bz==1.0 ; python_version >= "3.9" and python_version < "4.0" +canopen==2.3.0 ; python_version >= "3.9" and python_version < "4.0" +capstone==4.0.2 ; python_version >= "3.9" and python_version < "4.0" +cbor2==5.4.6 ; python_version >= "3.9" and python_version < "4.0" +cbor==1.0.0 ; python_version >= "3.9" and python_version < "4.0" +certifi==2024.7.4 ; python_version >= "3.9" and python_version < "4.0" +cffi==1.16.0 ; python_version >= "3.9" and python_version < "4.0" +chardet==5.2.0 ; python_version >= "3.9" and python_version < "4.0" +charset-normalizer==3.2.0 ; python_version >= "3.9" and python_version < "4.0" +clang-format==17.0.1 ; python_version >= "3.9" and python_version < "4.0" +click==8.1.3 ; python_version >= "3.9" and python_version < "4.0" +cmsis-pack-manager==0.5.2 ; python_version >= "3.9" and python_version < "4.0" +colorama==0.4.6 ; python_version >= "3.9" and python_version < "4.0" +coverage==7.6.1 ; python_version >= "3.9" and python_version < "4.0" +cryptography==43.0.1 ; python_version >= "3.9" and python_version < "4.0" +deprecated==1.2.14 ; python_version >= "3.9" and python_version < "4.0" +devicetree==0.0.2 ; python_version >= "3.9" and python_version < "4.0" +dill==0.3.7 ; python_version >= "3.9" and python_version < "4.0" +docopt==0.6.2 ; python_version >= "3.9" and python_version < "4.0" +ecdsa==0.19.0 ; python_version >= "3.9" and python_version < "4.0" +editdistance==0.8.1 ; python_version >= "3.9" and python_version < "4.0" +exceptiongroup==1.2.2 ; python_version >= "3.9" and python_version < "3.11" +future==0.18.3 ; python_version >= "3.9" and python_version < "4.0" +gcovr==6.0 ; python_version >= "3.9" and python_version < "4.0" +gitdb==4.0.10 ; python_version >= "3.9" and python_version < "4.0" +gitlint-core[trusted-deps]==0.19.1 ; python_version >= "3.9" and python_version < "4.0" +gitlint==0.19.1 ; python_version >= "3.9" and python_version < "4.0" +gitpython==3.1.41 ; python_version >= "3.9" and python_version < "4.0" +graphviz==0.20.3 ; python_version >= "3.9" and python_version < "4.0" +grpcio-tools==1.64.1 ; python_version >= "3.9" and python_version < "4.0" +grpcio==1.64.1 ; python_version >= "3.9" and python_version < "4.0" +hidapi==0.14.0.post2 ; python_version >= "3.9" and python_version < "4.0" and platform_system != "Linux" +idna==3.7 ; python_version >= "3.9" and python_version < "4.0" +imagesize==1.4.1 ; python_version >= "3.9" and python_version < "4.0" +imgtool==2.0.0 ; python_version >= "3.9" and python_version < "4.0" +importlib-metadata==6.8.0 ; python_version >= "3.9" and python_version < "4.0" +importlib-resources==6.1.0 ; python_version >= "3.9" and python_version < "4.0" +iniconfig==2.0.0 ; python_version >= "3.9" and python_version < "4.0" +intelhex==2.3.0 ; python_version >= "3.9" and python_version < "4.0" +intervaltree==3.1.0 ; python_version >= "3.9" and python_version < "4.0" +isort==5.12.0 ; python_version >= "3.9" and python_version < "4.0" +jinja2==3.1.4 ; python_version >= "3.9" and python_version < "4.0" +jsonschema-specifications==2023.7.1 ; python_version >= "3.9" and python_version < "4.0" +jsonschema==4.23.0 ; python_version >= "3.9" and python_version < "4.0" +junit2html==31.0.2 ; python_version >= "3.9" and python_version < "4.0" +junitparser==3.1.0 ; python_version >= "3.9" and python_version < "4.0" +lark==1.1.7 ; python_version >= "3.9" and python_version < "4.0" +libusb-package==1.0.26.1 ; python_version >= "3.9" and python_version < "4.0" +libusb==1.0.27 ; python_version >= "3.9" and python_version < "4.0" +lpc-checksum==3.0.0 ; python_version >= "3.9" and python_version < "4.0" +lxml==5.3.0 ; python_version >= "3.9" and python_version < "4.0" +markupsafe==2.1.3 ; python_version >= "3.9" and python_version < "4.0" +mccabe==0.7.0 ; python_version >= "3.9" and python_version < "4.0" +milksnake==0.1.6 ; python_version >= "3.9" and python_version < "4.0" +mock==5.1.0 ; python_version >= "3.9" and python_version < "4.0" +more-itertools==10.2.0 ; python_version >= "3.9" and python_version < "4.0" +msgpack==1.0.5 ; python_version >= "3.9" and python_version < "4.0" and platform_system != "Windows" +mypy-extensions==1.0.0 ; python_version >= "3.9" and python_version < "4.0" +mypy==1.11.2 ; python_version >= "3.9" and python_version < "4.0" +natsort==8.4.0 ; python_version >= "3.9" and python_version < "4.0" +nrf-regtool==6.0.0 ; python_version >= "3.9" and python_version < "4.0" +nrfcredstore==1.0.0 ; python_version >= "3.9" and python_version < "4.0" +numpy==1.26.4 ; python_version >= "3.9" and python_version < "4.0" +packaging==24.1 ; python_version >= "3.9" and python_version < "4.0" +pathspec==0.11.2 ; python_version >= "3.9" and python_version < "4.0" +pillow==10.3.0 ; python_version >= "3.9" and python_version < "4.0" +pkg-about==1.1.5 ; python_version >= "3.9" and python_version < "4.0" +platformdirs==3.10.0 ; python_version >= "3.9" and python_version < "4.0" +pluggy==1.5.0 ; python_version >= "3.9" and python_version < "4.0" +ply==3.11 ; python_version >= "3.9" and python_version < "4.0" +prettytable==3.9.0 ; python_version >= "3.9" and python_version < "4.0" +progress==1.6 ; python_version >= "3.9" and python_version < "4.0" +protobuf==5.27.1 ; python_version >= "3.9" and python_version < "4.0" +psutil==6.0.0 ; python_version >= "3.9" and python_version < "4.0" +py==1.11.0 ; python_version >= "3.9" and python_version < "4.0" +pycparser==2.21 ; python_version >= "3.9" and python_version < "4.0" +pyelftools==0.30 ; python_version >= "3.9" and python_version < "4.0" +pygit2==1.15.0 ; python_version >= "3.9" and python_version < "4.0" +pygithub==2.4.0 ; python_version >= "3.9" and python_version < "4.0" +pygments==2.16.1 ; python_version >= "3.9" and python_version < "4.0" +pyjwt[crypto]==2.8.0 ; python_version >= "3.9" and python_version < "4.0" +pykwalify==1.8.0 ; python_version >= "3.9" and python_version < "4.0" +pylink-square==1.3.0 ; python_version >= "3.9" and python_version < "4.0" +pylint==3.0.2 ; python_version >= "3.9" and python_version < "4.0" +pynacl==1.5.0 ; python_version >= "3.9" and python_version < "4.0" +pyocd==0.35.1 ; python_version >= "3.9" and python_version < "4.0" +pyparsing==3.1.4 ; python_version >= "3.9" and python_version < "4.0" +pypng==0.20220715.0 ; python_version >= "3.9" and python_version < "4.0" +pyserial==3.5 ; python_version >= "3.9" and python_version < "4.0" +pytest==8.3.3 ; python_version >= "3.9" and python_version < "4.0" +python-can==4.2.2 ; python_version >= "3.9" and python_version < "4.0" +python-dateutil==2.8.2 ; python_version >= "3.9" and python_version < "4.0" +python-magic-bin==0.4.14 ; python_version >= "3.9" and python_version < "4.0" and sys_platform == "win32" +python-magic==0.4.27 ; python_version >= "3.9" and python_version < "4.0" +python-stdnum==1.20 ; python_version >= "3.9" and python_version < "4.0" +pytz==2024.2 ; python_version >= "3.9" and python_version < "4.0" +pyusb==1.2.1 ; python_version >= "3.9" and python_version < "4.0" +pywin32==306 ; platform_system == "Windows" and platform_python_implementation == "CPython" and python_version >= "3.9" and python_version < "4.0" +pyyaml==6.0.1 ; python_version >= "3.9" and python_version < "4.0" +qrcode==7.4.2 ; python_version >= "3.9" and python_version < "4.0" +referencing==0.30.2 ; python_version >= "3.9" and python_version < "4.0" +regex==2023.8.8 ; python_version >= "3.9" and python_version < "4.0" +requests==2.32.3 ; python_version >= "3.9" and python_version < "4.0" +rpds-py==0.20.0 ; python_version >= "3.9" and python_version < "4.0" +ruamel-yaml-clib==0.2.8 ; platform_python_implementation == "CPython" and python_version < "3.12" and python_version >= "3.9" +ruamel-yaml==0.17.32 ; python_version >= "3.9" and python_version < "4.0" +setuptools-scm[toml]==8.0.4 ; python_version >= "3.9" and python_version < "4.0" +setuptools==70.1.0 ; python_version >= "3.9" and python_version < "4.0" +sh==1.14.3 ; python_version >= "3.9" and python_version < "4.0" and sys_platform != "win32" +six==1.16.0 ; python_version >= "3.9" and python_version < "4.0" +smmap==5.0.1 ; python_version >= "3.9" and python_version < "4.0" +sortedcontainers==2.4.0 ; python_version >= "3.9" and python_version < "4.0" +stringcase==1.2.0 ; python_version >= "3.9" and python_version < "4.0" +svada==2.0.2 ; python_version >= "3.9" and python_version < "4.0" +tabulate==0.9.0 ; python_version >= "3.9" and python_version < "4.0" +toml==0.10.2 ; python_version >= "3.9" and python_version < "4.0" +tomli==2.0.1 ; python_version >= "3.9" and python_version < "4.0" +tomlkit==0.12.1 ; python_version >= "3.9" and python_version < "4.0" +typed-ast==1.5.5 ; python_version >= "3.9" and python_version < "4.0" +typing-extensions==4.8.0 ; python_version >= "3.9" and python_version < "4.0" +urllib3==2.2.2 ; python_version >= "3.9" and python_version < "4.0" +wcwidth==0.2.6 ; python_version >= "3.9" and python_version < "4.0" +west==1.2.0 ; python_version >= "3.9" and python_version < "4.0" +wget==3.2 ; python_version >= "3.9" and python_version < "4.0" +windows-curses==2.3.3 ; python_version >= "3.9" and python_version < "4.0" and sys_platform == "win32" +wrapt==1.15.0 ; python_version >= "3.9" and python_version < "4.0" +yamllint==1.35.1 ; python_version >= "3.9" and python_version < "4.0" +zcbor==0.8.1 ; python_version >= "3.9" and python_version < "4.0" +zipp==3.17.0 ; python_version >= "3.9" and python_version < "4.0"