From 8d8cfd66926992497829dec68dd849c79148ff49 Mon Sep 17 00:00:00 2001 From: matejcik Date: Wed, 5 Jan 2022 11:41:48 +0100 Subject: [PATCH] build: fully replace mypy with pyright [no changelog] --- Makefile | 10 +++++----- core/Makefile | 22 ++++++---------------- poetry.lock | 45 +-------------------------------------------- pyproject.toml | 1 - python/Makefile | 6 ------ 5 files changed, 12 insertions(+), 72 deletions(-) diff --git a/Makefile b/Makefile index 02c09bb7b..48680e264 100644 --- a/Makefile +++ b/Makefile @@ -17,10 +17,10 @@ pystyle_check: ## run code style check on application sources and tests flake8 --version isort --version | awk '/VERSION/{print $$2}' black --version - mypy --version pylint --version - @echo [MYPY] - @make -C core mypy + pyright --version + @echo [TYPECHECK] + @make -C core typecheck @echo [FLAKE8] @flake8 $(PY_FILES) @echo [ISORT] @@ -37,8 +37,8 @@ pystyle: ## apply code style on application sources and tests @isort $(PY_FILES) @echo [BLACK] @black $(PY_FILES) - @echo [MYPY] - @make -C core mypy + @echo [TYPECHECK] + @make -C core typecheck @echo [FLAKE8] @flake8 $(PY_FILES) @echo [PYLINT] diff --git a/core/Makefile b/core/Makefile index fb9395033..7cf7f81c3 100644 --- a/core/Makefile +++ b/core/Makefile @@ -107,22 +107,12 @@ test_emu_ui_record: ## record and hash screens for ui integration tests pylint: ## run pylint on application sources and tests pylint -E $(shell find src tests -name *.py) -mypy: - mypy --config-file ../setup.cfg \ - src/main.py \ - src/apps \ - src/trezor \ - src/storage \ - --exclude src/apps/monero - -mypy_report: - mypy --config-file ../setup.cfg \ - src/main.py \ - src/apps \ - src/trezor \ - src/storage \ - --exclude src/apps/monero \ - --html-report mypy_report +mypy: ## deprecated; use "make typecheck" + @echo "mypy is deprecated; use 'make typecheck'" + make typecheck + +typecheck: + pyright clippy: cd embed/rust ; cargo clippy diff --git a/poetry.lock b/poetry.lock index e996f7ba8..0d6430e63 100644 --- a/poetry.lock +++ b/poetry.lock @@ -497,24 +497,6 @@ six = "*" testing = ["pytest", "coverage", "astroid (>=1.5.3,<1.6.0)", "pylint (>=1.7.2,<1.8.0)", "astroid (>=2.0)", "pylint (>=2.3.1,<2.4.0)"] yaml = ["PyYAML (>=5.1.0)"] -[[package]] -name = "mypy" -version = "0.910" -description = "Optional static typing for Python" -category = "main" -optional = false -python-versions = ">=3.5" - -[package.dependencies] -mypy-extensions = ">=0.4.3,<0.5.0" -toml = "*" -typed-ast = {version = ">=1.4.0,<1.5.0", markers = "python_version < \"3.8\""} -typing-extensions = ">=3.7.4" - -[package.extras] -dmypy = ["psutil (>=4.0)"] -python2 = ["typed-ast (>=1.4.0,<1.5.0)"] - [[package]] name = "mypy-extensions" version = "0.4.3" @@ -1033,7 +1015,7 @@ testing = ["pytest (>=3.5,!=3.7.3)", "pytest-checkdocs (>=1.2.3)", "pytest-flake [metadata] lock-version = "1.1" python-versions = "^3.6" -content-hash = "da1edd6acca40dd11b35035252e99b47ad309ed65ce13ed1fd19040968a40476" +content-hash = "2edf27085fabf102d358e1f8cba0a01fde9deae9c37d5ac4727b86510113bec6" [metadata.files] appdirs = [ @@ -1361,31 +1343,6 @@ munch = [ {file = "munch-2.5.0-py2.py3-none-any.whl", hash = "sha256:6f44af89a2ce4ed04ff8de41f70b226b984db10a91dcc7b9ac2efc1c77022fdd"}, {file = "munch-2.5.0.tar.gz", hash = "sha256:2d735f6f24d4dba3417fa448cae40c6e896ec1fdab6cdb5e6510999758a4dbd2"}, ] -mypy = [ - {file = "mypy-0.910-cp35-cp35m-macosx_10_9_x86_64.whl", hash = "sha256:a155d80ea6cee511a3694b108c4494a39f42de11ee4e61e72bc424c490e46457"}, - {file = "mypy-0.910-cp35-cp35m-manylinux1_x86_64.whl", hash = "sha256:b94e4b785e304a04ea0828759172a15add27088520dc7e49ceade7834275bedb"}, - {file = "mypy-0.910-cp35-cp35m-manylinux2010_x86_64.whl", hash = "sha256:088cd9c7904b4ad80bec811053272986611b84221835e079be5bcad029e79dd9"}, - {file = "mypy-0.910-cp35-cp35m-win_amd64.whl", hash = "sha256:adaeee09bfde366d2c13fe6093a7df5df83c9a2ba98638c7d76b010694db760e"}, - {file = "mypy-0.910-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:ecd2c3fe726758037234c93df7e98deb257fd15c24c9180dacf1ef829da5f921"}, - {file = "mypy-0.910-cp36-cp36m-manylinux1_x86_64.whl", hash = "sha256:d9dd839eb0dc1bbe866a288ba3c1afc33a202015d2ad83b31e875b5905a079b6"}, - {file = "mypy-0.910-cp36-cp36m-manylinux2010_x86_64.whl", hash = "sha256:3e382b29f8e0ccf19a2df2b29a167591245df90c0b5a2542249873b5c1d78212"}, - {file = "mypy-0.910-cp36-cp36m-win_amd64.whl", hash = "sha256:53fd2eb27a8ee2892614370896956af2ff61254c275aaee4c230ae771cadd885"}, - {file = "mypy-0.910-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:b6fb13123aeef4a3abbcfd7e71773ff3ff1526a7d3dc538f3929a49b42be03f0"}, - {file = "mypy-0.910-cp37-cp37m-manylinux1_x86_64.whl", hash = "sha256:e4dab234478e3bd3ce83bac4193b2ecd9cf94e720ddd95ce69840273bf44f6de"}, - {file = "mypy-0.910-cp37-cp37m-manylinux2010_x86_64.whl", hash = "sha256:7df1ead20c81371ccd6091fa3e2878559b5c4d4caadaf1a484cf88d93ca06703"}, - {file = "mypy-0.910-cp37-cp37m-win_amd64.whl", hash = "sha256:0aadfb2d3935988ec3815952e44058a3100499f5be5b28c34ac9d79f002a4a9a"}, - {file = "mypy-0.910-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:ec4e0cd079db280b6bdabdc807047ff3e199f334050db5cbb91ba3e959a67504"}, - {file = "mypy-0.910-cp38-cp38-manylinux1_x86_64.whl", hash = "sha256:119bed3832d961f3a880787bf621634ba042cb8dc850a7429f643508eeac97b9"}, - {file = "mypy-0.910-cp38-cp38-manylinux2010_x86_64.whl", hash = "sha256:866c41f28cee548475f146aa4d39a51cf3b6a84246969f3759cb3e9c742fc072"}, - {file = "mypy-0.910-cp38-cp38-win_amd64.whl", hash = "sha256:ceb6e0a6e27fb364fb3853389607cf7eb3a126ad335790fa1e14ed02fba50811"}, - {file = "mypy-0.910-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:1a85e280d4d217150ce8cb1a6dddffd14e753a4e0c3cf90baabb32cefa41b59e"}, - {file = "mypy-0.910-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:42c266ced41b65ed40a282c575705325fa7991af370036d3f134518336636f5b"}, - {file = "mypy-0.910-cp39-cp39-manylinux1_x86_64.whl", hash = "sha256:3c4b8ca36877fc75339253721f69603a9c7fdb5d4d5a95a1a1b899d8b86a4de2"}, - {file = "mypy-0.910-cp39-cp39-manylinux2010_x86_64.whl", hash = "sha256:c0df2d30ed496a08de5daed2a9ea807d07c21ae0ab23acf541ab88c24b26ab97"}, - {file = "mypy-0.910-cp39-cp39-win_amd64.whl", hash = "sha256:c6c2602dffb74867498f86e6129fd52a2770c48b7cd3ece77ada4fa38f94eba8"}, - {file = "mypy-0.910-py3-none-any.whl", hash = "sha256:ef565033fa5a958e62796867b1df10c40263ea9ded87164d67572834e57a174d"}, - {file = "mypy-0.910.tar.gz", hash = "sha256:704098302473cb31a218f1775a873b376b30b4c18229421e9e9dc8916fd16150"}, -] mypy-extensions = [ {file = "mypy_extensions-0.4.3-py2.py3-none-any.whl", hash = "sha256:090fedd75945a69ae91ce1303b5824f428daf5a028d2f6ab8a299250a846f15d"}, {file = "mypy_extensions-0.4.3.tar.gz", hash = "sha256:2d82818f5bb3e369420cb3c4060a7970edba416647068eb4c5343488a6c604a8"}, diff --git a/pyproject.toml b/pyproject.toml index 474742158..7924e45c3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -32,7 +32,6 @@ shamir-mnemonic = "^0.2.1" fido2 = "^0.8.0" ## typing -mypy = "^0.910" typing-extensions = ">=3.7.4" types-click = "*" diff --git a/python/Makefile b/python/Makefile index 024dd8702..6988aad2a 100644 --- a/python/Makefile +++ b/python/Makefile @@ -62,11 +62,5 @@ style_check: test: pytest tests -mypy: - mypy --config-file ./setup.cfg ./src/trezorlib/ - -mypy_report: - mypy --config-file ./setup.cfg ./src/trezorlib/ --html-report mypy_report - pyright: pyright -p pyrightconfig.json