From 465a730dc66bd8018075438ca80f12f9caab764b Mon Sep 17 00:00:00 2001 From: Matt Hurd Date: Mon, 20 Oct 2025 11:07:11 -0700 Subject: [PATCH] Update protobuf dependency version Our protos get built and compiled with `gencode 6.31.1`, and protobuf does not have compatibility outside of major versions. This also resolves an issue with using a protobuf API from a newer version. This will cause an incompatibility with Tensorflow<=2.20. This incompatibility is already technically there, but invisible. Tensorflow==2.19.X has a hard-cap on the protobuf version, preventing it from using 6.X.X. Unfortunately, XLA depends on 6.X.X protos, so this change is required. Resolves #1846 PiperOrigin-RevId: 821721239 --- requirements.in | 2 +- requirements_lock_3_10.txt | 23 +++++++++++------------ requirements_lock_3_11.txt | 33 +++++++++++++++++++-------------- requirements_lock_3_12.txt | 23 +++++++++++------------ requirements_lock_3_13.txt | 23 +++++++++++------------ requirements_lock_3_9.txt | 23 +++++++++++------------ 6 files changed, 64 insertions(+), 63 deletions(-) diff --git a/requirements.in b/requirements.in index 03a2f155c..5a588196d 100644 --- a/requirements.in +++ b/requirements.in @@ -5,5 +5,5 @@ fsspec[gcs] >= 2024.10.0 cheroot >= 10.0.1 etils[epath] >= 1.0.0 werkzeug >= 0.11.15 -protobuf >= 3.19.6 +protobuf >= 6.30.0 six >= 1.10.0 diff --git a/requirements_lock_3_10.txt b/requirements_lock_3_10.txt index 32ddb8dfe..e44c5ce70 100644 --- a/requirements_lock_3_10.txt +++ b/requirements_lock_3_10.txt @@ -694,18 +694,17 @@ proto-plus==1.26.1 \ --hash=sha256:13285478c2dcf2abb829db158e1047e2f1e8d63a077d94263c2b88b043c75a66 \ --hash=sha256:21a515a4c4c0088a773899e23c7bbade3d18f9c66c73edd4c7ee3816bc96a012 # via google-api-core -protobuf==4.25.7 \ - --hash=sha256:237db80000865851eac3c6e9d5597c0dfb0b2700d642ec48ed80b6ffe7b8729c \ - --hash=sha256:28f65ae8c14523cc2c76c1e91680958700d3eac69f45c96512c12c63d9a38807 \ - --hash=sha256:2f738d4f341186e697c4cdd0e03143ee5cf6cf523790748e61273a51997494c3 \ - --hash=sha256:3629b34b65f6204b17adf4ffe21adc8e85f6c6c0bc2baf3fb001b0d343edaebb \ - --hash=sha256:4c899f09b0502eb39174c717ccf005b844ea93e31137c167ddcacf3e09e49610 \ - --hash=sha256:6d2f5dede3d112e573f0e5f9778c0c19d9f9e209727abecae1d39db789f522c6 \ - --hash=sha256:cd873dbddb28460d1706ff4da2e7fac175f62f2a0bebc7b33141f7523c5a2399 \ - --hash=sha256:d41fb7ae72a25fcb79b2d71e4247f0547a02e8185ed51587c22827a87e5736ed \ - --hash=sha256:dc582cf1a73a6b40aa8e7704389b8d8352da616bc8ed5c6cc614bdd0b5ce3f7a \ - --hash=sha256:e9d969f5154eaeab41404def5dcf04e62162178f4b9de98b2d3c1c70f5f84810 \ - --hash=sha256:ea41b75edb0f1110050a60e653820d9acc70b6fb471013971535f412addbb0d0 +protobuf==6.33.0 \ + --hash=sha256:140303d5c8d2037730c548f8c7b93b20bb1dc301be280c378b82b8894589c954 \ + --hash=sha256:25c9e1963c6734448ea2d308cfa610e692b801304ba0908d7bfa564ac5132995 \ + --hash=sha256:35be49fd3f4fefa4e6e2aacc35e8b837d6703c37a2168a55ac21e9b1bc7559ef \ + --hash=sha256:905b07a65f1a4b72412314082c7dbfae91a9e8b68a0cc1577515f8df58ecf455 \ + --hash=sha256:9a031d10f703f03768f2743a1c403af050b6ae1f3480e9c140f39c45f81b13ee \ + --hash=sha256:c963e86c3655af3a917962c9619e1a6b9670540351d7af9439d06064e3317cc9 \ + --hash=sha256:cd33a8e38ea3e39df66e1bbc462b076d6e5ba3a4ebbde58219d777223a7873d3 \ + --hash=sha256:d6101ded078042a8f17959eccd9236fb7a9ca20d3b0098bbcb91533a5680d035 \ + --hash=sha256:e0697ece353e6239b90ee43a9231318302ad8353c70e6e45499fa52396debf90 \ + --hash=sha256:e0a1715e4f27355afd9570f3ea369735afc853a6c3951a6afe1f80d8569ad298 # via # -r requirements.in # google-api-core diff --git a/requirements_lock_3_11.txt b/requirements_lock_3_11.txt index 4addfbd40..1124f8bdc 100644 --- a/requirements_lock_3_11.txt +++ b/requirements_lock_3_11.txt @@ -1,5 +1,5 @@ # -# This file is autogenerated by pip-compile with Python 3.11 +# This file is autogenerated by pip-compile with Python 3.10 # by the following command: # # bazel run //:requirements.update @@ -99,6 +99,10 @@ aiosignal==1.3.2 \ --hash=sha256:45cde58e409a301715980c2b01d0c28bdde3770d8290b5eb2173759d9acb31a5 \ --hash=sha256:a8c255c66fafb1e499c9351d0bf32ff2d8a0321595ebac3b93713656d2436f54 # via aiohttp +async-timeout==5.0.1 \ + --hash=sha256:39e3809566ff85354557ec2398b55e096c8364bacac9405a7a1fa429e77fe76c \ + --hash=sha256:d9321a7a3d5a6a5e187e824d2fa0793ce379a202935782d555d6e9d2735677d3 + # via aiohttp attrs==25.3.0 \ --hash=sha256:427318ce031701fea540783410126f03899a97ffc6f61596ad581ac2e40e3bc3 \ --hash=sha256:75d7cefc7fb576747b2c81b4442d4d4a1ce0900973527c011d1030fd3bf4af1b @@ -690,18 +694,17 @@ proto-plus==1.26.1 \ --hash=sha256:13285478c2dcf2abb829db158e1047e2f1e8d63a077d94263c2b88b043c75a66 \ --hash=sha256:21a515a4c4c0088a773899e23c7bbade3d18f9c66c73edd4c7ee3816bc96a012 # via google-api-core -protobuf==4.25.7 \ - --hash=sha256:237db80000865851eac3c6e9d5597c0dfb0b2700d642ec48ed80b6ffe7b8729c \ - --hash=sha256:28f65ae8c14523cc2c76c1e91680958700d3eac69f45c96512c12c63d9a38807 \ - --hash=sha256:2f738d4f341186e697c4cdd0e03143ee5cf6cf523790748e61273a51997494c3 \ - --hash=sha256:3629b34b65f6204b17adf4ffe21adc8e85f6c6c0bc2baf3fb001b0d343edaebb \ - --hash=sha256:4c899f09b0502eb39174c717ccf005b844ea93e31137c167ddcacf3e09e49610 \ - --hash=sha256:6d2f5dede3d112e573f0e5f9778c0c19d9f9e209727abecae1d39db789f522c6 \ - --hash=sha256:cd873dbddb28460d1706ff4da2e7fac175f62f2a0bebc7b33141f7523c5a2399 \ - --hash=sha256:d41fb7ae72a25fcb79b2d71e4247f0547a02e8185ed51587c22827a87e5736ed \ - --hash=sha256:dc582cf1a73a6b40aa8e7704389b8d8352da616bc8ed5c6cc614bdd0b5ce3f7a \ - --hash=sha256:e9d969f5154eaeab41404def5dcf04e62162178f4b9de98b2d3c1c70f5f84810 \ - --hash=sha256:ea41b75edb0f1110050a60e653820d9acc70b6fb471013971535f412addbb0d0 +protobuf==6.33.0 \ + --hash=sha256:140303d5c8d2037730c548f8c7b93b20bb1dc301be280c378b82b8894589c954 \ + --hash=sha256:25c9e1963c6734448ea2d308cfa610e692b801304ba0908d7bfa564ac5132995 \ + --hash=sha256:35be49fd3f4fefa4e6e2aacc35e8b837d6703c37a2168a55ac21e9b1bc7559ef \ + --hash=sha256:905b07a65f1a4b72412314082c7dbfae91a9e8b68a0cc1577515f8df58ecf455 \ + --hash=sha256:9a031d10f703f03768f2743a1c403af050b6ae1f3480e9c140f39c45f81b13ee \ + --hash=sha256:c963e86c3655af3a917962c9619e1a6b9670540351d7af9439d06064e3317cc9 \ + --hash=sha256:cd33a8e38ea3e39df66e1bbc462b076d6e5ba3a4ebbde58219d777223a7873d3 \ + --hash=sha256:d6101ded078042a8f17959eccd9236fb7a9ca20d3b0098bbcb91533a5680d035 \ + --hash=sha256:e0697ece353e6239b90ee43a9231318302ad8353c70e6e45499fa52396debf90 \ + --hash=sha256:e0a1715e4f27355afd9570f3ea369735afc853a6c3951a6afe1f80d8569ad298 # via # -r requirements.in # google-api-core @@ -742,7 +745,9 @@ six==1.16.0 \ typing-extensions==4.13.2 \ --hash=sha256:a439e7c04b49fec3e5d3e2beaa21755cadbbdc391694e28ccdd36ca4a1408f8c \ --hash=sha256:e6c81219bd689f51865d9e372991c540bda33a0379d5573cddb9a3a23f7caaef - # via etils + # via + # etils + # multidict urllib3==2.3.0 \ --hash=sha256:1cee9ad369867bfdbbb48b7dd50374c0967a0bb7710050facf0dd6911440e3df \ --hash=sha256:f8c5449b3cf0861679ce7e0503c7b44b5ec981bec0d1d3795a07f1ba96f0204d diff --git a/requirements_lock_3_12.txt b/requirements_lock_3_12.txt index 14688bcb3..5167579d1 100644 --- a/requirements_lock_3_12.txt +++ b/requirements_lock_3_12.txt @@ -690,18 +690,17 @@ proto-plus==1.26.1 \ --hash=sha256:13285478c2dcf2abb829db158e1047e2f1e8d63a077d94263c2b88b043c75a66 \ --hash=sha256:21a515a4c4c0088a773899e23c7bbade3d18f9c66c73edd4c7ee3816bc96a012 # via google-api-core -protobuf==4.25.7 \ - --hash=sha256:237db80000865851eac3c6e9d5597c0dfb0b2700d642ec48ed80b6ffe7b8729c \ - --hash=sha256:28f65ae8c14523cc2c76c1e91680958700d3eac69f45c96512c12c63d9a38807 \ - --hash=sha256:2f738d4f341186e697c4cdd0e03143ee5cf6cf523790748e61273a51997494c3 \ - --hash=sha256:3629b34b65f6204b17adf4ffe21adc8e85f6c6c0bc2baf3fb001b0d343edaebb \ - --hash=sha256:4c899f09b0502eb39174c717ccf005b844ea93e31137c167ddcacf3e09e49610 \ - --hash=sha256:6d2f5dede3d112e573f0e5f9778c0c19d9f9e209727abecae1d39db789f522c6 \ - --hash=sha256:cd873dbddb28460d1706ff4da2e7fac175f62f2a0bebc7b33141f7523c5a2399 \ - --hash=sha256:d41fb7ae72a25fcb79b2d71e4247f0547a02e8185ed51587c22827a87e5736ed \ - --hash=sha256:dc582cf1a73a6b40aa8e7704389b8d8352da616bc8ed5c6cc614bdd0b5ce3f7a \ - --hash=sha256:e9d969f5154eaeab41404def5dcf04e62162178f4b9de98b2d3c1c70f5f84810 \ - --hash=sha256:ea41b75edb0f1110050a60e653820d9acc70b6fb471013971535f412addbb0d0 +protobuf==6.33.0 \ + --hash=sha256:140303d5c8d2037730c548f8c7b93b20bb1dc301be280c378b82b8894589c954 \ + --hash=sha256:25c9e1963c6734448ea2d308cfa610e692b801304ba0908d7bfa564ac5132995 \ + --hash=sha256:35be49fd3f4fefa4e6e2aacc35e8b837d6703c37a2168a55ac21e9b1bc7559ef \ + --hash=sha256:905b07a65f1a4b72412314082c7dbfae91a9e8b68a0cc1577515f8df58ecf455 \ + --hash=sha256:9a031d10f703f03768f2743a1c403af050b6ae1f3480e9c140f39c45f81b13ee \ + --hash=sha256:c963e86c3655af3a917962c9619e1a6b9670540351d7af9439d06064e3317cc9 \ + --hash=sha256:cd33a8e38ea3e39df66e1bbc462b076d6e5ba3a4ebbde58219d777223a7873d3 \ + --hash=sha256:d6101ded078042a8f17959eccd9236fb7a9ca20d3b0098bbcb91533a5680d035 \ + --hash=sha256:e0697ece353e6239b90ee43a9231318302ad8353c70e6e45499fa52396debf90 \ + --hash=sha256:e0a1715e4f27355afd9570f3ea369735afc853a6c3951a6afe1f80d8569ad298 # via # -r requirements.in # google-api-core diff --git a/requirements_lock_3_13.txt b/requirements_lock_3_13.txt index ee60abb44..fe817d0eb 100644 --- a/requirements_lock_3_13.txt +++ b/requirements_lock_3_13.txt @@ -690,18 +690,17 @@ proto-plus==1.26.1 \ --hash=sha256:13285478c2dcf2abb829db158e1047e2f1e8d63a077d94263c2b88b043c75a66 \ --hash=sha256:21a515a4c4c0088a773899e23c7bbade3d18f9c66c73edd4c7ee3816bc96a012 # via google-api-core -protobuf==4.25.7 \ - --hash=sha256:237db80000865851eac3c6e9d5597c0dfb0b2700d642ec48ed80b6ffe7b8729c \ - --hash=sha256:28f65ae8c14523cc2c76c1e91680958700d3eac69f45c96512c12c63d9a38807 \ - --hash=sha256:2f738d4f341186e697c4cdd0e03143ee5cf6cf523790748e61273a51997494c3 \ - --hash=sha256:3629b34b65f6204b17adf4ffe21adc8e85f6c6c0bc2baf3fb001b0d343edaebb \ - --hash=sha256:4c899f09b0502eb39174c717ccf005b844ea93e31137c167ddcacf3e09e49610 \ - --hash=sha256:6d2f5dede3d112e573f0e5f9778c0c19d9f9e209727abecae1d39db789f522c6 \ - --hash=sha256:cd873dbddb28460d1706ff4da2e7fac175f62f2a0bebc7b33141f7523c5a2399 \ - --hash=sha256:d41fb7ae72a25fcb79b2d71e4247f0547a02e8185ed51587c22827a87e5736ed \ - --hash=sha256:dc582cf1a73a6b40aa8e7704389b8d8352da616bc8ed5c6cc614bdd0b5ce3f7a \ - --hash=sha256:e9d969f5154eaeab41404def5dcf04e62162178f4b9de98b2d3c1c70f5f84810 \ - --hash=sha256:ea41b75edb0f1110050a60e653820d9acc70b6fb471013971535f412addbb0d0 +protobuf==6.33.0 \ + --hash=sha256:140303d5c8d2037730c548f8c7b93b20bb1dc301be280c378b82b8894589c954 \ + --hash=sha256:25c9e1963c6734448ea2d308cfa610e692b801304ba0908d7bfa564ac5132995 \ + --hash=sha256:35be49fd3f4fefa4e6e2aacc35e8b837d6703c37a2168a55ac21e9b1bc7559ef \ + --hash=sha256:905b07a65f1a4b72412314082c7dbfae91a9e8b68a0cc1577515f8df58ecf455 \ + --hash=sha256:9a031d10f703f03768f2743a1c403af050b6ae1f3480e9c140f39c45f81b13ee \ + --hash=sha256:c963e86c3655af3a917962c9619e1a6b9670540351d7af9439d06064e3317cc9 \ + --hash=sha256:cd33a8e38ea3e39df66e1bbc462b076d6e5ba3a4ebbde58219d777223a7873d3 \ + --hash=sha256:d6101ded078042a8f17959eccd9236fb7a9ca20d3b0098bbcb91533a5680d035 \ + --hash=sha256:e0697ece353e6239b90ee43a9231318302ad8353c70e6e45499fa52396debf90 \ + --hash=sha256:e0a1715e4f27355afd9570f3ea369735afc853a6c3951a6afe1f80d8569ad298 # via # -r requirements.in # google-api-core diff --git a/requirements_lock_3_9.txt b/requirements_lock_3_9.txt index 7a8850141..8c4d04d6d 100644 --- a/requirements_lock_3_9.txt +++ b/requirements_lock_3_9.txt @@ -694,18 +694,17 @@ proto-plus==1.26.1 \ --hash=sha256:13285478c2dcf2abb829db158e1047e2f1e8d63a077d94263c2b88b043c75a66 \ --hash=sha256:21a515a4c4c0088a773899e23c7bbade3d18f9c66c73edd4c7ee3816bc96a012 # via google-api-core -protobuf==4.25.7 \ - --hash=sha256:237db80000865851eac3c6e9d5597c0dfb0b2700d642ec48ed80b6ffe7b8729c \ - --hash=sha256:28f65ae8c14523cc2c76c1e91680958700d3eac69f45c96512c12c63d9a38807 \ - --hash=sha256:2f738d4f341186e697c4cdd0e03143ee5cf6cf523790748e61273a51997494c3 \ - --hash=sha256:3629b34b65f6204b17adf4ffe21adc8e85f6c6c0bc2baf3fb001b0d343edaebb \ - --hash=sha256:4c899f09b0502eb39174c717ccf005b844ea93e31137c167ddcacf3e09e49610 \ - --hash=sha256:6d2f5dede3d112e573f0e5f9778c0c19d9f9e209727abecae1d39db789f522c6 \ - --hash=sha256:cd873dbddb28460d1706ff4da2e7fac175f62f2a0bebc7b33141f7523c5a2399 \ - --hash=sha256:d41fb7ae72a25fcb79b2d71e4247f0547a02e8185ed51587c22827a87e5736ed \ - --hash=sha256:dc582cf1a73a6b40aa8e7704389b8d8352da616bc8ed5c6cc614bdd0b5ce3f7a \ - --hash=sha256:e9d969f5154eaeab41404def5dcf04e62162178f4b9de98b2d3c1c70f5f84810 \ - --hash=sha256:ea41b75edb0f1110050a60e653820d9acc70b6fb471013971535f412addbb0d0 +protobuf==6.33.0 \ + --hash=sha256:140303d5c8d2037730c548f8c7b93b20bb1dc301be280c378b82b8894589c954 \ + --hash=sha256:25c9e1963c6734448ea2d308cfa610e692b801304ba0908d7bfa564ac5132995 \ + --hash=sha256:35be49fd3f4fefa4e6e2aacc35e8b837d6703c37a2168a55ac21e9b1bc7559ef \ + --hash=sha256:905b07a65f1a4b72412314082c7dbfae91a9e8b68a0cc1577515f8df58ecf455 \ + --hash=sha256:9a031d10f703f03768f2743a1c403af050b6ae1f3480e9c140f39c45f81b13ee \ + --hash=sha256:c963e86c3655af3a917962c9619e1a6b9670540351d7af9439d06064e3317cc9 \ + --hash=sha256:cd33a8e38ea3e39df66e1bbc462b076d6e5ba3a4ebbde58219d777223a7873d3 \ + --hash=sha256:d6101ded078042a8f17959eccd9236fb7a9ca20d3b0098bbcb91533a5680d035 \ + --hash=sha256:e0697ece353e6239b90ee43a9231318302ad8353c70e6e45499fa52396debf90 \ + --hash=sha256:e0a1715e4f27355afd9570f3ea369735afc853a6c3951a6afe1f80d8569ad298 # via # -r requirements.in # google-api-core