Bump proto to >5

ilastik · Dec 19, 2024 · a088627 · a088627
1 parent e27db39
commit a088627
Show file tree

Hide file tree

Showing 10 changed files with 21 additions and 20 deletions.
diff --git a/environment.yml b/environment.yml
@@ -9,11 +9,12 @@ dependencies:
   # - bioimage.core via submodule
   - python 3.9.*
   - numpy >=1.21,<2
-  - grpcio=1.49.1 # protobuf 5 requires protoc version > 3.19.0 that requires grpcio >= 1.44
+  - grpcio
+  - grpcio-tools
   - marshmallow-union
   - marshmallow=3.12.*
   - marshmallow-jsonschema
-  - protobuf
+  - protobuf >5
   - pyyaml=5.3.*
   - requests
   - scikit-learn

diff --git a/setup.py b/setup.py
@@ -29,9 +29,9 @@
     install_requires=[
         "bioimageio.spec==0.5.3.3",
         "bioimageio.core==0.6.10",
-        "grpcio>=1.31",
+        "grpcio",
         "numpy<2",  # pytorch 2.2.2-py3.9_0 for macos is compiled with numpy 1.*
-        "protobuf",
+        "protobuf>5",
         "pydantic>=2.7.0,<2.10",
         "pytorch3dunet",
         "pyyaml",

diff --git a/tiktorch/proto/data_store_pb2.py b/tiktorch/proto/data_store_pb2.py
diff --git a/tiktorch/proto/data_store_pb2_grpc.py b/tiktorch/proto/data_store_pb2_grpc.py
@@ -5,7 +5,7 @@
 
 from . import data_store_pb2 as data__store__pb2
 
-GRPC_GENERATED_VERSION = '1.68.1'
+GRPC_GENERATED_VERSION = '1.67.1'
 GRPC_VERSION = grpc.__version__
 _version_not_supported = False
 

diff --git a/tiktorch/proto/inference_pb2.py b/tiktorch/proto/inference_pb2.py
diff --git a/tiktorch/proto/inference_pb2_grpc.py b/tiktorch/proto/inference_pb2_grpc.py
@@ -6,7 +6,7 @@
 from . import inference_pb2 as inference__pb2
 from . import utils_pb2 as utils__pb2
 
-GRPC_GENERATED_VERSION = '1.68.1'
+GRPC_GENERATED_VERSION = '1.67.1'
 GRPC_VERSION = grpc.__version__
 _version_not_supported = False
 

diff --git a/tiktorch/proto/training_pb2.py b/tiktorch/proto/training_pb2.py
diff --git a/tiktorch/proto/training_pb2_grpc.py b/tiktorch/proto/training_pb2_grpc.py
@@ -6,7 +6,7 @@
 from . import training_pb2 as training__pb2
 from . import utils_pb2 as utils__pb2
 
-GRPC_GENERATED_VERSION = '1.68.1'
+GRPC_GENERATED_VERSION = '1.67.1'
 GRPC_VERSION = grpc.__version__
 _version_not_supported = False
 

diff --git a/tiktorch/proto/utils_pb2.py b/tiktorch/proto/utils_pb2.py
diff --git a/tiktorch/proto/utils_pb2_grpc.py b/tiktorch/proto/utils_pb2_grpc.py
@@ -4,7 +4,7 @@
 import warnings
 
 
-GRPC_GENERATED_VERSION = '1.68.1'
+GRPC_GENERATED_VERSION = '1.67.1'
 GRPC_VERSION = grpc.__version__
 _version_not_supported = False