Skip to content

Commit 630e344

Browse files
gmarullthst-nordic
authored andcommitted
Revert "tools: adding pip requirements check workflow"
This reverts commit 492d00b. Signed-off-by: Gerard Marull-Paretas <[email protected]>
1 parent 492d00b commit 630e344

File tree

9 files changed

+100
-246
lines changed

9 files changed

+100
-246
lines changed

.github/workflows/pip-requirements.yml

Lines changed: 0 additions & 81 deletions
This file was deleted.

scripts/fix-requirements.sh

Lines changed: 0 additions & 36 deletions
This file was deleted.

scripts/requirements-build.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,4 @@ imagesize>=1.2.0
66
intelhex
77
protobuf
88
pylint
9-
zcbor==0.6.0
9+
zcbor>=0.7.0

scripts/requirements-ci.txt

Lines changed: 0 additions & 15 deletions
This file was deleted.

scripts/requirements-extra.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
pygit2<=1.10
22
editdistance>=0.5.0
33
PyGithub
4+
zcbor>=0.5.1

scripts/requirements-fixed.txt

Lines changed: 96 additions & 109 deletions
Original file line numberDiff line numberDiff line change
@@ -1,130 +1,117 @@
1-
##### Generated Python Requirements #####
2-
##### Do not edit this file manually #####
31
###########################################################
4-
##### Merged inputs: #####
5-
##### bootloader/mcuboot/scripts/requirements.txt #####
6-
##### zephyr/scripts/requirements.txt #####
7-
##### nrf/scripts/requirements.txt #####
2+
##### Fixed Python Requirements #####
3+
###########################################################
84

9-
aenum==3.1.15
10-
anytree==2.9.0
5+
Babel==2.9.1
6+
Jinja2==2.11.3
7+
MarkupSafe==1.1.1
8+
Pillow==9.4.0
9+
PyYAML==5.4.1
10+
Pygments==2.7.4
11+
Sphinx==3.4.3
12+
aenum==3.0.0
13+
alabaster==0.7.12
14+
anytree==2.8.0
1115
appdirs==1.4.4
12-
arrow==1.2.1
13-
astroid==2.15.6
14-
attrs==23.1.0
15-
bitarray==2.8.1
16-
canopen==2.1.0
17-
capstone==4.0.2
18-
cbor2==5.4.6
16+
arrow==0.17.0
17+
astroid==2.15.0
18+
attrs==20.3.0
19+
bitarray==2.7.3
20+
breathe==4.26.1
21+
canopen==1.2.0
22+
cbor2==5.4.3
1923
cbor==1.0.0
2024
certifi==2023.7.22
21-
cffi==1.15.1
22-
chardet==5.2.0
23-
charset-normalizer==3.2.0
24-
clang-format==16.0.6
25-
click==8.0.3
26-
cmsis-pack-manager==0.5.2
25+
cffi==1.14.4
26+
chardet==4.0.0
27+
charset-normalizer==3.1.0
28+
click==7.1.2
29+
cmsis-pack-manager==0.2.10
2730
colorama==0.4.6
28-
coverage==7.3.0
31+
commonmark==0.9.1
32+
coverage==5.4
2933
cryptography==41.0.3
30-
Deprecated==1.2.14
31-
dill==0.3.7
3234
docopt==0.6.2
33-
ecdsa==0.18.0
34-
editdistance==0.6.2
35-
exceptiongroup==1.1.3
35+
docutils==0.16
36+
ecdsa==0.16.1
3637
future==0.18.3
37-
gcovr==6.0
38-
gitlint-core==0.18.0
39-
gitlint==0.18.0
40-
graphviz==0.20.1
41-
grpcio-tools==1.57.0
42-
grpcio==1.57.0
43-
idna==3.4
44-
imagesize==1.4.1
45-
imgtool==1.10.0
46-
importlib-metadata==6.8.0
47-
importlib-resources==6.0.1
48-
iniconfig==2.0.0
38+
gcovr==4.2
39+
gitlint==0.15.0
40+
grpcio-tools==1.51.1
41+
idna==2.10
42+
imagesize==1.2.0
43+
imgtool==1.7.0
44+
importlib-metadata==3.4.0
45+
iniconfig==1.1.1
4946
intelhex==2.3.0
5047
intervaltree==3.1.0
51-
isort==5.12.0
52-
Jinja2==3.1.2
53-
jsonschema-specifications==2023.7.1
54-
jsonschema==4.19.0
55-
junit2html==30.1.3
56-
junitparser==3.1.0
57-
lark==1.1.7
58-
lazy-object-proxy==1.9.0
59-
libusb-package==1.0.26.2
48+
isort==5.7.0
49+
jsonschema==4.4.0
50+
junit2html==30.0.4
51+
junitparser==2.8.0
52+
lazy-object-proxy==1.4.3
6053
lpc-checksum==2.2.0
61-
lxml==4.9.3
62-
MarkupSafe==2.1.3
63-
mccabe==0.7.0
54+
lxml==4.9.1
55+
mccabe==0.6.1
6456
milksnake==0.1.5
65-
mock==5.1.0
66-
msgpack==1.0.5
67-
mypy-extensions==1.0.0
68-
mypy==1.5.1
69-
natsort==8.4.0
70-
packaging==23.1
71-
pathspec==0.11.2
72-
Pillow==10.0.0
73-
pip==23.2.1
74-
pkgutil_resolve_name==1.3.10
75-
platformdirs==3.10.0
76-
pluggy==1.3.0
57+
mock==4.0.3
58+
mypy-extensions==0.4.3
59+
mypy==0.921
60+
natsort==8.3.1
61+
packaging==20.8
62+
pluggy==0.13.1
7763
ply==3.11
78-
prettytable==3.8.0
79-
progress==1.6
80-
protobuf==4.24.2
81-
psutil==5.9.5
82-
py==1.11.0
83-
pycparser==2.21
84-
pyelftools==0.29
64+
prettytable==2.0.0
65+
progress==1.5
66+
psutil==5.8.0
67+
py==1.10.0
68+
pycparser==2.20
69+
pyelftools==0.27
8570
pygit2==1.10.0
86-
PyGithub==1.59.1
87-
Pygments==2.16.1
88-
PyJWT==2.8.0
8971
pykwalify==1.8.0
90-
pylink-square==1.2.0
91-
pylint==2.17.5
92-
PyNaCl==1.5.0
93-
pyocd==0.35.1
94-
pyparsing==3.1.1
95-
pypng==0.20220715.0
72+
pylink-square==0.8.1
73+
pylint==2.16.4
74+
pyocd==0.29.0
75+
pyparsing==2.4.7
9676
pyserial==3.5
97-
pytest==7.4.0
98-
python-can==4.2.2
99-
python-dateutil==2.8.2
100-
python-magic==0.4.27
101-
python-stdnum==1.19
102-
pytz==2023.3
103-
pyusb==1.2.1
104-
PyYAML==6.0.1
105-
qrcode==7.4.2
106-
referencing==0.30.2
107-
regex==2023.8.8
77+
pytest==6.2.2
78+
python-can==3.3.4
79+
python-dateutil==2.8.1
80+
python-magic==0.4.18
81+
python-stdnum==1.18
82+
pytz==2020.5
83+
pyusb==1.2.0
84+
qrcode==7.3.1
85+
recommonmark==0.6.0
86+
regex==2022.3.15
10887
requests==2.31.0
109-
rpds-py==0.10.0
110-
ruamel.yaml.clib==0.2.7
111-
ruamel.yaml==0.17.32
112-
setuptools==68.0.0
113-
sh==1.14.2
114-
six==1.16.0
115-
sortedcontainers==2.4.0
116-
tabulate==0.9.0
88+
ruamel.yaml.clib==0.2.6
89+
ruamel.yaml==0.17.21
90+
sh==1.14.1
91+
six==1.15.0
92+
snowballstemmer==2.1.0
93+
sortedcontainers==2.3.0
94+
sphinx-rtd-theme==0.5.1
95+
sphinx-tabs==2.0.0
96+
sphinxcontrib-applehelp==1.0.2
97+
sphinxcontrib-devhelp==1.0.2
98+
sphinxcontrib-htmlhelp==1.0.3
99+
sphinxcontrib-jsmath==1.0.1
100+
sphinxcontrib-mscgen==0.5
101+
sphinxcontrib-qthelp==1.0.3
102+
sphinxcontrib-serializinghtml==1.1.4
103+
sphinxcontrib-svg2pdfconverter==1.1.1
104+
setuptools==65.5.1
105+
tabulate==0.8.7
117106
toml==0.10.2
118107
tomli==2.0.1
119-
tomlkit==0.12.1
120-
typed-ast==1.5.5
121-
typing_extensions==4.7.1
122-
urllib3==2.0.4
123-
wcwidth==0.2.6
124-
west==1.1.0
108+
typed-ast==1.5.4
109+
typing-extensions==4.4.0
110+
urllib3==2.0.3
111+
wcwidth==0.2.5
112+
west==1.0.0
125113
wget==3.2
126-
wheel==0.41.1
127-
wrapt==1.15.0
128-
yamllint==1.32.0
129-
zcbor==0.6.0
130-
zipp==3.16.2
114+
wrapt==1.12.1
115+
yamllint==1.30.0
116+
zcbor==0.5.1
117+
zipp==3.4.0

scripts/requirements.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
-r requirements-base.txt
22
-r requirements-build.txt
3-
-r requirements-ci.txt
4-
-r requirements-extra.txt

tests/modules/lib/zcbor/decode/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ project(test_zcbor_decode)
1212
find_program(ZCBOR zcbor REQUIRED)
1313

1414
set(zcbor_args
15-
code
1615
-c ${CMAKE_CURRENT_LIST_DIR}/../cddl/test.cddl
16+
code
1717
--output-c ${PROJECT_BINARY_DIR}/src/test_decode.c
1818
--output-h ${PROJECT_BINARY_DIR}/include/test_decode.h
1919
-t Test

tests/modules/lib/zcbor/encode/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ project(test_zcbor_encode)
1212
find_program(ZCBOR zcbor REQUIRED)
1313

1414
set(zcbor_args
15-
code
1615
-c ${CMAKE_CURRENT_LIST_DIR}/../cddl/test.cddl
16+
code
1717
--output-c ${PROJECT_BINARY_DIR}/src/test_encode.c
1818
--output-h ${PROJECT_BINARY_DIR}/include/test_encode.h
1919
-t Test

0 commit comments

Comments
 (0)