Upgrade to protobuf 4 (#695)

* Update protobuf and protoc version * Regenerate protobuf code * Fix broken tests by not comparing string representations of protobufs * fix test * temp fix: imageio 2.27 and 2.28 have different behavior --------- Co-authored-by: Tzu-Wei Huang <huang.dexter@gmail.com>
lanpa · May 14, 2023 · 781a0e2 · LarsDu · Jun 6, 2023 · 781a0e2
1 parent 5f1f074
commit 781a0e2
Show file tree

Hide file tree

Showing 20 changed files with 352 additions and 4,036 deletions.
diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml
@@ -56,7 +56,7 @@ jobs:
         python-version: 3.9
     - name: Run examples
       run: |
-        pip install six tensorboard pytest matplotlib torchvision==0.10.0 protobuf==3.8 moviepy==1.0.3
+        pip install six tensorboard pytest matplotlib torchvision protobuf==4.22.3 moviepy==1.0.3 imageio==2.27
         python examples/demo.py
         python examples/demo_graph.py
         python examples/demo_embedding.py

diff --git a/compile.sh b/compile.sh
@@ -3,7 +3,7 @@
 # Exit on error
 # set -e
 
-DESIRED_PROTO_VERSION="3.8.0"
+DESIRED_PROTO_VERSION="22.3"
 
 # call protoc direclty, if version is not the desired one, download the desired vesrion.
 

diff --git a/setup.py b/setup.py
@@ -34,7 +34,7 @@ def run(self):
 requirements = [
     'numpy',
     'packaging',
-    'protobuf>=3.8.0,<4',
+    'protobuf>=4.22.3,<5',
 ]
 
 

diff --git a/tensorboardX/proto/api_pb2.py b/tensorboardX/proto/api_pb2.py
diff --git a/tensorboardX/proto/attr_value_pb2.py b/tensorboardX/proto/attr_value_pb2.py