Merge pull request #681 from byllyfish/deps

Update grpcio and protobuf dependencies.

ci/requirements-demonet.txt

@@ -1,3 +1,3 @@
-# Poetry (version 1.8.4) export at Tue Oct 15 09:58:28 MST 2024
+# Poetry (version 1.8.4) export at Tue Nov  5 11:42:39 MST 2024
 pygraphviz==1.14 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:c10df02377f4e39b00ae17c862f4ee7e5767317f1c6b2dfd04cea6acc7fc2bea

ci/requirements-protoc.txt

@@ -1,4 +1,4 @@
 # python dependencies for `protoc.sh` script.
-grpcio-tools==1.66.0
+grpcio-tools==1.67.1
 github-clone==1.2.0
 mypy-protobuf==3.6.0

ci/requirements.txt

@@ -1,66 +1,75 @@
-# Poetry (version 1.8.4) export at Tue Oct 15 09:58:28 MST 2024
-grpcio==1.66.1 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:0e6c9b42ded5d02b6b1fea3a25f036a2236eeb75d0579bfd43c0018c88bf0a3e \
-    --hash=sha256:161d5c535c2bdf61b95080e7f0f017a1dfcb812bf54093e71e5562b16225b4ce \
-    --hash=sha256:17663598aadbedc3cacd7bbde432f541c8e07d2496564e22b214b22c7523dac8 \
-    --hash=sha256:1c17ebcec157cfb8dd445890a03e20caf6209a5bd4ac5b040ae9dbc59eef091d \
-    --hash=sha256:292a846b92cdcd40ecca46e694997dd6b9be6c4c01a94a0dfb3fcb75d20da858 \
-    --hash=sha256:2ca2559692d8e7e245d456877a85ee41525f3ed425aa97eb7a70fc9a79df91a0 \
-    --hash=sha256:307b1d538140f19ccbd3aed7a93d8f71103c5d525f3c96f8616111614b14bf2a \
-    --hash=sha256:30a1c2cf9390c894c90bbc70147f2372130ad189cffef161f0432d0157973f45 \
-    --hash=sha256:31a049daa428f928f21090403e5d18ea02670e3d5d172581670be006100db9ef \
-    --hash=sha256:35334f9c9745add3e357e3372756fd32d925bd52c41da97f4dfdafbde0bf0ee2 \
-    --hash=sha256:3750c5a00bd644c75f4507f77a804d0189d97a107eb1481945a0cf3af3e7a5ac \
-    --hash=sha256:3885f037eb11f1cacc41f207b705f38a44b69478086f40608959bf5ad85826dd \
-    --hash=sha256:4573608e23f7e091acfbe3e84ac2045680b69751d8d67685ffa193a4429fedb1 \
-    --hash=sha256:4825a3aa5648010842e1c9d35a082187746aa0cdbf1b7a2a930595a94fb10fce \
-    --hash=sha256:4877ba180591acdf127afe21ec1c7ff8a5ecf0fe2600f0d3c50e8c4a1cbc6492 \
-    --hash=sha256:48b0d92d45ce3be2084b92fb5bae2f64c208fea8ceed7fccf6a7b524d3c4942e \
-    --hash=sha256:4d813316d1a752be6f5c4360c49f55b06d4fe212d7df03253dfdae90c8a402bb \
-    --hash=sha256:5dd67ed9da78e5121efc5c510f0122a972216808d6de70953a740560c572eb44 \
-    --hash=sha256:6f914386e52cbdeb5d2a7ce3bf1fdfacbe9d818dd81b6099a05b741aaf3848bb \
-    --hash=sha256:7101db1bd4cd9b880294dec41a93fcdce465bdbb602cd8dc5bd2d6362b618759 \
-    --hash=sha256:7e06aa1f764ec8265b19d8f00140b8c4b6ca179a6dc67aa9413867c47e1fb04e \
-    --hash=sha256:84ca1be089fb4446490dd1135828bd42a7c7f8421e74fa581611f7afdf7ab761 \
-    --hash=sha256:8a1e224ce6f740dbb6b24c58f885422deebd7eb724aff0671a847f8951857c26 \
-    --hash=sha256:97ae7edd3f3f91480e48ede5d3e7d431ad6005bfdbd65c1b56913799ec79e791 \
-    --hash=sha256:9c9bebc6627873ec27a70fc800f6083a13c70b23a5564788754b9ee52c5aef6c \
-    --hash=sha256:a013c5fbb12bfb5f927444b477a26f1080755a931d5d362e6a9a720ca7dbae60 \
-    --hash=sha256:a66fe4dc35d2330c185cfbb42959f57ad36f257e0cc4557d11d9f0a3f14311df \
-    --hash=sha256:a92c4f58c01c77205df6ff999faa008540475c39b835277fb8883b11cada127a \
-    --hash=sha256:aa8ba945c96e73de29d25331b26f3e416e0c0f621e984a3ebdb2d0d0b596a3b3 \
-    --hash=sha256:b0aa03d240b5539648d996cc60438f128c7f46050989e35b25f5c18286c86734 \
-    --hash=sha256:b1b24c23d51a1e8790b25514157d43f0a4dce1ac12b3f0b8e9f66a5e2c4c132f \
-    --hash=sha256:b7ffb8ea674d68de4cac6f57d2498fef477cef582f1fa849e9f844863af50083 \
-    --hash=sha256:b9feb4e5ec8dc2d15709f4d5fc367794d69277f5d680baf1910fc9915c633524 \
-    --hash=sha256:bff2096bdba686019fb32d2dde45b95981f0d1490e054400f70fc9a8af34b49d \
-    --hash=sha256:c30aeceeaff11cd5ddbc348f37c58bcb96da8d5aa93fed78ab329de5f37a0d7a \
-    --hash=sha256:c9f80f9fad93a8cf71c7f161778ba47fd730d13a343a46258065c4deb4b550c0 \
-    --hash=sha256:cfd349de4158d797db2bd82d2020554a121674e98fbe6b15328456b3bf2495bb \
-    --hash=sha256:d0cd7050397b3609ea51727b1811e663ffda8bda39c6a5bb69525ef12414b503 \
-    --hash=sha256:d639c939ad7c440c7b2819a28d559179a4508783f7e5b991166f8d7a34b52815 \
-    --hash=sha256:e3ba04659e4fce609de2658fe4dbf7d6ed21987a94460f5f92df7579fd5d0e22 \
-    --hash=sha256:ecfe735e7a59e5a98208447293ff8580e9db1e890e232b8b292dc8bd15afc0d2 \
-    --hash=sha256:ef82d361ed5849d34cf09105d00b94b6728d289d6b9235513cb2fcc79f7c432c \
-    --hash=sha256:f03a5884c56256e08fd9e262e11b5cfacf1af96e2ce78dc095d2c41ccae2c80d \
-    --hash=sha256:f1fe60d0772831d96d263b53d83fb9a3d050a94b0e94b6d004a5ad111faa5b5b \
-    --hash=sha256:f517fd7259fe823ef3bd21e508b653d5492e706e9f0ef82c16ce3347a8a5620c \
-    --hash=sha256:fdb14bad0835914f325349ed34a51940bc2ad965142eb3090081593c6e347be9
+# Poetry (version 1.8.4) export at Tue Nov  5 11:42:39 MST 2024
+grpcio==1.67.1 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:01f616a964e540638af5130469451cf580ba8c7329f45ca998ab66e0c7dcdb04 \
+    --hash=sha256:0489063974d1452436139501bf6b180f63d4977223ee87488fe36858c5725292 \
+    --hash=sha256:0e6f255980afef598a9e64a24efce87b625e3e3c80a45162d111a461a9f92955 \
+    --hash=sha256:0f3e49c738396e93b7ba9016e153eb09e0778e776df6090c1b8c91877cc1c426 \
+    --hash=sha256:178f5db771c4f9a9facb2ab37a434c46cb9be1a75e820f187ee3d1e7805c4f65 \
+    --hash=sha256:1a65b503d008f066e994f34f456e0647e5ceb34cfcec5ad180b1b44020ad4970 \
+    --hash=sha256:1d7616d2ded471231c701489190379e0c311ee0a6c756f3c03e6a62b95a7146e \
+    --hash=sha256:24e8a26dbfc5274d7474c27759b54486b8de23c709d76695237515bc8b5baeab \
+    --hash=sha256:267d1745894200e4c604958da5f856da6293f063327cb049a51fe67348e4f953 \
+    --hash=sha256:299b3d8c4f790c6bcca485f9963b4846dd92cf6f1b65d3697145d005c80f9fe8 \
+    --hash=sha256:3b6c16489326d79ead41689c4b84bc40d522c9a7617219f4ad94bc7f448c5085 \
+    --hash=sha256:3dc2ed4cabea4dc14d5e708c2b426205956077cc5de419b4d4079315017e9732 \
+    --hash=sha256:43112046864317498a33bdc4797ae6a268c36345a910de9b9c17159d8346602f \
+    --hash=sha256:4422581cdc628f77302270ff839a44f4c24fdc57887dc2a45b7e53d8fc2376af \
+    --hash=sha256:4e7b904484a634a0fff132958dabdb10d63e0927398273917da3ee103e8d1f78 \
+    --hash=sha256:5721e66a594a6c4204458004852719b38f3d5522082be9061d6510b455c90afc \
+    --hash=sha256:5db70d32d6703b89912af16d6d45d78406374a8b8ef0d28140351dd0ec610e98 \
+    --hash=sha256:5ed601c4c6008429e3d247ddb367fe8c7259c355757448d7c1ef7bd4a6739e8e \
+    --hash=sha256:60336bff760fbb47d7e86165408126f1dded184448e9a4c892189eb7c9d3f90f \
+    --hash=sha256:608d87d1bdabf9e2868b12338cd38a79969eaf920c89d698ead08f48de9c0f9e \
+    --hash=sha256:60e6a4dcf5af7bbc36fd9f81c9f372e8ae580870a9e4b6eafe948cd334b81cf3 \
+    --hash=sha256:638354e698fd0c6c76b04540a850bf1db27b4d2515a19fcd5cf645c48d3eb1ed \
+    --hash=sha256:699e964923b70f3101393710793289e42845791ea07565654ada0969522d0a38 \
+    --hash=sha256:7818c0454027ae3384235a65210bbf5464bd715450e30a3d40385453a85a70cb \
+    --hash=sha256:786a5b18544622bfb1e25cc08402bd44ea83edfb04b93798d85dca4d1a0b5be5 \
+    --hash=sha256:804c6457c3cd3ec04fe6006c739579b8d35c86ae3298ffca8de57b493524b771 \
+    --hash=sha256:80b866f73224b0634f4312a4674c1be21b2b4afa73cb20953cbbb73a6b36c3cc \
+    --hash=sha256:85f69fdc1d28ce7cff8de3f9c67db2b0ca9ba4449644488c1e0303c146135ddb \
+    --hash=sha256:85f862069b86a305497e74d0dc43c02de3d1d184fc2c180993aa8aa86fbd19b8 \
+    --hash=sha256:8a00efecde9d6fcc3ab00c13f816313c040a28450e5e25739c24f432fc6d3c75 \
+    --hash=sha256:8a23cbcc5bb11ea7dc6163078be36c065db68d915c24f5faa4f872c573bb400f \
+    --hash=sha256:8b0341d66a57f8a3119b77ab32207072be60c9bf79760fa609c5609f2deb1f3f \
+    --hash=sha256:917e8d8994eed1d86b907ba2a61b9f0aef27a2155bca6cbb322430fc7135b7bb \
+    --hash=sha256:95b5f2b857856ed78d72da93cd7d09b6db8ef30102e5e7fe0961fe4d9f7d48e8 \
+    --hash=sha256:9e838cad2176ebd5d4a8bb03955138d6589ce9e2ce5d51c3ada34396dbd2dba8 \
+    --hash=sha256:9fd042de4a82e3e7aca44008ee2fb5da01b3e5adb316348c21980f7f58adc311 \
+    --hash=sha256:a25bdea92b13ff4d7790962190bf6bf5c4639876e01c0f3dda70fc2769616335 \
+    --hash=sha256:a6703916c43b1d468d0756c8077b12017a9fcb6a1ef13faf49e67d20d7ebda62 \
+    --hash=sha256:a93deda571a1bf94ec1f6fcda2872dad3ae538700d94dc283c672a3b508ba3af \
+    --hash=sha256:aa0162e56fd10a5547fac8774c4899fc3e18c1aa4a4759d0ce2cd00d3696ea6b \
+    --hash=sha256:b49359977c6ec9f5d0573ea4e0071ad278ef905aa74e420acc73fd28ce39e9ce \
+    --hash=sha256:beee96c8c0b1a75d556fe57b92b58b4347c77a65781ee2ac749d550f2a365dc1 \
+    --hash=sha256:c7a01337407dd89005527623a4a72c5c8e2894d22bead0895306b23c6695698f \
+    --hash=sha256:c9b929f13677b10f63124c1a410994a401cdd85214ad83ab67cc077fc7e480f0 \
+    --hash=sha256:cdc491ae35a13535fd9196acb5afe1af37c8237df2e54427be3eecda3653127e \
+    --hash=sha256:e279330bef1744040db8fc432becc8a727b84f456ab62b744d3fdb83f327e121 \
+    --hash=sha256:e29ca27bec8e163dca0c98084040edec3bc49afd10f18b412f483cc68c712744 \
+    --hash=sha256:e7d1797a8a3845437d327145959a2c0c47c05947c9eef5ff1a4c80e499dcc6fa \
+    --hash=sha256:ea33986b70f83844cd00814cee4451055cd8cab36f00ac64a31f5bb09b31919e \
+    --hash=sha256:ec74ef02010186185de82cc594058a3ccd8d86821842bbac9873fd4a2cf8be8d \
+    --hash=sha256:f26b0b547eb8d00e195274cdfc63ce64c8fc2d3e2d00b12bf468ece41a0423a0 \
+    --hash=sha256:f5a27dddefe0e2357d3e617b9079b4bfdc91341a91565111a21ed6ebbc51b22d \
+    --hash=sha256:f5b76ff64aaac53fede0cc93abf57894ab2a7362986ba22243d06218b93efe46 \
+    --hash=sha256:f9fff78ba10d4250bfc07a01bd6254a6d87dc67f9627adece85c0b2ed754fa96 \
+    --hash=sha256:fa0c739ad8b1996bd24823950e3cb5152ae91fca1c09cc791190bf1627ffefba
 parsy==2.1 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:8f18e7b11985e7802e7e3ecbd8291c6ca243d29820b1186e4c84605db4efffa0 \
     --hash=sha256:fd5dd18d7b0b61f8275ee88665f430a20c02cf5a82d88557f35330530186d7ac
-protobuf==5.27.3 ; python_version >= "3.10" and python_version < "4.0" \
-    --hash=sha256:043853dcb55cc262bf2e116215ad43fa0859caab79bb0b2d31b708f128ece035 \
-    --hash=sha256:16ddf3f8c6c41e1e803da7abea17b1793a97ef079a912e42351eabb19b2cffe7 \
-    --hash=sha256:68248c60d53f6168f565a8c76dc58ba4fa2ade31c2d1ebdae6d80f969cdc2d4f \
-    --hash=sha256:82460903e640f2b7e34ee81a947fdaad89de796d324bcbc38ff5430bcdead82c \
-    --hash=sha256:8572c6533e544ebf6899c360e91d6bcbbee2549251643d32c52cf8a5de295ba5 \
-    --hash=sha256:a55c48f2a2092d8e213bd143474df33a6ae751b781dd1d1f4d953c128a415b25 \
-    --hash=sha256:af7c0b7cfbbb649ad26132e53faa348580f844d9ca46fd3ec7ca48a1ea5db8a1 \
-    --hash=sha256:b8a994fb3d1c11156e7d1e427186662b64694a62b55936b2b9348f0a7c6625ce \
-    --hash=sha256:c2a105c24f08b1e53d6c7ffe69cb09d0031512f0b72f812dd4005b8112dbe91e \
-    --hash=sha256:c84eee2c71ed83704f1afbf1a85c3171eab0fd1ade3b399b3fad0884cbcca8bf \
-    --hash=sha256:dcb307cd4ef8fec0cf52cb9105a03d06fbb5275ce6d84a6ae33bc6cf84e0a07b
+protobuf==5.28.3 ; python_version >= "3.10" and python_version < "4.0" \
+    --hash=sha256:0c4eec6f987338617072592b97943fdbe30d019c56126493111cf24344c1cc24 \
+    --hash=sha256:135658402f71bbd49500322c0f736145731b16fc79dc8f367ab544a17eab4535 \
+    --hash=sha256:27b246b3723692bf1068d5734ddaf2fccc2cdd6e0c9b47fe099244d80200593b \
+    --hash=sha256:3e6101d095dfd119513cde7259aa703d16c6bbdfae2554dfe5cfdbe94e32d548 \
+    --hash=sha256:3fa2de6b8b29d12c61911505d893afe7320ce7ccba4df913e2971461fa36d584 \
+    --hash=sha256:64badbc49180a5e401f373f9ce7ab1d18b63f7dd4a9cdc43c92b9f0b481cef7b \
+    --hash=sha256:70585a70fc2dd4818c51287ceef5bdba6387f88a578c86d47bb34669b5552c36 \
+    --hash=sha256:712319fbdddb46f21abb66cd33cb9e491a5763b2febd8f228251add221981135 \
+    --hash=sha256:91fba8f445723fcf400fdbe9ca796b19d3b1242cd873907979b9ed71e4afe868 \
+    --hash=sha256:a3f6857551e53ce35e60b403b8a27b0295f7d6eb63d10484f12bc6879c715687 \
+    --hash=sha256:cee1757663fa32a1ee673434fcf3bf24dd54763c79690201208bafec62f19eed
 pyee==12.0.0 ; python_version >= "3.10" and python_version < "4.0" \
     --hash=sha256:7b14b74320600049ccc7d0e0b1becd3b4bd0a03c745758225e31a59f4095c990 \
     --hash=sha256:c480603f4aa2927d4766eb41fa82793fe60a82cbfdb8d688e0d08c55a534e145

examples/tests/test_basic.py

@@ -17,7 +17,7 @@ async def test_demo(demonet, python):
     async with python(BASIC_DIR / "demo.py") as demo:
         await asyncio.sleep(0.5)
         await demonet.send("pingall", expect="(12/12 received)")
-        demo.cancel()
+        raise asyncio.CancelledError()
 
 
 async def test_read_tables(demonet):

examples/tests/test_flowcache.py

@@ -18,7 +18,7 @@ async def test_demo(demonet, python):
         await asyncio.sleep(0.5)
         await demonet.send("h1 ping -c 1 -W .25 h2", expect="100% packet loss")
         await demonet.send("h2 ping -c 1 -W .25 h1", expect="100% packet loss")
-        demo.cancel()
+        raise asyncio.CancelledError()
 
 
 async def test_read_tables(demonet):

examples/tests/test_gnmi.py

@@ -28,7 +28,7 @@ async def test_demo2(demonet, python):
         await asyncio.sleep(0.5)
         await demonet.send("h1 ifconfig eth0 up")
         await asyncio.sleep(0.5)
-        demo2.cancel()
+        raise asyncio.CancelledError()
 
     assert (
         result.decode()
@@ -42,7 +42,7 @@ async def test_demo3(demonet, python):
 
     async with python(GNMI_DIR / "demo3.py") | result as demo3:
         await asyncio.sleep(6.5)
-        demo3.cancel()
+        raise asyncio.CancelledError()
 
     assert result.decode().startswith(
         "initial: s1-eth1 is UP\nupdate:  s1-eth1 is DOWN\nupdate:  s1-eth1 is UP\nupdate:  s1-eth1 is DOWN"

examples/tests/test_hello.py

@@ -41,7 +41,7 @@ async def test_demo1(demonet, python):
     async with python(HELLO_DIR / "demo1.py") as demo1:
         await asyncio.sleep(0.25)
         await demonet.send("pingall", expect="(6/6 received)")
-        demo1.cancel()
+        raise asyncio.CancelledError()
 
 
 async def test_demo2(demonet, python):
@@ -50,7 +50,7 @@ async def test_demo2(demonet, python):
         await asyncio.sleep(0.5)
         await demonet.send("pingall")
         await demonet.send("pingall", expect="(6/6 received)")
-        demo2.cancel()
+        raise asyncio.CancelledError()
 
 
 async def test_read_tables(demonet):
@@ -90,7 +90,7 @@ async def test_demo3(demonet, python):
         await asyncio.sleep(0.5)
         await demonet.send("pingall")
         await demonet.send("pingall", expect="(6/6 received)")
-        demo3.cancel()
+        raise asyncio.CancelledError()
 
 
 @pytest.mark.skipif(not testlib.has_pygraphviz(), reason="Requires pygraphviz")

examples/tests/test_int.py

@@ -18,7 +18,7 @@ async def test_demo(demonet, python):
         await asyncio.sleep(0.25)
         await demonet.send("h1 echo 'abc' | socat - udp:192.168.0.48:5555")
         await asyncio.sleep(1.0)
-        demo.cancel()
+        raise asyncio.CancelledError()
 
 
 async def test_read_tables(demonet):

examples/tests/test_l2switch.py

@@ -17,7 +17,7 @@ async def test_demo(demonet, python):
     async with python(L2SWITCH_DIR / "demo.py") as demo:
         await asyncio.sleep(0.5)
         await demonet.send("pingall", expect="(6/6 received)")
-        demo.cancel()
+        raise asyncio.CancelledError()
 
 
 async def test_read_tables(demonet):

examples/tests/test_ngsdn.py

@@ -26,7 +26,7 @@ async def test_ngsdn_oneshot(demonet, python):
         await demonet.send("h3 ping -c 1 h1a")
         await demonet.send("h1a ping -c 1 h3", expect=" 0% packet loss")
 
-        demo.cancel()
+        raise asyncio.CancelledError()
 
 
 async def test_leaf2(demonet):
@@ -163,7 +163,7 @@ async def test_ngsdn_actionprofile(demonet, python):
         await demonet.send("h3 ping -c 2 h1a")
         await demonet.send("h1a ping -c 1 h3", expect=" 0% packet loss")
 
-        demo.cancel()
+        raise asyncio.CancelledError()
 
 
 async def test_read_tables_actionprofile(demonet, caplog):

examples/tests/test_tls_demo.py

@@ -16,4 +16,4 @@ async def test_demo1(demonet, python):
     async with python(TLSDEMO_DIR / "demo1.py") as demo1:
         await asyncio.sleep(0.25)
         await demonet.send("pingall", expect="(2/2 received)")
-        demo1.cancel()
+        raise asyncio.CancelledError()