Skip to content

Commit

Permalink
update protobuf version for grr_response_proto
Browse files Browse the repository at this point in the history
  • Loading branch information
s-westphal committed Jun 17, 2024
1 parent 763c06c commit e6521d6
Show file tree
Hide file tree
Showing 5 changed files with 139 additions and 17 deletions.
3 changes: 3 additions & 0 deletions grr/proto/build_requirements.in
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
protobuf==4.25.1
grpcio
grpcio-tools
132 changes: 132 additions & 0 deletions grr/proto/build_requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
#
# This file is autogenerated by pip-compile with Python 3.11
# by the following command:
#
# pip-compile --generate-hashes grr/proto/build_requirements.in
#
grpcio==1.64.1 \
--hash=sha256:03b43d0ccf99c557ec671c7dede64f023c7da9bb632ac65dbc57f166e4970040 \
--hash=sha256:0a12ddb1678ebc6a84ec6b0487feac020ee2b1659cbe69b80f06dbffdb249122 \
--hash=sha256:0a2813093ddb27418a4c99f9b1c223fab0b053157176a64cc9db0f4557b69bd9 \
--hash=sha256:0cc79c982ccb2feec8aad0e8fb0d168bcbca85bc77b080d0d3c5f2f15c24ea8f \
--hash=sha256:1257b76748612aca0f89beec7fa0615727fd6f2a1ad580a9638816a4b2eb18fd \
--hash=sha256:1262402af5a511c245c3ae918167eca57342c72320dffae5d9b51840c4b2f86d \
--hash=sha256:19264fc964576ddb065368cae953f8d0514ecc6cb3da8903766d9fb9d4554c33 \
--hash=sha256:198908f9b22e2672a998870355e226a725aeab327ac4e6ff3a1399792ece4762 \
--hash=sha256:1de403fc1305fd96cfa75e83be3dee8538f2413a6b1685b8452301c7ba33c294 \
--hash=sha256:20405cb8b13fd779135df23fabadc53b86522d0f1cba8cca0e87968587f50650 \
--hash=sha256:2981c7365a9353f9b5c864595c510c983251b1ab403e05b1ccc70a3d9541a73b \
--hash=sha256:2c3c1b90ab93fed424e454e93c0ed0b9d552bdf1b0929712b094f5ecfe7a23ad \
--hash=sha256:39b9d0acaa8d835a6566c640f48b50054f422d03e77e49716d4c4e8e279665a1 \
--hash=sha256:3b64ae304c175671efdaa7ec9ae2cc36996b681eb63ca39c464958396697daff \
--hash=sha256:4657d24c8063e6095f850b68f2d1ba3b39f2b287a38242dcabc166453e950c59 \
--hash=sha256:4d6dab6124225496010bd22690f2d9bd35c7cbb267b3f14e7a3eb05c911325d4 \
--hash=sha256:55260032b95c49bee69a423c2f5365baa9369d2f7d233e933564d8a47b893027 \
--hash=sha256:55697ecec192bc3f2f3cc13a295ab670f51de29884ca9ae6cd6247df55df2502 \
--hash=sha256:5841dd1f284bd1b3d8a6eca3a7f062b06f1eec09b184397e1d1d43447e89a7ae \
--hash=sha256:58b1041e7c870bb30ee41d3090cbd6f0851f30ae4eb68228955d973d3efa2e61 \
--hash=sha256:5e42634a989c3aa6049f132266faf6b949ec2a6f7d302dbb5c15395b77d757eb \
--hash=sha256:5e56462b05a6f860b72f0fa50dca06d5b26543a4e88d0396259a07dc30f4e5aa \
--hash=sha256:5f8b75f64d5d324c565b263c67dbe4f0af595635bbdd93bb1a88189fc62ed2e5 \
--hash=sha256:62b4e6eb7bf901719fce0ca83e3ed474ae5022bb3827b0a501e056458c51c0a1 \
--hash=sha256:6503b64c8b2dfad299749cad1b595c650c91e5b2c8a1b775380fcf8d2cbba1e9 \
--hash=sha256:6c024ffc22d6dc59000faf8ad781696d81e8e38f4078cb0f2630b4a3cf231a90 \
--hash=sha256:73819689c169417a4f978e562d24f2def2be75739c4bed1992435d007819da1b \
--hash=sha256:75dbbf415026d2862192fe1b28d71f209e2fd87079d98470db90bebe57b33179 \
--hash=sha256:8caee47e970b92b3dd948371230fcceb80d3f2277b3bf7fbd7c0564e7d39068e \
--hash=sha256:8d51dd1c59d5fa0f34266b80a3805ec29a1f26425c2a54736133f6d87fc4968a \
--hash=sha256:940e3ec884520155f68a3b712d045e077d61c520a195d1a5932c531f11883489 \
--hash=sha256:a011ac6c03cfe162ff2b727bcb530567826cec85eb8d4ad2bfb4bd023287a52d \
--hash=sha256:a3a035c37ce7565b8f4f35ff683a4db34d24e53dc487e47438e434eb3f701b2a \
--hash=sha256:a5e771d0252e871ce194d0fdcafd13971f1aae0ddacc5f25615030d5df55c3a2 \
--hash=sha256:ac15b6c2c80a4d1338b04d42a02d376a53395ddf0ec9ab157cbaf44191f3ffdd \
--hash=sha256:b1a82e0b9b3022799c336e1fc0f6210adc019ae84efb7321d668129d28ee1efb \
--hash=sha256:bac71b4b28bc9af61efcdc7630b166440bbfbaa80940c9a697271b5e1dabbc61 \
--hash=sha256:bbc5b1d78a7822b0a84c6f8917faa986c1a744e65d762ef6d8be9d75677af2ca \
--hash=sha256:c1a786ac592b47573a5bb7e35665c08064a5d77ab88a076eec11f8ae86b3e3f6 \
--hash=sha256:c84ad903d0d94311a2b7eea608da163dace97c5fe9412ea311e72c3684925602 \
--hash=sha256:d4d29cc612e1332237877dfa7fe687157973aab1d63bd0f84cf06692f04c0367 \
--hash=sha256:e3d9f8d1221baa0ced7ec7322a981e28deb23749c76eeeb3d33e18b72935ab62 \
--hash=sha256:e7cd5c1325f6808b8ae31657d281aadb2a51ac11ab081ae335f4f7fc44c1721d \
--hash=sha256:ed6091fa0adcc7e4ff944090cf203a52da35c37a130efa564ded02b7aff63bcd \
--hash=sha256:ee73a2f5ca4ba44fa33b4d7d2c71e2c8a9e9f78d53f6507ad68e7d2ad5f64a22 \
--hash=sha256:f10193c69fc9d3d726e83bbf0f3d316f1847c3071c8c93d8090cf5f326b14309
# via
# -r grr/proto/build_requirements.in
# grpcio-tools
grpcio-tools==1.62.2 \
--hash=sha256:04a394cf5e51ba9be412eb9f6c482b6270bd81016e033e8eb7d21b8cc28fe8b5 \
--hash=sha256:04c607029ae3660fb1624ed273811ffe09d57d84287d37e63b5b802a35897329 \
--hash=sha256:10cc3321704ecd17c93cf68c99c35467a8a97ffaaed53207e9b2da6ae0308ee1 \
--hash=sha256:1679b4903aed2dc5bd8cb22a452225b05dc8470a076f14fd703581efc0740cdb \
--hash=sha256:184b4174d4bd82089d706e8223e46c42390a6ebac191073b9772abc77308f9fa \
--hash=sha256:19216e1fb26dbe23d12a810517e1b3fbb8d4f98b1a3fbebeec9d93a79f092de4 \
--hash=sha256:19ea69e41c3565932aa28a202d1875ec56786aea46a2eab54a3b28e8a27f9517 \
--hash=sha256:1d768a5c07279a4c461ebf52d0cec1c6ca85c6291c71ec2703fe3c3e7e28e8c4 \
--hash=sha256:1fe08d2038f2b7c53259b5c49e0ad08c8e0ce2b548d8185993e7ef67e8592cca \
--hash=sha256:217c2ee6a7ce519a55958b8622e21804f6fdb774db08c322f4c9536c35fdce7c \
--hash=sha256:2ce149ea55eadb486a7fb75a20f63ef3ac065ee6a0240ed25f3549ce7954c653 \
--hash=sha256:2ed775e844566ce9ce089be9a81a8b928623b8ee5820f5e4d58c1a9d33dfc5ae \
--hash=sha256:3708a747aa4b6b505727282ca887041174e146ae030ebcadaf4c1d346858df62 \
--hash=sha256:3a8d6f07e64c0c7756f4e0c4781d9d5a2b9cc9cbd28f7032a6fb8d4f847d0445 \
--hash=sha256:3c53b221378b035ae2f1881cbc3aca42a6075a8e90e1a342c2f205eb1d1aa6a1 \
--hash=sha256:40cd4eeea4b25bcb6903b82930d579027d034ba944393c4751cdefd9c49e6989 \
--hash=sha256:45db5da2bcfa88f2b86b57ef35daaae85c60bd6754a051d35d9449c959925b57 \
--hash=sha256:462e0ab8dd7c7b70bfd6e3195eebc177549ede5cf3189814850c76f9a340d7ce \
--hash=sha256:47117c8a7e861382470d0e22d336e5a91fdc5f851d1db44fa784b9acea190d87 \
--hash=sha256:472505d030135d73afe4143b0873efe0dcb385bd6d847553b4f3afe07679af00 \
--hash=sha256:4f6f32d39283ea834a493fccf0ebe9cfddee7577bdcc27736ad4be1732a36399 \
--hash=sha256:4f955702dc4b530696375251319d05223b729ed24e8673c2129f7a75d2caefbb \
--hash=sha256:4f989e5cebead3ae92c6abf6bf7b19949e1563a776aea896ac5933f143f0c45d \
--hash=sha256:58cbb24b3fa6ae35aa9c210fcea3a51aa5fef0cd25618eb4fd94f746d5a9b703 \
--hash=sha256:5b07b5874187e170edfbd7aa2ca3a54ebf3b2952487653e8c0b0d83601c33035 \
--hash=sha256:5fd5e1582b678e6b941ee5f5809340be5e0724691df5299aae8226640f94e18f \
--hash=sha256:6413581e14a80e0b4532577766cf0586de4dd33766a31b3eb5374a746771c07d \
--hash=sha256:72b61332f1b439c14cbd3815174a8f1d35067a02047c32decd406b3a09bb9890 \
--hash=sha256:759c60f24c33a181bbbc1232a6752f9b49fbb1583312a4917e2b389fea0fb0f2 \
--hash=sha256:76eb459bdf3fb666e01883270beee18f3f11ed44488486b61cd210b4e0e17cc1 \
--hash=sha256:7a49bccae1c7d154b78e991885c3111c9ad8c8fa98e91233de425718f47c6139 \
--hash=sha256:7d8b4e00c3d7237b92260fc18a561cd81f1da82e8be100db1b7d816250defc66 \
--hash=sha256:7ea369c4d1567d1acdf69c8ea74144f4ccad9e545df7f9a4fc64c94fa7684ba3 \
--hash=sha256:8214820990d01b52845f9fbcb92d2b7384a0c321b303e3ac614c219dc7d1d3af \
--hash=sha256:8c616d0ad872e3780693fce6a3ac8ef00fc0963e6d7815ce9dcfae68ba0fc287 \
--hash=sha256:987e774f74296842bbffd55ea8826370f70c499e5b5f71a8cf3103838b6ee9c3 \
--hash=sha256:9be84ff6d47fd61462be7523b49d7ba01adf67ce4e1447eae37721ab32464dd8 \
--hash=sha256:9d41e0e47dd075c075bb8f103422968a65dd0d8dc8613288f573ae91eb1053ba \
--hash=sha256:9f1ba79a253df9e553d20319c615fa2b429684580fa042dba618d7f6649ac7e4 \
--hash=sha256:a34d97c62e61bfe9e6cff0410fe144ac8cca2fc979ad0be46b7edf026339d161 \
--hash=sha256:a7e439476b29d6dac363b321781a113794397afceeb97dad85349db5f1cb5e9a \
--hash=sha256:ab84bae88597133f6ea7a2bdc57b2fda98a266fe8d8d4763652cbefd20e73ad7 \
--hash=sha256:b6746bc823958499a3cf8963cc1de00072962fb5e629f26d658882d3f4c35095 \
--hash=sha256:b8574469ecc4ff41d6bb95f44e0297cdb0d95bade388552a9a444db9cd7485cd \
--hash=sha256:bdc5dd3f57b5368d5d661d5d3703bcaa38bceca59d25955dff66244dbc987271 \
--hash=sha256:c195d74fe98541178ece7a50dad2197d43991e0f77372b9a88da438be2486f12 \
--hash=sha256:c384c838b34d1b67068e51b5bbe49caa6aa3633acd158f1ab16b5da8d226bc53 \
--hash=sha256:c48fabe40b9170f4e3d7dd2c252e4f1ff395dc24e49ac15fc724b1b6f11724da \
--hash=sha256:cbb8453ae83a1db2452b7fe0f4b78e4a8dd32be0f2b2b73591ae620d4d784d3d \
--hash=sha256:d58389fe8be206ddfb4fa703db1e24c956856fcb9a81da62b13577b3a8f7fda7 \
--hash=sha256:d82f681c9a9d933a9d8068e8e382977768e7779ddb8870fa0cf918d8250d1532 \
--hash=sha256:e33b59fb3efdddeb97ded988a871710033e8638534c826567738d3edce528752 \
--hash=sha256:ec674b4440ef4311ac1245a709e87b36aca493ddc6850eebe0b278d1f2b6e7d1 \
--hash=sha256:fa107460c842e4c1a6266150881694fefd4f33baa544ea9489601810c2210ef8
# via -r grr/proto/build_requirements.in
protobuf==4.25.1 \
--hash=sha256:0bf384e75b92c42830c0a679b0cd4d6e2b36ae0cf3dbb1e1dfdda48a244f4bcd \
--hash=sha256:0f881b589ff449bf0b931a711926e9ddaad3b35089cc039ce1af50b21a4ae8cb \
--hash=sha256:1484f9e692091450e7edf418c939e15bfc8fc68856e36ce399aed6889dae8bb0 \
--hash=sha256:193f50a6ab78a970c9b4f148e7c750cfde64f59815e86f686c22e26b4fe01ce7 \
--hash=sha256:3497c1af9f2526962f09329fd61a36566305e6c72da2590ae0d7d1322818843b \
--hash=sha256:57d65074b4f5baa4ab5da1605c02be90ac20c8b40fb137d6a8df9f416b0d0ce2 \
--hash=sha256:8bdbeaddaac52d15c6dce38c71b03038ef7772b977847eb6d374fc86636fa510 \
--hash=sha256:a19731d5e83ae4737bb2a089605e636077ac001d18781b3cf489b9546c7c80d6 \
--hash=sha256:abc0525ae2689a8000837729eef7883b9391cd6aa7950249dcf5a4ede230d5dd \
--hash=sha256:becc576b7e6b553d22cbdf418686ee4daa443d7217999125c045ad56322dda10 \
--hash=sha256:ca37bf6a6d0046272c152eea90d2e4ef34593aaa32e8873fc14c16440f22d4b7
# via
# -r grr/proto/build_requirements.in
# grpcio-tools

# WARNING: The following packages were not pinned, but pip requires them to be
# pinned when the requirements file includes hashes and the requirement is not
# satisfied by a package already installed. Consider using the --allow-unsafe flag.
# setuptools
1 change: 1 addition & 0 deletions grr/proto/requirements.in
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
protobuf==4.25.1
8 changes: 0 additions & 8 deletions grr/proto/requirements_proto.txt

This file was deleted.

12 changes: 3 additions & 9 deletions grr/proto/setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,6 @@
THIS_DIRECTORY = os.path.dirname(os.path.realpath(__file__))
os.chdir(THIS_DIRECTORY)

GRPCIO = "grpcio==1.46.3"
GRPCIO_TOOLS = "grpcio-tools==1.43.0"
PROTOBUF = "protobuf>=3.20.3,<4"


def get_config():
"""Get INI parser with version.ini data."""
Expand Down Expand Up @@ -59,7 +55,7 @@ def compile_protos():
# grpcio-tools and then uninstalled when grr-response-proto's setup.py runs
# and reinstalled to the version required by grr-response-proto.
subprocess.check_call(
[sys.executable, "-m", "pip", "install", GRPCIO, GRPCIO_TOOLS, PROTOBUF]
[sys.executable, "-m", "pip", "install", "--require-hashes", "-r", "build_requirements.txt"]
)

# If there's no makefile, we're likely installing from an sdist,
Expand Down Expand Up @@ -136,10 +132,8 @@ def run(self):
},
package_data={package: ["py.typed", "*.pyi"] for package in PACKAGES},
packages=PACKAGES,
install_requires=[
PROTOBUF,
],
data=["version.ini"],
install_requires=parse_requirements("requirements.in"),
data=["version.ini", "requirements.in"],
)

setup(**setup_args)

0 comments on commit e6521d6

Please sign in to comment.