Skip to content

Commit 21049ed

Browse files
authored
esp32: remove idf requirements from requirements.all.txt (project-chip#41906)
* esp32: remove idf requirements from requirements.all.txt * remove esp-idf-kconfig installing from chef workflow
1 parent 7126705 commit 21049ed

File tree

6 files changed

+60
-121
lines changed

6 files changed

+60
-121
lines changed

.github/workflows/chef.yaml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -107,15 +107,6 @@ jobs:
107107
with:
108108
platform: esp32
109109

110-
# We cannot add esp-idf-kconfig==2.5.0 to rquirements.txt because it
111-
# will break the nuttx workflow which requires the older version of
112-
# the kconfiglib and esp-idf-kconfig==2.5.0 installs newer version
113-
# so, install it in in the virtual environment here
114-
- name: Install esp-idf-kconfig
115-
run: |
116-
./scripts/run_in_build_env.sh \
117-
"pip install esp-idf-kconfig==2.5.0"
118-
119110
- name: CI Examples ESP32
120111
shell: bash
121112
run: |

.github/workflows/examples-esp32.yaml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,15 +55,6 @@ jobs:
5555
with:
5656
gh-context: ${{ toJson(github) }}
5757

58-
# We cannot add esp-idf-kconfig==2.5.0 to rquirements.txt because it
59-
# will break the nuttx workflow which requires the older version of
60-
# the kconfiglib and esp-idf-kconfig==2.5.0 installs newer version
61-
# so, install it in in the virtual environment here
62-
- name: Install esp-idf-kconfig
63-
run: |
64-
./scripts/run_in_build_env.sh \
65-
"pip install esp-idf-kconfig==2.5.0"
66-
6758
- name: Build example All Clusters App(Target:ESP32C3)
6859
run: |
6960
./scripts/run_in_build_env.sh \

docs/platforms/esp32/setup_idf_chip.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ care of downloading GN, ninja, and setting up a Python environment with
5454
libraries used to build and test.
5555
5656
```
57-
source scripts/bootstrap.sh
57+
source scripts/bootstrap.sh -p all,esp32
5858
```
5959
6060
Whenever Matter environment is out of date, it can be updated by running above

scripts/setup/constraints.txt

Lines changed: 57 additions & 96 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44
#
55
# pip-compile --allow-unsafe --output-file=constraints.txt --strip-extras requirements.all.txt
66
#
7+
about-time==4.2.1
8+
# via alive-progress
9+
alive-progress==3.3.0
10+
# via -r ../tests/requirements.txt
711
anytree==2.8.0
812
# via -r requirements.memory.txt
913
appdirs==1.4.4
@@ -16,88 +20,69 @@ attrs==22.2.0
1620
# via jsonschema
1721
backcall==0.2.0
1822
# via ipython
19-
bitstring==3.1.9
20-
# via
21-
# -r requirements.esp32.txt
22-
# esptool
23+
bluezoo==1.0.2 ; sys_platform == "linux"
24+
# via -r ../tests/requirements.txt
2325
build==0.8.0
2426
# via
2527
# -r requirements.all.txt
2628
# pip-tools
27-
cachecontrol==0.12.11
28-
# via idf-component-manager
2929
cbor==1.0.0
3030
# via -r requirements.zephyr.txt
3131
cbor2==5.4.6
3232
# via -r requirements.zephyr.txt
3333
certifi==2022.12.7
3434
# via requests
35+
cffi==1.15.0 ; python_version < "3.13"
36+
# via
37+
# -r requirements.all.txt
38+
# cryptography
3539
charset-normalizer==3.0.1
3640
# via requests
3741
click==8.1.6
3842
# via
43+
# -r ../tests/requirements.txt
3944
# -r requirements.build.txt
40-
# -r requirements.esp32.txt
41-
# idf-component-manager
45+
# click-option-group
46+
# matter-idl
4247
# pip-tools
48+
click-option-group==0.5.9
49+
# via -r requirements.all.txt
4350
colorama==0.4.6
4451
# via
52+
# -r ../tests/requirements.txt
4553
# -r requirements.all.txt
46-
# idf-component-manager
4754
# west
4855
coloredlogs==15.0.1
49-
# via -r requirements.all.txt
50-
construct==2.10.70
5156
# via
52-
# -r requirements.esp32.txt
53-
# esp-coredump
54-
contextlib2==21.6.0
55-
# via
56-
# idf-component-manager
57-
# schema
58-
cryptography==43.0.0
59-
# via
60-
# -c constraints.esp32.txt
57+
# -r ../tests/requirements.txt
6158
# -r requirements.all.txt
62-
# esptool
59+
# -r requirements.build.txt
60+
# bluezoo
61+
# matter-idl
62+
cryptography==43.0.0
63+
# via -r requirements.all.txt
6364
cxxfilt==0.3.0
6465
# via -r requirements.memory.txt
6566
decorator==5.1.1
6667
# via ipython
6768
diskcache==5.4.0
68-
# via -r requirements.all.txt
69+
# via -r ../tests/requirements.txt
6970
distlib==0.3.6
7071
# via virtualenv
7172
docopt==0.6.2
7273
# via pykwalify
73-
ecdsa==0.19.0
74-
# via
75-
# -r requirements.esp32.txt
76-
# esptool
77-
esp-coredump==1.14.0
78-
# via esp-idf-monitor
79-
esp-idf-kconfig==1.5.0
80-
# via -r requirements.esp32.txt
81-
esp-idf-monitor==1.8.0
82-
# via -r requirements.esp32.txt
83-
esptool==4.10.0
84-
# via esp-coredump
8574
executing==1.2.0
8675
# via stack-data
8776
fastcore==1.5.28
8877
# via ghapi
8978
filelock==3.9.0
9079
# via virtualenv
91-
future==0.18.3
92-
# via
93-
# -r requirements.esp32.txt
94-
# idf-component-manager
9580
ghapi==1.0.3
9681
# via -r requirements.memory.txt
82+
graphemeu==0.7.2
83+
# via alive-progress
9784
humanfriendly==10.0
9885
# via coloredlogs
99-
idf-component-manager==2.4.1
100-
# via -r requirements.esp32.txt
10186
idna==3.4
10287
# via requests
10388
intelhex==2.3.0
@@ -107,27 +92,26 @@ ipython==8.11.0
10792
jedi==0.18.2
10893
# via ipython
10994
jinja2==3.0.3
110-
# via -r requirements.build.txt
95+
# via
96+
# -r requirements.build.txt
97+
# matter-idl
11198
jsonschema==4.17.3
11299
# via -r requirements.zephyr.txt
113-
kconfiglib==13.7.1
114-
# via esp-idf-kconfig
115100
lark==1.1.5
116101
# via
117-
# -r requirements.all.txt
118102
# -r requirements.build.txt
119-
lockfile==0.12.2
120-
# via cachecontrol
103+
# matter-idl
104+
# matter-yamltests
121105
markupsafe==2.1.2
122106
# via jinja2
123107
matplotlib-inline==0.1.6
124108
# via ipython
125109
mobly==1.12.1
126110
# via -r requirements.all.txt
127-
msgpack==1.0.4
128-
# via cachecontrol
129111
mypy==1.16.0
130-
# via -r requirements.all.txt
112+
# via
113+
# -r ../tests/requirements.txt
114+
# -r requirements.all.txt
131115
mypy-extensions==1.0.0
132116
# via mypy
133117
mypy-protobuf==3.5.0
@@ -139,12 +123,13 @@ packaging==23.0
139123
# build
140124
# fastcore
141125
# ghapi
142-
# idf-component-manager
143126
# west
144127
pandas==2.2.3 ; platform_machine != "aarch64" and platform_machine != "arm64"
145128
# via -r requirements.memory.txt
146129
parso==0.8.3
147130
# via jedi
131+
pathspec==0.12.1
132+
# via mypy
148133
pep517==0.13.0
149134
# via build
150135
pexpect==4.8.0
@@ -175,80 +160,50 @@ pure-eval==0.2.2
175160
# via stack-data
176161
pycparser==2.21
177162
# via cffi
178-
pyelftools==0.30
179-
# via
180-
# -c constraints.esp32.txt
181-
# esp-idf-monitor
182-
pygdbmi==0.9.0.2
183-
# via
184-
# -r requirements.esp32.txt
185-
# esp-coredump
186163
pygments==2.14.0
187164
# via ipython
188165
pykwalify==1.8.0
189166
# via west
190167
pyparsing==3.0.9
191-
# via -r requirements.esp32.txt
168+
# via bluezoo
192169
pyrsistent==0.19.3
193170
# via jsonschema
194-
pyserial==3.5
195-
# via
196-
# -c constraints.esp32.txt
197-
# esp-idf-monitor
198-
# esptool
199171
python-dateutil==2.8.2
200172
# via
201173
# pandas
202174
# pykwalify
203-
python-engineio==3.14.2
204-
# via python-socketio
205-
python-socketio==4.6.1
206-
# via -r requirements.esp32.txt
175+
python-path==0.1.3
176+
# via -r requirements.build.txt
207177
pytz==2022.7.1
208178
# via pandas
179+
pyventus==0.7.1
180+
# via bluezoo
209181
pyyaml==6.0.1
210182
# via
211-
# esptool
212-
# idf-component-manager
183+
# matter-yamltests
213184
# mobly
214185
# west
215-
reedsolo==1.5.4
216-
# via
217-
# -r requirements.esp32.txt
218-
# esptool
219186
requests==2.28.2
220-
# via
221-
# -r requirements.cirque.txt
222-
# cachecontrol
223-
# idf-component-manager
224-
# requests-file
225-
# requests-toolbelt
226-
requests-file==1.5.1
227-
# via idf-component-manager
228-
requests-toolbelt==0.10.1
229-
# via idf-component-manager
187+
# via -r requirements.cirque.txt
230188
ruamel-yaml==0.17.21
231189
# via pykwalify
232-
schema==0.7.5
233-
# via idf-component-manager
190+
sdbus==0.14.1.post0 ; sys_platform == "linux"
191+
# via
192+
# -r ../tests/requirements.txt
193+
# bluezoo
234194
six==1.16.0
235195
# via
236196
# anytree
237197
# asttokens
238-
# ecdsa
239-
# idf-component-manager
240198
# python-dateutil
241-
# python-engineio
242-
# python-socketio
243-
# requests-file
244199
stack-data==0.6.2
245200
# via ipython
246201
tabulate==0.9.0
247-
# via -r requirements.memory.txt
202+
# via
203+
# -r ../tests/requirements.txt
204+
# -r requirements.memory.txt
248205
tornado==6.2
249206
# via -r requirements.all.txt
250-
tqdm==4.64.1
251-
# via idf-component-manager
252207
traitlets==5.9.0
253208
# via
254209
# ipython
@@ -257,8 +212,14 @@ types-protobuf==5.29.1.20250208
257212
# via
258213
# -r requirements.all.txt
259214
# mypy-protobuf
215+
types-pyyaml==6.0.12.20250915
216+
# via -r ../tests/requirements.txt
260217
typing-extensions==4.8.0
261-
# via mypy
218+
# via
219+
# mypy
220+
# pyventus
221+
tzdata==2025.2
222+
# via pandas
262223
urllib3==1.26.14
263224
# via requests
264225
virtualenv==20.20.0
@@ -268,7 +229,7 @@ watchdog==2.3.1
268229
wcwidth==0.2.6
269230
# via prompt-toolkit
270231
websockets==10.4
271-
# via -r requirements.all.txt
232+
# via matter-yamltests
272233
west==1.2.0
273234
# via -r requirements.zephyr.txt
274235
wheel==0.38.4 ; sys_platform == "linux"

scripts/setup/requirements.all.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,6 @@ virtualenv
44
# core build requirements
55
-r requirements.build.txt
66

7-
# esp-idf
8-
-c constraints.esp32.txt
9-
-r requirements.esp32.txt
10-
117
-r requirements.zephyr.txt
128
-r requirements.cirque.txt
139
-r requirements.memory.txt

scripts/setup/requirements.esp32.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ future>=0.15.2
33
# pyparsing: Min version was set based on https://github.com/pyparsing/pyparsing/issues/319
44
# pyparsing: Max version was set to avoid breaking changes
55
pyparsing>=3.0.3,<3.1
6-
idf-component-manager
6+
idf-component-manager==2.4.2
77
pygdbmi<=0.9.0.2
88
reedsolo>=1.5.3,<=1.5.4
99
bitarray==2.6.0
@@ -13,5 +13,5 @@ construct>=2.10.70
1313
python-socketio<5
1414
itsdangerous<2.1 ; python_version < "3.11"
1515
esp_idf_monitor==1.8.0
16-
esp-idf-kconfig==1.5.0
16+
esp-idf-kconfig==2.5.0
1717
esp_idf_nvs_partition_gen==0.1.9

0 commit comments

Comments
 (0)