diff --git a/tools/base/requirements.in b/tools/base/requirements.in index e76c666f3f84b..db679da564feb 100644 --- a/tools/base/requirements.in +++ b/tools/base/requirements.in @@ -16,9 +16,11 @@ envoy.gpg.sign flake8 frozendict gitpython +google.api.core jinja2 pep8-naming ply +protobuf==3.19.0 pygithub pyreadline pytest diff --git a/tools/base/requirements.txt b/tools/base/requirements.txt index 1aa354990eb56..1066c376b3a14 100644 --- a/tools/base/requirements.txt +++ b/tools/base/requirements.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile +# This file is autogenerated by pip-compile with python 3.9 # To update, run: # # pip-compile --allow-unsafe --generate-hashes requirements.in @@ -108,6 +108,10 @@ babel==2.9.1 \ --hash=sha256:ab49e12b91d937cd11f0b67cb259a57ab4ad2b59ac7a3b41d6c06c0ac5b0def9 \ --hash=sha256:bc0c176f9f6a994582230df350aa6e05ba2ebe4b3ac317eab29d9be5d2768da0 # via sphinx +cachetools==4.2.4 \ + --hash=sha256:89ea6f1b638d5a73a4f9226be57ac5e4f399d22770b92355f92dcb0f7f001693 \ + --hash=sha256:92971d3cb7d2a97efff7c7bb1657f21a8f5fb309a37530537c71b1774189f2d1 + # via google-auth certifi==2021.5.30 \ --hash=sha256:2bbf76fd432960138b3ef6dda3dde0544f27cbf8546c458e60baf371917ba9ee \ --hash=sha256:50b1e4f8446b06f41be7dd6338db18e0990601dce795c2b1686458aa7e8fa7d8 @@ -351,6 +355,18 @@ gitpython==3.1.24 \ --hash=sha256:dc0a7f2f697657acc8d7f89033e8b1ea94dd90356b2983bca89dc8d2ab3cc647 \ --hash=sha256:df83fdf5e684fef7c6ee2c02fc68a5ceb7e7e759d08b694088d0cacb4eba59e5 # via -r requirements.in +google-auth==2.3.0 \ + --hash=sha256:2800f6dfad29c6ced5faf9ca0c38ea8ba1ebe2559b10c029bd021e3de3301627 \ + --hash=sha256:91892727c09cf5d090c391936a8e67ef5b9a9794c2f426b3d0ceedddbcc0ef50 + # via google.api.core +google.api.core==2.1.1 \ + --hash=sha256:39ae7ca2208090c2942ebe1b38ca2928441a14b795c725717d38d7e30adb5fbf \ + --hash=sha256:646d9399c3c478fe475cfe523e84572ab31a340814ea977fb2774eca5a6549a2 + # via -r requirements.in +googleapis-common-protos==1.53.0 \ + --hash=sha256:a88ee8903aa0a81f6c3cec2d5cf62d3c8aa67c06439b0496b49048fb1854ebf4 \ + --hash=sha256:f6d561ab8fb16b30020b940e2dd01cd80082f4762fa9f3ee670f4419b4b8dbd0 + # via google.api.core humanfriendly==9.2 \ --hash=sha256:332da98c24cc150efcc91b5508b19115209272bfdf4b0764a56795932f854271 \ --hash=sha256:f7dba53ac7935fd0b4a2fc9a29e316ddd9ea135fb3052d3d0279d10c18ff9c48 @@ -497,10 +513,49 @@ ply==3.11 \ --hash=sha256:00c7c1aaa88358b9c765b6d3000c6eec0ba42abca5351b095321aef446081da3 \ --hash=sha256:096f9b8350b65ebd2fd1346b12452efe5b9607f7482813ffca50c22722a807ce # via -r requirements.in +protobuf==3.19.0 \ + --hash=sha256:01a0645ef3acddfbc90237e1cdfae1086130fc7cb480b5874656193afd657083 \ + --hash=sha256:2f6046b9e2feee0dce994493186e8715b4392ed5f50f356280ad9c2f9f93080a \ + --hash=sha256:34a77b8fafdeb8f89fee2b7108ae60d8958d72e33478680cc1e05517892ecc46 \ + --hash=sha256:36bf292f44966c67080e535321501717f4f1eba30faef8f2cd4b0c745a027211 \ + --hash=sha256:3fea09aa04ef2f8b01fcc9bb87f19509934f8a35d177c865b8f9ee5c32b60c1b \ + --hash=sha256:4f93e0f6af796ddd1502225ff8ea25340ced186ca05b601c44d5c88b45ba80a0 \ + --hash=sha256:6a1dc6584d24ef86f5b104bcad64fa0fe06ed36e5687f426e0445d363a041d18 \ + --hash=sha256:6f16925f5c977dd7787973a50c242e60c22b1d1182aba6bec7bd02862579c10f \ + --hash=sha256:708d04394a63ee9bdc797938b6e15ed5bf24a1cb37743eb3886fd74a5a67a234 \ + --hash=sha256:7b3867795708ac88fde8d6f34f0d9a50af56087e41f624bdb2e9ff808ea5dda7 \ + --hash=sha256:8488c2276f14f294e890cc1260ab342a13e90cd20dcc03319d2eea258f1fd321 \ + --hash=sha256:942dd6bc8bd2a3c6a156d8ab0f80bd45313f22b78e1176283270054dcc8ca4c2 \ + --hash=sha256:9a8a880593015ef2c83f7af797fa4fbf583b2c98b4bd94e46c5b61fee319d84b \ + --hash=sha256:a74432e9d28a6072a2359a0f49f81eb14dd718e7dbbfb6c0789b456c49e1f130 \ + --hash=sha256:ac2f8ec942d414609aba0331952ae12bb823e8f424bbb6b8c422f1cef32dc842 \ + --hash=sha256:b64be5d7270cf5e76375bac049846e8a9543a2d4368b69afe78ab725380a7487 \ + --hash=sha256:c96e94d3e523a82caa3e5f74b35dd1c4884199358d01c950d95c341255ff48bc \ + --hash=sha256:c99af73ae34c93e0e2ace57ea2e70243f34fc015c8c23fd39ee93652e726f7e7 \ + --hash=sha256:d1f4277d321f60456845ca9b882c4845736f1f5c1c69eb778eba22a97977d8af \ + --hash=sha256:d3861c9721a90ba83ee0936a9cfcc4fa1c4b4144ac9658fb6f6343b38558e9b4 \ + --hash=sha256:d4ca5f0c7bc8d2e6966ca3bbd85e9ebe7191b6e21f067896d4af6b28ecff29fe \ + --hash=sha256:ee4d07d596357f51316b6ecf1cc1927660e9d5e418385bb1c51fd2496cd9bee7 \ + --hash=sha256:f7a031cf8e2fc14acc0ba694f6dff0a01e06b70d817eba6edc72ee6cc20517ac \ + --hash=sha256:f9097327d277b0aa4a3224e61cd6850aef3269172397715299bcffc9f90293c9 + # via + # -r requirements.in + # google.api.core + # googleapis-common-protos py==1.10.0 \ --hash=sha256:21b81bda15b66ef5e1a777a21c4dcd9c20ad3efd0b3f817e7a809035269e1bd3 \ --hash=sha256:3b80836aa6d1feeaa108e046da6423ab8f6ceda6468545ae8d02d9d58d18818a # via pytest +pyasn1==0.4.8 \ + --hash=sha256:39c7e2ec30515947ff4e87fb6f456dfc6e84857d34be479c9d4a4ba4bf46aa5d \ + --hash=sha256:aef77c9fb94a3ac588e87841208bdec464471d9871bd5050a287cc9a475cd0ba + # via + # pyasn1-modules + # rsa +pyasn1-modules==0.2.8 \ + --hash=sha256:905f84c712230b2c592c19470d3ca8d552de726050d1d1716282a1f6146be65e \ + --hash=sha256:a50b808ffeb97cb3601dd25981f6b016cbb3d31fbf57a8b8a87428e6158d0c74 + # via google-auth pycodestyle==2.8.0 \ --hash=sha256:720f8b39dde8b293825e7ff02c475f3077124006db4f440dcbc9a20b76548a20 \ --hash=sha256:eddd5847ef438ea1c7870ca7eb78a9d47ce0cdb4851a5523949f2601d0cbbe7f @@ -624,8 +679,13 @@ requests==2.26.0 \ --hash=sha256:6c1246513ecd5ecd4528a0906f910e8f0f9c6b8ec72030dc9fd154dc1a6efd24 \ --hash=sha256:b8aa58f8cf793ffd8782d3d8cb19e66ef36f7aba4353eec859e74678b01b07a7 # via + # google.api.core # pygithub # sphinx +rsa==4.7.2 \ + --hash=sha256:78f9a9bf4e7be0c5ded4583326e7461e3a3c5aae24073648b4bdfa797d78c9d2 \ + --hash=sha256:9d689e6ca1b3038bc82bf8d23e944b6b6037bc02301a574935b2dd946e0353b9 + # via google-auth six==1.16.0 \ --hash=sha256:1e61c37477a1626458e36f7b1d82aa5c9b094fa4802892072e49de9c60c4c926 \ --hash=sha256:8abb2f1d86890a2dfb989f9a77cfcfd3e47c2a354b01111771326f8aa26e0254 @@ -803,4 +863,6 @@ setuptools==58.2.0 \ --hash=sha256:2c55bdb85d5bb460bd2e3b12052b677879cffcf46c0c688f2e5bf51d36001145 # via # -r requirements.in + # google-auth + # google.api.core # sphinx diff --git a/tools/protoxform/BUILD b/tools/protoxform/BUILD index d76f73cb4787c..eb20c482e3465 100644 --- a/tools/protoxform/BUILD +++ b/tools/protoxform/BUILD @@ -1,4 +1,5 @@ load("@rules_python//python:defs.bzl", "py_binary") +load("@base_pip3//:requirements.bzl", "requirement") licenses(["notice"]) # Apache 2 @@ -16,8 +17,8 @@ py_binary( "@com_envoyproxy_protoc_gen_validate//validate:validate_py", "@com_github_cncf_udpa//udpa/annotations:pkg_py_proto", "@com_github_cncf_udpa//xds/annotations/v3:pkg_py_proto", - "@com_google_googleapis//google/api:annotations_py_proto", "@envoy_api//envoy/annotations:pkg_py_proto", + requirement("google.api.core") ], ) @@ -41,8 +42,7 @@ py_binary( "@com_envoyproxy_protoc_gen_validate//validate:validate_py", "@com_github_cncf_udpa//udpa/annotations:pkg_py_proto", "@com_github_cncf_udpa//xds/annotations/v3:pkg_py_proto", - "@com_google_googleapis//google/api:annotations_py_proto", - "@com_google_protobuf//:protobuf_python", "@envoy_api//envoy/annotations:pkg_py_proto", + requirement("google.api.core") ], )