From 1b406781ee6da63e8584f95091524d8de956adbd Mon Sep 17 00:00:00 2001 From: Anthony DiGirolamo Date: Fri, 3 Mar 2023 17:50:56 +0000 Subject: [PATCH] python: Upgrade mypy to 1.0.1 Bug: 261998865 Change-Id: I4de1ed224e447d19aa654c772d1d2fa6ee4f94b3 Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/128732 Reviewed-by: Ted Pudlik Pigweed-Auto-Submit: Anthony DiGirolamo Commit-Queue: Auto-Submit --- pw_build/py/setup.cfg | 3 +-- .../py/pw_env_setup/virtualenv_setup/constraint.list | 10 +++++----- pw_protobuf_compiler/py/setup.cfg | 6 ++++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/pw_build/py/setup.cfg b/pw_build/py/setup.cfg index 03802d8810..37b8b733bb 100644 --- a/pw_build/py/setup.cfg +++ b/pw_build/py/setup.cfg @@ -22,13 +22,12 @@ description = Python scripts that support the GN build packages = find: zip_safe = False install_requires = + # NOTE: These requirements should stay as >= the lowest version we support. build>=0.8.0 wheel coverage setuptools types-setuptools - # NOTE: mypy needs to stay in sync with mypy-protobuf - # Currently using mypy 0.991 and mypy-protobuf 3.3.0 (see constraint.list) mypy>=0.971 pylint>=2.9.3 diff --git a/pw_env_setup/py/pw_env_setup/virtualenv_setup/constraint.list b/pw_env_setup/py/pw_env_setup/virtualenv_setup/constraint.list index fa23b47b95..3d11a4cc30 100644 --- a/pw_env_setup/py/pw_env_setup/virtualenv_setup/constraint.list +++ b/pw_env_setup/py/pw_env_setup/virtualenv_setup/constraint.list @@ -34,8 +34,8 @@ lazy-object-proxy==1.7.1 MarkupSafe==2.0.1 matplotlib-inline==0.1.3 mccabe==0.6.1 -mypy==0.991 -mypy-extensions==0.4.3 +mypy==1.0.1 +mypy-extensions==1.0.0 mypy-protobuf==3.3.0 packaging==21.3 parameterized==0.8.1 @@ -77,17 +77,17 @@ sphinxcontrib-mermaid==0.8 sphinxcontrib-qthelp==1.0.3 sphinxcontrib-serializinghtml==1.1.5 toml==0.10.2 -tomli==2.0.0 +tomli==2.0.1 tomlkit==0.11.6 traitlets==5.1.1 types-docutils==0.17.4 types-futures==3.3.2 -types-protobuf==3.19.22 +types-protobuf==3.20.4.6 types-Pygments==2.9.13 types-PyYAML==6.0.7 types-setuptools==63.4.1 types-six==1.16.9 -typing-extensions==4.1.1 +typing-extensions==4.4.0 urllib3==1.26.8 watchdog==2.1.6 wcwidth==0.2.5 diff --git a/pw_protobuf_compiler/py/setup.cfg b/pw_protobuf_compiler/py/setup.cfg index 83e8c5f2c7..8e3a6eca0f 100644 --- a/pw_protobuf_compiler/py/setup.cfg +++ b/pw_protobuf_compiler/py/setup.cfg @@ -22,8 +22,10 @@ description = Pigweed protoc wrapper packages = find: zip_safe = False install_requires = - # NOTE: mypy needs to stay in sync with mypy-protobuf - # Currently using mypy 0.991 and mypy-protobuf 3.3.0 (see constraint.list) + # NOTE: protobuf needs to stay in sync with mypy-protobuf + # Currently using mypy protobuf 3.20.1 and mypy-protobuf 3.3.0 (see + # constraint.list). These requirements should stay as >= the lowest version + # we support. mypy-protobuf>=3.2.0 protobuf>=3.20.1 types-protobuf>=3.19.22