Skip to content

Commit 9da8383

Browse files
authored
Merge branch '1.3-sve' into cherry-pick-1.3-sve-04d7a3e3385ac57f40156e12464877df4fff53e8
2 parents 6d25ef4 + d885e31 commit 9da8383

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

scripts/setup/constraints.txt

+8-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ ghapi==1.0.3
9898
# via -r requirements.memory.txt
9999
humanfriendly==10.0
100100
# via coloredlogs
101-
idf-component-manager==1.2.2
101+
idf-component-manager==1.5.2
102102
# via -r requirements.esp32.txt
103103
idna==3.4
104104
# via requests
@@ -290,3 +290,10 @@ setuptools==68.0.0
290290
# via
291291
# pip-tools
292292
# west
293+
294+
# Manual edits:
295+
296+
# Higher versions depend on proto-plus, which break
297+
# nanopb code generation (due to name conflict of the 'proto' module)
298+
google-api-core==2.17.0
299+

0 commit comments

Comments
 (0)