From 19d03a0c07f645ca906c7677a07b22dd49e9b9fa Mon Sep 17 00:00:00 2001 From: Terence Hampson Date: Wed, 25 Oct 2023 10:09:05 -0700 Subject: [PATCH] Bump third_party/pigweed/repo from fbb318a to 90d97fa (#29952) * Bump third_party/pigweed/repo from fbb318a to 90d97fa * Increment mypy-protobuf to match what is requested by pw * Restyle * Fix CI * Fix CI --- scripts/setup/constraints.txt | 202 ++++++++--------------------- scripts/setup/pigweed.json | 4 +- scripts/setup/requirements.all.txt | 6 +- third_party/pigweed/repo | 2 +- 4 files changed, 58 insertions(+), 156 deletions(-) diff --git a/scripts/setup/constraints.txt b/scripts/setup/constraints.txt index a80c8a297d9fa8..b0e9aed4ae60e7 100644 --- a/scripts/setup/constraints.txt +++ b/scripts/setup/constraints.txt @@ -2,32 +2,24 @@ # This file is autogenerated by pip-compile with Python 3.11 # by the following command: # -# pip-compile --allow-unsafe --output-file=constraints.txt --resolver=backtracking --strip-extras requirements.all.txt +# pip-compile --allow-unsafe --output-file=constraints.txt --strip-extras requirements.all.txt # anytree==2.8.0 # via -r requirements.memory.txt appdirs==1.4.4 - # via - # -r requirements.all.txt - # mbed-os-tools + # via -r requirements.all.txt appnope==0.1.3 # via -r requirements.all.txt asttokens==2.2.1 # via stack-data attrs==22.2.0 - # via - # jsonschema - # pytest + # via jsonschema backcall==0.2.0 # via ipython -beautifulsoup4==4.11.2 - # via mbed-os-tools -bflb-crypto-plus==1.0 - # via bflb-iot-tool -bflb-iot-tool==1.8.3 - # via -r requirements.bouffalolab.txt bitstring==3.1.9 - # via -r requirements.esp32.txt + # via + # -r requirements.esp32.txt + # esptool build==0.8.0 # via # -r requirements.all.txt @@ -37,9 +29,7 @@ cachecontrol==0.12.11 cbor==1.0.0 # via -r requirements.zephyr.txt cbor2==5.4.6 - # via - # -r requirements.zephyr.txt - # imgtool + # via -r requirements.zephyr.txt certifi==2022.12.7 # via requests cffi==1.15.1 @@ -51,33 +41,33 @@ click==8.1.3 # -r requirements.build.txt # -r requirements.esp32.txt # idf-component-manager - # imgtool - # mbed-tools # pip-tools colorama==0.4.6 # via # -r requirements.all.txt # idf-component-manager - # mbed-os-tools # west coloredlogs==15.0.1 # via -r requirements.all.txt construct==2.10.54 - # via -r requirements.esp32.txt + # via + # -r requirements.esp32.txt + # esp-coredump contextlib2==21.6.0 # via # idf-component-manager # schema cryptography==39.0.2 # via + # -c constraints.esp32.txt # -r requirements.all.txt - # imgtool + # esptool cxxfilt==0.3.0 # via -r requirements.memory.txt decorator==5.1.1 # via ipython diskcache==5.4.0 - # via -r requirements.yaml_tests.txt + # via -r requirements.all.txt distlib==0.3.6 # via virtualenv docopt==0.6.2 @@ -85,86 +75,55 @@ docopt==0.6.2 ecdsa==0.18.0 # via # -r requirements.esp32.txt - # -r requirements.ti.txt - # bflb-iot-tool + # esptool +esp-coredump==1.7.0 + # via esp-idf-monitor +esp-idf-kconfig==1.2.0 + # via -r requirements.esp32.txt +esp-idf-monitor==1.1.1 + # via -r requirements.esp32.txt +esptool==4.6.2 + # via esp-coredump executing==1.2.0 # via stack-data fastcore==1.5.28 # via ghapi -fasteners==0.18 - # via mbed-os-tools filelock==3.9.0 # via virtualenv future==0.18.3 # via # -r requirements.esp32.txt - # -r requirements.telink.txt # idf-component-manager - # mbed-os-tools - # pylink-square ghapi==1.0.3 # via -r requirements.memory.txt -gitdb==4.0.10 - # via gitpython -gitpython==3.1.31 ; platform_machine != "aarch64" and sys_platform == "linux" - # via - # -r requirements.mbed.txt - # mbed-tools humanfriendly==10.0 # via coloredlogs idf-component-manager==1.2.2 # via -r requirements.esp32.txt idna==3.4 # via requests -imgtool==1.9.0 - # via -r requirements.openiotsdk.txt -iniconfig==2.0.0 - # via pytest intelhex==2.3.0 - # via - # -r requirements.zephyr.txt - # imgtool - # mbed-os-tools + # via -r requirements.zephyr.txt ipython==8.11.0 # via -r requirements.all.txt -itsdangerous==2.0.1 - # via -r requirements.esp32.txt jedi==0.18.2 # via ipython jinja2==3.0.3 - # via - # -r requirements.build.txt - # mbed-tools + # via -r requirements.build.txt jsonschema==4.17.3 # via -r requirements.zephyr.txt -junit-xml==1.9 - # via mbed-os-tools kconfiglib==13.7.1 - # via -r requirements.esp32.txt + # via esp-idf-kconfig lark==1.1.5 - # via -r requirements.build.txt -leb128==1.0.5 - # via -r requirements.infineon.txt -lockfile==0.12.2 # via - # cachecontrol - # mbed-os-tools -mako==1.2.4 - # via pdoc3 -markdown==3.4.1 - # via pdoc3 + # -r requirements.all.txt + # -r requirements.build.txt +lockfile==0.12.2 + # via cachecontrol markupsafe==2.1.2 - # via - # jinja2 - # mako + # via jinja2 matplotlib-inline==0.1.6 # via ipython -mbed-ls==1.8.11 ; platform_machine != "aarch64" and sys_platform == "linux" - # via -r requirements.mbed.txt -mbed-os-tools==1.8.15 - # via mbed-ls -mbed-tools==7.59.0 ; platform_machine != "aarch64" and sys_platform == "linux" - # via -r requirements.mbed.txt mobly==1.12.1 # via -r requirements.all.txt msgpack==1.0.4 @@ -173,7 +132,7 @@ mypy==0.971 # via -r requirements.all.txt mypy-extensions==1.0.0 # via mypy -mypy-protobuf==3.2.0 +mypy-protobuf==3.5.0 # via -r requirements.all.txt numpy==1.24.2 # via pandas @@ -183,14 +142,11 @@ packaging==23.0 # fastcore # ghapi # idf-component-manager - # pytest # west pandas==1.5.3 ; platform_machine != "aarch64" and platform_machine != "arm64" # via -r requirements.memory.txt parso==0.8.3 # via jedi -pdoc3==0.10.0 ; platform_machine != "aarch64" and sys_platform == "linux" - # via -r requirements.mbed.txt pep517==0.13.0 # via build pexpect==4.8.0 @@ -203,106 +159,70 @@ pip-tools==7.0.0 # via -r requirements.all.txt platformdirs==3.0.0 # via virtualenv -pluggy==1.0.0 - # via pytest -portalocker==2.0.0 - # via bflb-iot-tool portpicker==1.5.2 # via # -r requirements.all.txt # mobly -prettytable==2.5.0 - # via - # mbed-ls - # mbed-os-tools prompt-toolkit==3.0.38 # via ipython -protobuf==3.20.1 +protobuf==4.24.4 # via # -r requirements.all.txt # mypy-protobuf psutil==5.9.4 - # via - # mbed-tools - # portpicker - # pylink-square + # via portpicker ptyprocess==0.7.0 # via pexpect pure-eval==0.2.2 # via stack-data -py==1.11.0 - # via pytest -pycklink==0.1.1 - # via bflb-iot-tool pycparser==2.21 # via cffi -pycryptodome==3.9.8 +pyelftools==0.30 # via - # bflb-crypto-plus - # bflb-iot-tool + # -c constraints.esp32.txt + # esp-idf-monitor pygdbmi==0.9.0.2 - # via -r requirements.esp32.txt + # via + # -r requirements.esp32.txt + # esp-coredump pygments==2.14.0 # via ipython pykwalify==1.8.0 # via west -pylink-square==0.5.0 - # via bflb-iot-tool pyparsing==3.0.9 # via -r requirements.esp32.txt -pypng==0.0.21 - # via -r requirements.telink.txt -pyqrcode==1.2.1 - # via -r requirements.telink.txt pyrsistent==0.19.3 # via jsonschema pyserial==3.5 # via # -c constraints.esp32.txt - # bflb-iot-tool - # mbed-os-tools - # mbed-tools -pytest==6.2.5 ; sys_platform == "linux" - # via - # -r requirements.mbed.txt - # pytest-json-report - # pytest-metadata -pytest-json-report==1.5.0 - # via -r requirements.openiotsdk.txt -pytest-metadata==2.0.4 - # via pytest-json-report + # esp-idf-monitor + # esptool python-dateutil==2.8.2 # via # pandas # pykwalify -python-dotenv==1.0.0 ; platform_machine != "aarch64" and sys_platform == "linux" - # via - # -r requirements.mbed.txt - # mbed-tools python-engineio==3.14.2 # via python-socketio python-socketio==4.6.1 # via -r requirements.esp32.txt pytz==2022.7.1 # via pandas -pyudev==0.24.0 ; platform_machine != "aarch64" and sys_platform == "linux" - # via - # -r requirements.mbed.txt - # mbed-tools pyyaml==6.0 # via + # esptool # idf-component-manager # mobly # west reedsolo==1.5.4 - # via -r requirements.esp32.txt + # via + # -r requirements.esp32.txt + # esptool requests==2.28.2 # via # -r requirements.cirque.txt # cachecontrol # idf-component-manager - # mbed-os-tools - # mbed-tools # requests-file # requests-toolbelt requests-file==1.5.1 @@ -319,46 +239,30 @@ six==1.16.0 # asttokens # ecdsa # idf-component-manager - # junit-xml - # mbed-os-tools - # pylink-square # python-dateutil # python-engineio # python-socketio # requests-file -smmap==5.0.0 - # via gitdb -soupsieve==2.4 - # via beautifulsoup4 stack-data==0.6.2 # via ipython stringcase==1.2.0 # via -r requirements.build.txt tabulate==0.9.0 - # via - # -r requirements.memory.txt - # mbed-tools -toml==0.10.2 - # via pytest + # via -r requirements.memory.txt tornado==6.2 # via -r requirements.all.txt tqdm==4.64.1 - # via - # idf-component-manager - # mbed-tools + # via idf-component-manager traitlets==5.9.0 # via # ipython # matplotlib-inline -types-protobuf==3.19.22 +types-protobuf==4.24.0.2 # via # -r requirements.all.txt # mypy-protobuf -typing-extensions==4.5.0 ; platform_machine != "aarch64" and sys_platform == "linux" - # via - # -r requirements.mbed.txt - # mbed-tools - # mypy +typing-extensions==4.5.0 + # via mypy urllib3==1.26.14 # via requests virtualenv==20.20.0 @@ -366,11 +270,9 @@ virtualenv==20.20.0 watchdog==2.3.1 # via -r requirements.all.txt wcwidth==0.2.6 - # via - # prettytable - # prompt-toolkit + # via prompt-toolkit websockets==10.4 - # via -r requirements.yaml_tests.txt + # via -r requirements.all.txt west==1.0.0 # via -r requirements.zephyr.txt wheel==0.38.4 ; sys_platform == "linux" diff --git a/scripts/setup/pigweed.json b/scripts/setup/pigweed.json index 3147b578705073..c73c8e65fc573b 100644 --- a/scripts/setup/pigweed.json +++ b/scripts/setup/pigweed.json @@ -47,7 +47,7 @@ "windows-amd64" ], "tags": [ - "version:2@3.17.3" + "version:2@24.4" ] }, { @@ -57,7 +57,7 @@ "mac-arm64" ], "tags": [ - "version:2@3.17.3" + "version:2@24.4" ] }, { diff --git a/scripts/setup/requirements.all.txt b/scripts/setup/requirements.all.txt index 2cccfdbf84db03..3266eaf8504572 100644 --- a/scripts/setup/requirements.all.txt +++ b/scripts/setup/requirements.all.txt @@ -39,9 +39,9 @@ coloredlogs watchdog build==0.8.0 mypy==0.971 -mypy-protobuf==3.2.0 -protobuf==3.20.1 -types-protobuf==3.19.22 +mypy-protobuf==3.5.0 +protobuf==4.24.4 +types-protobuf==4.24.0.2 cryptography diff --git a/third_party/pigweed/repo b/third_party/pigweed/repo index fbb318aff82edf..90d97fa3b4292c 160000 --- a/third_party/pigweed/repo +++ b/third_party/pigweed/repo @@ -1 +1 @@ -Subproject commit fbb318aff82edfe8bfcc7312661fe2c9e4db49ff +Subproject commit 90d97fa3b4292c39074e6f2b94dbd1cffa6ee318