Skip to content

Commit 7febb9f

Browse files
karhamanordicjm
authored andcommitted
ci: add ncs-sbom requirements to requirements-fixed
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 <[email protected]>
1 parent c2de47a commit 7febb9f

4 files changed

+63
-9
lines changed

.github/workflows/validate-pip-requirements-fixed-file.yml

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ on:
88
- 'v*-branch'
99
paths:
1010
- 'scripts/requirements*.txt'
11+
- '.github/workflows/validate-pip-requirements-fixed-file.yml'
12+
1113

1214
jobs:
1315
check-requirements:
@@ -65,6 +67,7 @@ jobs:
6567
nrf/scripts/requirements-extra.txt \
6668
nrf/scripts/requirements.txt \
6769
zephyr/scripts/requirements.txt \
70+
nrf/scripts/requirements-west-ncs-sbom.txt \
6871
--output-file nrf/scripts/requirements-fixed.txt \
6972
--min-python-version 3.10
7073

.github/workflows/west-commands.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
pip3 install -U setuptools
2727
pip3 install -U wheel
2828
pip3 install -U mypy types-colorama types-editdistance types-PyYAML
29-
grep -E "west==" scripts/requirements-fixed.txt | cut -f1 -d"#" | xargs pip3 install -U
29+
grep -E "west==" scripts/requirements-fixed.txt | cut -f1 -d"#" | cut -d ' ' -f '1'| xargs pip3 install -U
3030
pip3 show -f west
3131
- name: Run mypy
3232
working-directory: ncs/nrf/scripts/west_commands

scripts/requirements-fixed.txt

+58-7
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,20 @@
22
# This file is autogenerated by pip-compile-cross-platform
33
# To update, run:
44
#
5-
# 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
5+
# 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
66
#
77
aenum==3.1.15 ; python_version >= "3.10" and python_version < "4.0"
88
anytree==2.12.1 ; python_version >= "3.10" and python_version < "4"
99
appdirs==1.4.4 ; python_version >= "3.10" and python_version < "4.0"
1010
arrow==1.2.3 ; python_version >= "3.10" and python_version < "4.0"
1111
astroid==3.0.1 ; python_version >= "3.10" and python_version < "4.0"
1212
attrs==23.1.0 ; python_version >= "3.10" and python_version < "4.0"
13-
bitarray==2.9.3 ; python_version >= "3.10" and python_version < "4.0"
13+
banal==1.0.6 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
14+
beautifulsoup4==4.12.3 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
15+
beautifulsoup4[chardet]==4.12.3 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
16+
binaryornot==0.4.4 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
17+
bitarray==3.0.0 ; python_version >= "3.10" and python_version < "4.0"
18+
boolean-py==4.0 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
1419
bz==1.0 ; python_version >= "3.10" and python_version < "4.0"
1520
canopen==2.3.0 ; python_version >= "3.10" and python_version < "4.0"
1621
capstone==4.0.2 ; python_version >= "3.10" and python_version < "4.0"
@@ -24,17 +29,29 @@ clang-format==17.0.1 ; python_version >= "3.10" and python_version < "4.0"
2429
click==8.1.3 ; python_version >= "3.10" and python_version < "4.0"
2530
cmsis-pack-manager==0.5.2 ; python_version >= "3.10" and python_version < "4.0"
2631
colorama==0.4.6 ; python_version >= "3.10" and python_version < "4.0"
27-
coverage==7.6.3 ; python_version >= "3.10" and python_version < "4.0"
32+
commoncode==32.0.0 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
33+
container-inspector==33.0.0 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
34+
coverage==7.6.4 ; python_version >= "3.10" and python_version < "4.0"
2835
cryptography==43.0.1 ; python_version >= "3.10" and python_version < "4.0"
36+
debian-inspector==31.1.0 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
2937
deprecated==1.2.14 ; python_version >= "3.10" and python_version < "4.0"
3038
devicetree==0.0.2 ; python_version >= "3.10" and python_version < "4.0"
3139
dill==0.3.7 ; python_version >= "3.10" and python_version < "4.0"
40+
dockerfile-parse==2.0.1 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
3241
docopt==0.6.2 ; python_version >= "3.10" and python_version < "4.0"
42+
dparse2==0.7.0 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
3343
ecdsa==0.19.0 ; python_version >= "3.10" and python_version < "4.0"
3444
editdistance==0.8.1 ; python_version >= "3.10" and python_version < "4.0"
3545
exceptiongroup==1.2.2 ; python_version >= "3.10" and python_version < "3.11"
46+
extractcode-7z==16.5.210531 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
47+
extractcode-libarchive==3.5.1.210531 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
48+
extractcode[full]==31.0.0 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
49+
fasteners==0.19 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
50+
fingerprints==1.2.3 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
51+
ftfy==6.3.0 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
3652
future==0.18.3 ; python_version >= "3.10" and python_version < "4.0"
3753
gcovr==6.0 ; python_version >= "3.10" and python_version < "4.0"
54+
gemfileparser2==0.9.4 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
3855
gitdb==4.0.10 ; python_version >= "3.10" and python_version < "4.0"
3956
gitlint-core[trusted-deps]==0.19.1 ; python_version >= "3.10" and python_version < "4.0"
4057
gitlint==0.19.1 ; python_version >= "3.10" and python_version < "4.0"
@@ -43,23 +60,31 @@ graphviz==0.20.3 ; python_version >= "3.10" and python_version < "4.0"
4360
grpcio-tools==1.64.1 ; python_version >= "3.10" and python_version < "4.0"
4461
grpcio==1.64.1 ; python_version >= "3.10" and python_version < "4.0"
4562
hidapi==0.14.0.post2 ; python_version >= "3.10" and python_version < "4.0" and platform_system != "Linux"
63+
html5lib-modern==1.2 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
64+
html5lib==1.1 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
4665
idna==3.7 ; python_version >= "3.10" and python_version < "4.0"
4766
imagesize==1.4.1 ; python_version >= "3.10" and python_version < "4.0"
4867
imgtool==2.1.0 ; python_version >= "3.10" and python_version < "4.0"
4968
importlib-metadata==6.8.0 ; python_version >= "3.10" and python_version < "4.0"
5069
importlib-resources==6.1.0 ; python_version >= "3.10" and python_version < "4.0"
5170
iniconfig==2.0.0 ; python_version >= "3.10" and python_version < "4.0"
71+
intbitset==3.1.0 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
5272
intelhex==2.3.0 ; python_version >= "3.10" and python_version < "4.0"
5373
intervaltree==3.1.0 ; python_version >= "3.10" and python_version < "4.0"
74+
isodate==0.7.2 ; python_version >= "3.10" and python_version < "3.11" and platform_machine == "x86_64"
5475
isort==5.12.0 ; python_version >= "3.10" and python_version < "4.0"
76+
jaraco-functools==4.1.0 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
77+
javaproperties==0.8.1 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
5578
jinja2==3.1.4 ; python_version >= "3.10" and python_version < "4.0"
5679
jsonschema-specifications==2023.7.1 ; python_version >= "3.10" and python_version < "4.0"
5780
jsonschema==4.23.0 ; python_version >= "3.10" and python_version < "4.0"
81+
jsonstreams==0.6.0 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
5882
junit2html==31.0.2 ; python_version >= "3.10" and python_version < "4.0"
5983
junitparser==3.1.0 ; python_version >= "3.10" and python_version < "4.0"
6084
lark==1.1.7 ; python_version >= "3.10" and python_version < "4.0"
6185
libusb-package==1.0.26.1 ; python_version >= "3.10" and python_version < "4.0"
6286
libusb==1.0.27 ; python_version >= "3.10" and python_version < "4.0"
87+
license-expression==30.3.1 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
6388
lpc-checksum==3.0.0 ; python_version >= "3.10" and python_version < "4.0"
6489
lxml==5.3.0 ; python_version >= "3.10" and python_version < "4.0"
6590
markupsafe==2.1.3 ; python_version >= "3.10" and python_version < "4.0"
@@ -69,34 +94,47 @@ mock==5.1.0 ; python_version >= "3.10" and python_version < "4.0"
6994
more-itertools==10.2.0 ; python_version >= "3.10" and python_version < "4.0"
7095
msgpack==1.0.5 ; python_version >= "3.10" and python_version < "4.0" and platform_system != "Windows"
7196
mypy-extensions==1.0.0 ; python_version >= "3.10" and python_version < "4.0"
72-
mypy==1.12.0 ; python_version >= "3.10" and python_version < "4.0"
97+
mypy==1.13.0 ; python_version >= "3.10" and python_version < "4.0"
7398
natsort==8.4.0 ; python_version >= "3.10" and python_version < "4.0"
99+
normality==2.5.0 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
74100
nrf-regtool==6.0.0 ; python_version >= "3.10" and python_version < "4.0"
75101
nrfcredstore==1.0.0 ; python_version >= "3.10" and python_version < "4.0"
76102
numpy==1.26.4 ; python_version >= "3.10" and python_version < "4.0"
103+
packageurl-python==0.16.0 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
77104
packaging==24.1 ; python_version >= "3.10" and python_version < "4.0"
105+
packvers==21.5 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
106+
parameter-expansion-patched==0.3.1 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
78107
pathspec==0.11.2 ; python_version >= "3.10" and python_version < "4.0"
79-
patool==3.0.1 ; python_version >= "3.10" and python_version < "4.0"
108+
patool==3.0.2 ; python_version >= "3.10" and python_version < "4.0"
109+
pdfminer-six==20240706 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
110+
pefile==2024.8.26 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
80111
pillow==10.3.0 ; python_version >= "3.10" and python_version < "4.0"
112+
pip-requirements-parser==32.0.1 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
81113
pkg-about==1.1.5 ; python_version >= "3.10" and python_version < "4.0"
114+
pkginfo2==30.0.0 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
82115
platformdirs==3.10.0 ; python_version >= "3.10" and python_version < "4.0"
83116
pluggy==1.5.0 ; python_version >= "3.10" and python_version < "4.0"
117+
plugincode==32.0.0 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
84118
ply==3.11 ; python_version >= "3.10" and python_version < "4.0"
85119
polib==1.2.0 ; python_version >= "3.10" and python_version < "4.0"
86120
prettytable==3.9.0 ; python_version >= "3.10" and python_version < "4.0"
87121
progress==1.6 ; python_version >= "3.10" and python_version < "4.0"
88122
protobuf==5.27.1 ; python_version >= "3.10" and python_version < "4.0"
89-
psutil==6.0.0 ; python_version >= "3.10" and python_version < "4.0"
123+
psutil==6.1.0 ; python_version >= "3.10" and python_version < "4.0"
124+
publicsuffix2==2.20191221 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
90125
py==1.11.0 ; python_version >= "3.10" and python_version < "4.0"
126+
pyahocorasick==2.1.0 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
91127
pycparser==2.21 ; python_version >= "3.10" and python_version < "4.0"
92128
pyelftools==0.30 ; python_version >= "3.10" and python_version < "4.0"
93129
pygit2==1.15.0 ; python_version >= "3.10" and python_version < "4.0"
94130
pygithub==2.4.0 ; python_version >= "3.10" and python_version < "4.0"
131+
pygmars==0.9.0 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
95132
pygments==2.16.1 ; python_version >= "3.10" and python_version < "4.0"
96133
pyjwt[crypto]==2.8.0 ; python_version >= "3.10" and python_version < "4.0"
97134
pykwalify==1.8.0 ; python_version >= "3.10" and python_version < "4.0"
98135
pylink-square==1.3.0 ; python_version >= "3.10" and python_version < "4.0"
99136
pylint==3.0.2 ; python_version >= "3.10" and python_version < "4.0"
137+
pymaven-patch==0.3.2 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
100138
pynacl==1.5.0 ; python_version >= "3.10" and python_version < "4.0"
101139
pyocd==0.35.1 ; python_version >= "3.10" and python_version < "4.0"
102140
pyparsing==3.2.0 ; python_version >= "3.10" and python_version < "4.0"
@@ -112,34 +150,47 @@ pyusb==1.2.1 ; python_version >= "3.10" and python_version < "4.0"
112150
pywin32==306 ; platform_system == "Windows" and platform_python_implementation == "CPython" and python_version >= "3.10" and python_version < "4.0"
113151
pyyaml==6.0.1 ; python_version >= "3.10" and python_version < "4.0"
114152
qrcode==8.0 ; python_version >= "3.10" and python_version < "4.0"
153+
rdflib==7.1.0 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
115154
referencing==0.30.2 ; python_version >= "3.10" and python_version < "4.0"
116155
regex==2024.9.11 ; python_version >= "3.10" and python_version < "4.0"
117156
requests==2.32.3 ; python_version >= "3.10" and python_version < "4.0"
157+
requests[use-chardet-on-py3]==2.32.3 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
118158
rpds-py==0.20.0 ; python_version >= "3.10" and python_version < "4.0"
119159
ruamel-yaml-clib==0.2.8 ; platform_python_implementation == "CPython" and python_version < "3.12" and python_version >= "3.10"
120160
ruamel-yaml==0.17.32 ; python_version >= "3.10" and python_version < "4.0"
161+
saneyaml==0.6.1 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
162+
scancode-toolkit[full]==31.2.6 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
121163
semver==3.0.2 ; python_version >= "3.10" and python_version < "4.0"
122164
setuptools-scm[toml]==8.0.4 ; python_version >= "3.10" and python_version < "4.0"
123-
setuptools==75.1.0 ; python_version >= "3.10" and python_version < "4.0"
165+
setuptools==75.2.0 ; python_version >= "3.10" and python_version < "4.0"
124166
sh==1.14.3 ; python_version >= "3.10" and python_version < "4.0" and sys_platform != "win32"
125167
six==1.16.0 ; python_version >= "3.10" and python_version < "4.0"
126168
smmap==5.0.1 ; python_version >= "3.10" and python_version < "4.0"
127169
sortedcontainers==2.4.0 ; python_version >= "3.10" and python_version < "4.0"
170+
soupsieve==2.6 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
171+
spdx-tools==0.7.0a3 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
128172
sphinx-lint==1.0.0 ; python_version >= "3.10" and python_version < "4.0"
129173
stringcase==1.2.0 ; python_version >= "3.10" and python_version < "4.0"
130174
svada==2.0.0 ; python_version >= "3.10" and python_version < "4.0"
131175
tabulate==0.9.0 ; python_version >= "3.10" and python_version < "4.0"
176+
text-unidecode==1.3 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
132177
toml==0.10.2 ; python_version >= "3.10" and python_version < "4.0"
133178
tomli==2.0.1 ; python_version >= "3.10" and python_version < "4.0"
134179
tomlkit==0.12.1 ; python_version >= "3.10" and python_version < "4.0"
180+
typecode-libmagic==5.39.210531 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
181+
typecode==30.0.2 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
182+
typecode[full]==30.0.2 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
135183
typing-extensions==4.8.0 ; python_version >= "3.10" and python_version < "4.0"
136184
unidiff==0.7.5 ; python_version >= "3.10" and python_version < "4.0"
137185
urllib3==2.2.2 ; python_version >= "3.10" and python_version < "4.0"
186+
urlpy==0.5 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
138187
wcwidth==0.2.6 ; python_version >= "3.10" and python_version < "4.0"
188+
webencodings==0.5.1 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
139189
west==1.2.0 ; python_version >= "3.10" and python_version < "4.0"
140190
wget==3.2 ; python_version >= "3.10" and python_version < "4.0"
141191
windows-curses==2.4.0 ; python_version >= "3.10" and python_version < "4.0" and sys_platform == "win32"
142192
wrapt==1.15.0 ; python_version >= "3.10" and python_version < "4.0"
193+
xmltodict==0.14.2 ; python_version >= "3.10" and python_version < "4.0" and platform_machine == "x86_64"
143194
yamllint==1.35.1 ; python_version >= "3.10" and python_version < "4.0"
144195
zcbor==0.8.1 ; python_version >= "3.10" and python_version < "4.0"
145196
zipp==3.17.0 ; python_version >= "3.10" and python_version < "4.0"
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
jinja2
2-
scancode-toolkit[full]==31.2.6
2+
scancode-toolkit[full]==31.2.6 ; platform_machine == "x86_64"

0 commit comments

Comments
 (0)