update mypy and other Python deps

latest mypy_protobuf can no longer be run directly, so we need
to run a wrapper instead
This commit is contained in:
Damien Elmes 2021-02-01 15:47:25 +10:00
parent 1f6ed0739f
commit e7483edee7
4 changed files with 23 additions and 14 deletions

View File

@ -34,7 +34,7 @@ decorator==4.4.2
# via -r requirements.in # via -r requirements.in
distro==1.5.0 distro==1.5.0
# via -r requirements.in # via -r requirements.in
flask-cors==3.0.9 flask-cors==3.0.10
# via -r requirements.in # via -r requirements.in
flask==1.1.2 flask==1.1.2
# via # via
@ -54,7 +54,7 @@ isort==5.7.0
# pylint # pylint
itsdangerous==1.1.0 itsdangerous==1.1.0
# via flask # via flask
jinja2==2.11.2 jinja2==2.11.3
# via flask # via flask
jsonschema==3.2.0 jsonschema==3.2.0
# via -r requirements.in # via -r requirements.in
@ -72,13 +72,13 @@ mypy-extensions==0.4.3
# via # via
# black # black
# mypy # mypy
mypy-protobuf==1.23 mypy-protobuf==1.24
# via -r requirements.in # via -r requirements.in
mypy==0.790 mypy==0.800
# via -r requirements.in # via -r requirements.in
orjson==3.4.6 orjson==3.4.7
# via -r requirements.in # via -r requirements.in
packaging==20.8 packaging==20.9
# via pytest # via pytest
pathspec==0.8.1 pathspec==0.8.1
# via black # via black
@ -102,7 +102,7 @@ pyrsistent==0.17.3
# via jsonschema # via jsonschema
pysocks==1.7.1 pysocks==1.7.1
# via requests # via requests
pytest==6.2.1 pytest==6.2.2
# via -r requirements.in # via -r requirements.in
pytoml==0.1.21 pytoml==0.1.21
# via compare-locales # via compare-locales
@ -142,7 +142,7 @@ typing-extensions==3.7.4.3
# via # via
# black # black
# mypy # mypy
urllib3==1.26.2 urllib3==1.26.3
# via requests # via requests
waitress==2.0.0b1 waitress==2.0.0b1
# via -r requirements.in # via -r requirements.in
@ -154,9 +154,9 @@ wrapt==1.12.1
# via astroid # via astroid
# The following packages are considered to be unsafe in a requirements file: # The following packages are considered to be unsafe in a requirements file:
pip==20.3.3 pip==21.0.1
# via pip-tools # via pip-tools
setuptools==51.1.1 setuptools==52.0.0
# via jsonschema # via jsonschema
# manually added for now; ensure it and the earlier winrt are not removed on update # manually added for now; ensure it and the earlier winrt are not removed on update

View File

@ -44,7 +44,7 @@ py_proto_library_typed = rule(
"mypy_protobuf": attr.label( "mypy_protobuf": attr.label(
executable = True, executable = True,
cfg = "exec", cfg = "exec",
default = Label("//pylib/tools:mypy_protobuf"), default = Label("//pylib/tools:protoc-gen-mypy"),
), ),
}, },
) )

View File

@ -2,8 +2,8 @@ load("@rules_python//python:defs.bzl", "py_binary", "py_library")
load("@py_deps//:requirements.bzl", "requirement") load("@py_deps//:requirements.bzl", "requirement")
py_binary( py_binary(
name = "mypy_protobuf", name = "protoc-gen-mypy",
srcs = [requirement("mypy-protobuf").replace(":pkg", ":mypy_protobuf.py")], srcs = ["protoc-gen-mypy.py"],
visibility = [ visibility = [
"//visibility:public", "//visibility:public",
], ],
@ -17,7 +17,7 @@ py_binary(
"//visibility:public", "//visibility:public",
], ],
deps = [ deps = [
":mypy_protobuf", ":protoc-gen-mypy",
"@rules_python//python/runfiles", "@rules_python//python/runfiles",
], ],
) )

9
pylib/tools/protoc-gen-mypy.py Executable file
View File

@ -0,0 +1,9 @@
# copied from mypy_protobuf:bin - simple launch wrapper
import re
import sys
from mypy_protobuf import main
if __name__ == "__main__":
sys.argv[0] = re.sub(r"(-script\.pyw|\.exe)?$", "", sys.argv[0])
sys.exit(main())