Skip to content

Commit

Permalink
ci: add ncs-sbom requirements to requirements-fixed
Browse files Browse the repository at this point in the history 
Start using requirements-west-ncs-sbom when generating
requirements-fixed.txt so that west ncs-sbom can be run
using toolchain bundles.

Signed-off-by: Kari Hamalainen <kari.hamalainen@nordicsemi.no>
  • Loading branch information
@karhama @nordicjm
karhama authored and nordicjm committed Oct 24, 2024
1 parent c2de47a commit 7febb9f
Show file tree
Hide file tree
Showing 4 changed files with 63 additions and 9 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/validate-pip-requirements-fixed-file.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ on:
- 'v*-branch'
paths:
- 'scripts/requirements*.txt'
- '.github/workflows/validate-pip-requirements-fixed-file.yml'


jobs:
check-requirements:
Expand Down Expand Up @@ -65,6 +67,7 @@ jobs:
nrf/scripts/requirements-extra.txt \
nrf/scripts/requirements.txt \
zephyr/scripts/requirements.txt \
nrf/scripts/requirements-west-ncs-sbom.txt \
--output-file nrf/scripts/requirements-fixed.txt \
--min-python-version 3.10
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/west-commands.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
pip3 install -U setuptools
pip3 install -U wheel
pip3 install -U mypy types-colorama types-editdistance types-PyYAML
grep -E "west==" scripts/requirements-fixed.txt | cut -f1 -d"#" | xargs pip3 install -U
grep -E "west==" scripts/requirements-fixed.txt | cut -f1 -d"#" | cut -d ' ' -f '1'| xargs pip3 install -U
pip3 show -f west
- name: Run mypy
working-directory: ncs/nrf/scripts/west_commands
Expand Down
65 changes: 58 additions & 7 deletions scripts/requirements-fixed.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,20 @@
# This file is autogenerated by pip-compile-cross-platform
# To update, run:
#
# 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.10
# 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 nrf/scripts/requirements-west-ncs-sbom.txt --output-file nrf/scripts/requirements-fixed.txt --min-python-version 3.10
#
aenum==3.1.15 ; python_version >= "3.10" and python_version < "4.0"
anytree==2.12.1 ; python_version >= "3.10" and python_version < "4"
appdirs==1.4.4 ; python_version >= "3.10" and python_version < "4.0"
arrow==1.2.3 ; python_version >= "3.10" and python_version < "4.0"
astroid==3.0.1 ; python_version >= "3.10" and python_version < "4.0"
attrs==23.1.0 ; python_version >= "3.10" and python_version < "4.0"
bitarray==2.9.3 ; python_version >= "3.10" and python_version < "4.0"
banal==1.0.6 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
beautifulsoup4==4.12.3 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
beautifulsoup4[chardet]==4.12.3 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
binaryornot==0.4.4 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
bitarray==3.0.0 ; python_version >= "3.10" and python_version < "4.0"
boolean-py==4.0 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
bz==1.0 ; python_version >= "3.10" and python_version < "4.0"
canopen==2.3.0 ; python_version >= "3.10" and python_version < "4.0"
capstone==4.0.2 ; python_version >= "3.10" and python_version < "4.0"
Expand All @@ -24,17 +29,29 @@ clang-format==17.0.1 ; python_version >= "3.10" and python_version < "4.0"
click==8.1.3 ; python_version >= "3.10" and python_version < "4.0"
cmsis-pack-manager==0.5.2 ; python_version >= "3.10" and python_version < "4.0"
colorama==0.4.6 ; python_version >= "3.10" and python_version < "4.0"
coverage==7.6.3 ; python_version >= "3.10" and python_version < "4.0"
commoncode==32.0.0 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
container-inspector==33.0.0 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
coverage==7.6.4 ; python_version >= "3.10" and python_version < "4.0"
cryptography==43.0.1 ; python_version >= "3.10" and python_version < "4.0"
debian-inspector==31.1.0 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
deprecated==1.2.14 ; python_version >= "3.10" and python_version < "4.0"
devicetree==0.0.2 ; python_version >= "3.10" and python_version < "4.0"
dill==0.3.7 ; python_version >= "3.10" and python_version < "4.0"
dockerfile-parse==2.0.1 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
docopt==0.6.2 ; python_version >= "3.10" and python_version < "4.0"
dparse2==0.7.0 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
ecdsa==0.19.0 ; python_version >= "3.10" and python_version < "4.0"
editdistance==0.8.1 ; python_version >= "3.10" and python_version < "4.0"
exceptiongroup==1.2.2 ; python_version >= "3.10" and python_version < "3.11"
extractcode-7z==16.5.210531 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
extractcode-libarchive==3.5.1.210531 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
extractcode[full]==31.0.0 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
fasteners==0.19 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
fingerprints==1.2.3 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
ftfy==6.3.0 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
future==0.18.3 ; python_version >= "3.10" and python_version < "4.0"
gcovr==6.0 ; python_version >= "3.10" and python_version < "4.0"
gemfileparser2==0.9.4 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
gitdb==4.0.10 ; python_version >= "3.10" and python_version < "4.0"
gitlint-core[trusted-deps]==0.19.1 ; python_version >= "3.10" and python_version < "4.0"
gitlint==0.19.1 ; python_version >= "3.10" and python_version < "4.0"
Expand All @@ -43,23 +60,31 @@ graphviz==0.20.3 ; python_version >= "3.10" and python_version < "4.0"
grpcio-tools==1.64.1 ; python_version >= "3.10" and python_version < "4.0"
grpcio==1.64.1 ; python_version >= "3.10" and python_version < "4.0"
hidapi==0.14.0.post2 ; python_version >= "3.10" and python_version < "4.0" and platform_system != "Linux"
html5lib-modern==1.2 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
html5lib==1.1 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
idna==3.7 ; python_version >= "3.10" and python_version < "4.0"
imagesize==1.4.1 ; python_version >= "3.10" and python_version < "4.0"
imgtool==2.1.0 ; python_version >= "3.10" and python_version < "4.0"
importlib-metadata==6.8.0 ; python_version >= "3.10" and python_version < "4.0"
importlib-resources==6.1.0 ; python_version >= "3.10" and python_version < "4.0"
iniconfig==2.0.0 ; python_version >= "3.10" and python_version < "4.0"
intbitset==3.1.0 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
intelhex==2.3.0 ; python_version >= "3.10" and python_version < "4.0"
intervaltree==3.1.0 ; python_version >= "3.10" and python_version < "4.0"
isodate==0.7.2 ; python_version >= "3.10" and python_version < "3.11" and platform_machine == "x86_64"
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"
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"
junit2html==31.0.2 ; python_version >= "3.10" and python_version < "4.0"
junitparser==3.1.0 ; python_version >= "3.10" and python_version < "4.0"
lark==1.1.7 ; python_version >= "3.10" and python_version < "4.0"
libusb-package==1.0.26.1 ; python_version >= "3.10" and python_version < "4.0"
libusb==1.0.27 ; python_version >= "3.10" and python_version < "4.0"
license-expression==30.3.1 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
lpc-checksum==3.0.0 ; python_version >= "3.10" and python_version < "4.0"
lxml==5.3.0 ; python_version >= "3.10" and python_version < "4.0"
markupsafe==2.1.3 ; python_version >= "3.10" and python_version < "4.0"
Expand All @@ -69,34 +94,47 @@ 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"
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.12.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==6.0.0 ; python_version >= "3.10" and python_version < "4.0"
nrfcredstore==1.0.0 ; python_version >= "3.10" and python_version < "4.0"
numpy==1.26.4 ; python_version >= "3.10" and python_version < "4.0"
packageurl-python==0.16.0 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
packaging==24.1 ; python_version >= "3.10" and python_version < "4.0"
packvers==21.5 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
parameter-expansion-patched==0.3.1 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
pathspec==0.11.2 ; python_version >= "3.10" and python_version < "4.0"
patool==3.0.1 ; python_version >= "3.10" and python_version < "4.0"
patool==3.0.2 ; python_version >= "3.10" and python_version < "4.0"
pdfminer-six==20240706 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
pefile==2024.8.26 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
pillow==10.3.0 ; python_version >= "3.10" and python_version < "4.0"
pip-requirements-parser==32.0.1 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
pkg-about==1.1.5 ; python_version >= "3.10" and python_version < "4.0"
pkginfo2==30.0.0 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
platformdirs==3.10.0 ; python_version >= "3.10" and python_version < "4.0"
pluggy==1.5.0 ; python_version >= "3.10" and python_version < "4.0"
plugincode==32.0.0 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
ply==3.11 ; python_version >= "3.10" and python_version < "4.0"
polib==1.2.0 ; python_version >= "3.10" and python_version < "4.0"
prettytable==3.9.0 ; python_version >= "3.10" and python_version < "4.0"
progress==1.6 ; python_version >= "3.10" and python_version < "4.0"
protobuf==5.27.1 ; python_version >= "3.10" and python_version < "4.0"
psutil==6.0.0 ; python_version >= "3.10" and python_version < "4.0"
psutil==6.1.0 ; python_version >= "3.10" and python_version < "4.0"
publicsuffix2==2.20191221 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
py==1.11.0 ; python_version >= "3.10" and python_version < "4.0"
pyahocorasick==2.1.0 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
pycparser==2.21 ; python_version >= "3.10" and python_version < "4.0"
pyelftools==0.30 ; python_version >= "3.10" and python_version < "4.0"
pygit2==1.15.0 ; python_version >= "3.10" and python_version < "4.0"
pygithub==2.4.0 ; python_version >= "3.10" and python_version < "4.0"
pygmars==0.9.0 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
pygments==2.16.1 ; python_version >= "3.10" and python_version < "4.0"
pyjwt[crypto]==2.8.0 ; python_version >= "3.10" and python_version < "4.0"
pykwalify==1.8.0 ; python_version >= "3.10" and python_version < "4.0"
pylink-square==1.3.0 ; python_version >= "3.10" and python_version < "4.0"
pylint==3.0.2 ; python_version >= "3.10" and python_version < "4.0"
pymaven-patch==0.3.2 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
pynacl==1.5.0 ; python_version >= "3.10" and python_version < "4.0"
pyocd==0.35.1 ; python_version >= "3.10" and python_version < "4.0"
pyparsing==3.2.0 ; python_version >= "3.10" and python_version < "4.0"
Expand All @@ -112,34 +150,47 @@ pyusb==1.2.1 ; python_version >= "3.10" and python_version < "4.0"
pywin32==306 ; platform_system == "Windows" and platform_python_implementation == "CPython" and python_version >= "3.10" and python_version < "4.0"
pyyaml==6.0.1 ; python_version >= "3.10" and python_version < "4.0"
qrcode==8.0 ; python_version >= "3.10" and python_version < "4.0"
rdflib==7.1.0 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
referencing==0.30.2 ; python_version >= "3.10" and python_version < "4.0"
regex==2024.9.11 ; python_version >= "3.10" and python_version < "4.0"
requests==2.32.3 ; python_version >= "3.10" and python_version < "4.0"
requests[use-chardet-on-py3]==2.32.3 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
rpds-py==0.20.0 ; python_version >= "3.10" and python_version < "4.0"
ruamel-yaml-clib==0.2.8 ; platform_python_implementation == "CPython" and python_version < "3.12" and python_version >= "3.10"
ruamel-yaml==0.17.32 ; python_version >= "3.10" and python_version < "4.0"
saneyaml==0.6.1 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
scancode-toolkit[full]==31.2.6 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
semver==3.0.2 ; python_version >= "3.10" and python_version < "4.0"
setuptools-scm[toml]==8.0.4 ; python_version >= "3.10" and python_version < "4.0"
setuptools==75.1.0 ; python_version >= "3.10" and python_version < "4.0"
setuptools==75.2.0 ; python_version >= "3.10" and python_version < "4.0"
sh==1.14.3 ; python_version >= "3.10" and python_version < "4.0" and sys_platform != "win32"
six==1.16.0 ; python_version >= "3.10" and python_version < "4.0"
smmap==5.0.1 ; python_version >= "3.10" and python_version < "4.0"
sortedcontainers==2.4.0 ; python_version >= "3.10" and python_version < "4.0"
soupsieve==2.6 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
spdx-tools==0.7.0a3 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
sphinx-lint==1.0.0 ; python_version >= "3.10" and python_version < "4.0"
stringcase==1.2.0 ; python_version >= "3.10" and python_version < "4.0"
svada==2.0.0 ; python_version >= "3.10" and python_version < "4.0"
tabulate==0.9.0 ; python_version >= "3.10" and python_version < "4.0"
text-unidecode==1.3 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
toml==0.10.2 ; python_version >= "3.10" and python_version < "4.0"
tomli==2.0.1 ; python_version >= "3.10" and python_version < "4.0"
tomlkit==0.12.1 ; python_version >= "3.10" and python_version < "4.0"
typecode-libmagic==5.39.210531 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
typecode==30.0.2 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
typecode[full]==30.0.2 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
typing-extensions==4.8.0 ; python_version >= "3.10" and python_version < "4.0"
unidiff==0.7.5 ; python_version >= "3.10" and python_version < "4.0"
urllib3==2.2.2 ; python_version >= "3.10" and python_version < "4.0"
urlpy==0.5 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
wcwidth==0.2.6 ; python_version >= "3.10" and python_version < "4.0"
webencodings==0.5.1 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
west==1.2.0 ; python_version >= "3.10" and python_version < "4.0"
wget==3.2 ; python_version >= "3.10" and python_version < "4.0"
windows-curses==2.4.0 ; python_version >= "3.10" and python_version < "4.0" and sys_platform == "win32"
wrapt==1.15.0 ; python_version >= "3.10" and python_version < "4.0"
xmltodict==0.14.2 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
yamllint==1.35.1 ; python_version >= "3.10" and python_version < "4.0"
zcbor==0.8.1 ; python_version >= "3.10" and python_version < "4.0"
zipp==3.17.0 ; python_version >= "3.10" and python_version < "4.0"
2 changes: 1 addition & 1 deletion scripts/requirements-west-ncs-sbom.txt
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
jinja2
scancode-toolkit[full]==31.2.6
scancode-toolkit[full]==31.2.6 ; platform_machine == "x86_64"

0 comments on commit 7febb9f

Please sign in to comment.