Merge pull request #220 from thodkatz/fix-proto

Bump grpcio to 1.44 to be compatible with protobuf 5
ilastik · Oct 11, 2024 · fb680c1 · fb680c1
2 parents c546e4b + e91bd2c
commit fb680c1
Show file tree

Hide file tree

Showing 5 changed files with 114 additions and 1,349 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -9,7 +9,9 @@ repos:
   rev: 5.12.0
   hooks:
     - id: isort
+      exclude: (.*_pb2.py|.*_pb2_grpc.py)
 - repo: https://github.com/pycqa/flake8
   rev: 6.0.0
   hooks:
     - id: flake8
+      exclude: (.*_pb2.py|.*_pb2_grpc.py)
diff --git a/conda-recipe/meta.yaml b/conda-recipe/meta.yaml
@@ -24,6 +24,8 @@ requirements:
   host:
     - pip
     - python >=3.8
+    - setuptools >=40.0
+    - setuptools_scm
   run:
     - python >=3.8
     {% for dep in setup_py_data['install_requires'] %}

diff --git a/environment.yml b/environment.yml
@@ -8,7 +8,7 @@ dependencies:
   # - bioimage.core via submodule
   - python 3.9.*
   - numpy
-  - grpcio=1.41
+  - grpcio=1.44 # protobuf 5 requires protoc version > 3.19.0 that requires grpcio >= 1.44
   - marshmallow-union
   - marshmallow=3.12.*
   - marshmallow-jsonschema

diff --git a/tiktorch/proto/data_store_pb2.py b/tiktorch/proto/data_store_pb2.py