From 71058eedd5d47f41811a3713ccc0352a937e2056 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 23 Sep 2020 16:30:28 +0200 Subject: [PATCH] chore(vendor/nanopb): update nanopb from 0.4.1 to 0.4.3 --- Pipfile | 2 +- Pipfile.lock | 8 ++++---- core/CHANGELOG.md | 2 ++ legacy/firmware/CHANGELOG.md | 2 ++ poetry.lock | 13 +++++++------ pyproject.toml | 4 ++-- vendor/nanopb | 2 +- 7 files changed, 19 insertions(+), 14 deletions(-) diff --git a/Pipfile b/Pipfile index ed9e35d45..e4b91f9c6 100644 --- a/Pipfile +++ b/Pipfile @@ -10,7 +10,7 @@ scons = "*" protobuf = "*" pyblake2 = "*" Pyro4 = "*" -nanopb = "==0.4.1" +nanopb = "==0.4.3" virtualenv = "==20.0.23" # https://github.com/pypa/virtualenv/issues/1873 ## test tools diff --git a/Pipfile.lock b/Pipfile.lock index 919c45ed9..b4eb0d698 100644 --- a/Pipfile.lock +++ b/Pipfile.lock @@ -1,7 +1,7 @@ { "_meta": { "hash": { - "sha256": "85ac903f108b7b84fa6d3dbfd62d0ce2c0a160f58e97e8dbeb989ddbfdce11b1" + "sha256": "97ab2c36f67219a9b357d154c998fa0ff612145d4d3da384e5869048095ffe4b" }, "pipfile-spec": 6, "requires": {}, @@ -418,11 +418,11 @@ }, "nanopb": { "hashes": [ - "sha256:0f1ef49aed947892a648197201c0c0b86b1e093794ef5cdba85f3f4ee00c5bfb", - "sha256:462b94f57cdfc691f4d303c2585024bb5da1f958d16b90d8982043b3d76188ce" + "sha256:4370ef3c65e4c04c74f38ecebf746ab24baa8f4f0ced24f8f4b54c166e8f6bec", + "sha256:4abd7124efcdbc896b59102a84aa28584bded93f7e586e090ee81a675831360c" ], "index": "pypi", - "version": "==0.4.1" + "version": "==0.4.3" }, "nose": { "hashes": [ diff --git a/core/CHANGELOG.md b/core/CHANGELOG.md index 44bd00e41..f16387cfd 100644 --- a/core/CHANGELOG.md +++ b/core/CHANGELOG.md @@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - The `safety-checks` setting gained new possible value `PromptTemporarily` which overrides safety checks until device reboot. [#1133] - Protobuf codec now enforces `required` fields and pre-fills default values. [#379] - `TxAck` messages are now decoded into "polymorphic" subtypes instead of the common `TxAck` type. +- Bump nanobp dependency to 0.4.3. [#1105] ### Deprecated @@ -307,6 +308,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). [#1089]: https://github.com/trezor/trezor-firmware/issues/1089 [#1095]: https://github.com/trezor/trezor-firmware/issues/1095 [#1098]: https://github.com/trezor/trezor-firmware/issues/1098 +[#1105]: https://github.com/trezor/trezor-firmware/issues/1105 [#1115]: https://github.com/trezor/trezor-firmware/issues/1115 [#1118]: https://github.com/trezor/trezor-firmware/issues/1118 [#1126]: https://github.com/trezor/trezor-firmware/issues/1126 diff --git a/legacy/firmware/CHANGELOG.md b/legacy/firmware/CHANGELOG.md index 84836859b..a19d500aa 100644 --- a/legacy/firmware/CHANGELOG.md +++ b/legacy/firmware/CHANGELOG.md @@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Added ### Changed +- Bump nanobp dependency to 0.4.3. [#1105] ### Deprecated @@ -347,5 +348,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). [#965]: https://github.com/trezor/trezor-firmware/issues/965 [#1030]: https://github.com/trezor/trezor-firmware/issues/1030 [#1098]: https://github.com/trezor/trezor-firmware/issues/1098 +[#1105]: https://github.com/trezor/trezor-firmware/issues/1105 [#1165]: https://github.com/trezor/trezor-firmware/pull/1165 [#1188]: https://github.com/trezor/trezor-firmware/issues/1188 diff --git a/poetry.lock b/poetry.lock index 36e209a3e..11197d4cf 100644 --- a/poetry.lock +++ b/poetry.lock @@ -469,7 +469,7 @@ description = "Nanopb is a small code-size Protocol Buffers implementation in an name = "nanopb" optional = false python-versions = ">=2.7" -version = "0.4.1" +version = "0.4.3" [package.dependencies] protobuf = ">=3.6" @@ -819,7 +819,7 @@ develop = true name = "trezor" optional = false python-versions = ">=3.5" -version = "0.12.1" +version = "0.13.0" [package.dependencies] click = ">=7,<8" @@ -926,8 +926,7 @@ docs = ["sphinx", "jaraco.packaging (>=3.2)", "rst.linker (>=1.9)"] testing = ["jaraco.itertools", "func-timeout"] [metadata] -content-hash = "51911283a2df05a51d01221d604d70b13538777ff159342b5c59ed6dda175829" -lock-version = "1.0" +content-hash = "4fe5bdfdf8588e4d91d95aaeaf466ddb54f591ef4d0ce89fca196960888bdd19" python-versions = "^3.6" [metadata.files] @@ -1205,8 +1204,8 @@ mypy-extensions = [ {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"}, ] nanopb = [ - {file = "nanopb-0.4.1-py2.py3-none-any.whl", hash = "sha256:0f1ef49aed947892a648197201c0c0b86b1e093794ef5cdba85f3f4ee00c5bfb"}, - {file = "nanopb-0.4.1.tar.gz", hash = "sha256:462b94f57cdfc691f4d303c2585024bb5da1f958d16b90d8982043b3d76188ce"}, + {file = "nanopb-0.4.3-py2.py3-none-any.whl", hash = "sha256:4370ef3c65e4c04c74f38ecebf746ab24baa8f4f0ced24f8f4b54c166e8f6bec"}, + {file = "nanopb-0.4.3.tar.gz", hash = "sha256:4abd7124efcdbc896b59102a84aa28584bded93f7e586e090ee81a675831360c"}, ] nose = [ {file = "nose-1.3.7-py2-none-any.whl", hash = "sha256:dadcddc0aefbf99eea214e0f1232b94f2fa9bd98fa8353711dacb112bfcbbb2a"}, @@ -1246,6 +1245,8 @@ pillow = [ {file = "Pillow-7.2.0-cp38-cp38-manylinux2014_aarch64.whl", hash = "sha256:5e51ee2b8114def244384eda1c82b10e307ad9778dac5c83fb0943775a653cd8"}, {file = "Pillow-7.2.0-cp38-cp38-win32.whl", hash = "sha256:725aa6cfc66ce2857d585f06e9519a1cc0ef6d13f186ff3447ab6dff0a09bc7f"}, {file = "Pillow-7.2.0-cp38-cp38-win_amd64.whl", hash = "sha256:a060cf8aa332052df2158e5a119303965be92c3da6f2d93b6878f0ebca80b2f6"}, + {file = "Pillow-7.2.0-pp36-pypy36_pp73-macosx_10_10_x86_64.whl", hash = "sha256:9c87ef410a58dd54b92424ffd7e28fd2ec65d2f7fc02b76f5e9b2067e355ebf6"}, + {file = "Pillow-7.2.0-pp36-pypy36_pp73-manylinux2010_x86_64.whl", hash = "sha256:e901964262a56d9ea3c2693df68bc9860b8bdda2b04768821e4c44ae797de117"}, {file = "Pillow-7.2.0-pp36-pypy36_pp73-win32.whl", hash = "sha256:25930fadde8019f374400f7986e8404c8b781ce519da27792cbe46eabec00c4d"}, {file = "Pillow-7.2.0.tar.gz", hash = "sha256:97f9e7953a77d5a70f49b9a48da7776dc51e9b738151b22dacf101641594a626"}, ] diff --git a/pyproject.toml b/pyproject.toml index 55c276f3b..3a82bc80e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,13 +6,13 @@ authors = ["SatoshiLabs "] [tool.poetry.dependencies] # all -python = "^3.5" +python = "^3.6" trezor = {path = "./python"} scons = "*" protobuf = "*" pyblake2 = "*" Pyro4 = "*" -nanopb = "0.4.1" +nanopb = "0.4.3" virtualenv = "20.0.23" # https://github.com/pypa/virtualenv/issues/1873 ## test tools diff --git a/vendor/nanopb b/vendor/nanopb index 3eb9a75c1..1466e6f95 160000 --- a/vendor/nanopb +++ b/vendor/nanopb @@ -1 +1 @@ -Subproject commit 3eb9a75c1e66e6182e87e2bd758ff2a4d16acbdc +Subproject commit 1466e6f953835b191a7f5acf0c06c941d4cd33d9