diff --git a/environment.yml b/environment.yml index b15e0824..55185815 100644 --- 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 index a8e02b25..ee5e9499 100644 --- 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 index 729b135d..d6490a73 100644 --- a/tiktorch/proto/data_store_pb2.py +++ b/tiktorch/proto/data_store_pb2.py @@ -2,7 +2,7 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # NO CHECKED-IN PROTOBUF GENCODE # source: data_store.proto -# Protobuf Python Version: 5.28.1 +# Protobuf Python Version: 5.27.2 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool @@ -12,8 +12,8 @@ _runtime_version.ValidateProtobufRuntimeVersion( _runtime_version.Domain.PUBLIC, 5, - 28, - 1, + 27, + 2, '', 'data_store.proto' ) diff --git a/tiktorch/proto/data_store_pb2_grpc.py b/tiktorch/proto/data_store_pb2_grpc.py index 482728bb..3c82c7ec 100644 --- 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 index 0e2cef91..562eb733 100644 --- a/tiktorch/proto/inference_pb2.py +++ b/tiktorch/proto/inference_pb2.py @@ -2,7 +2,7 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # NO CHECKED-IN PROTOBUF GENCODE # source: inference.proto -# Protobuf Python Version: 5.28.1 +# Protobuf Python Version: 5.27.2 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool @@ -12,8 +12,8 @@ _runtime_version.ValidateProtobufRuntimeVersion( _runtime_version.Domain.PUBLIC, 5, - 28, - 1, + 27, + 2, '', 'inference.proto' ) diff --git a/tiktorch/proto/inference_pb2_grpc.py b/tiktorch/proto/inference_pb2_grpc.py index 1d650d31..15bed756 100644 --- 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 index 6e2f1d94..620e14b1 100644 --- a/tiktorch/proto/training_pb2.py +++ b/tiktorch/proto/training_pb2.py @@ -2,7 +2,7 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # NO CHECKED-IN PROTOBUF GENCODE # source: training.proto -# Protobuf Python Version: 5.28.1 +# Protobuf Python Version: 5.27.2 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool @@ -12,8 +12,8 @@ _runtime_version.ValidateProtobufRuntimeVersion( _runtime_version.Domain.PUBLIC, 5, - 28, - 1, + 27, + 2, '', 'training.proto' ) diff --git a/tiktorch/proto/training_pb2_grpc.py b/tiktorch/proto/training_pb2_grpc.py index 6e7b20d0..27cb282d 100644 --- 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 index dbf17092..474d70b2 100644 --- a/tiktorch/proto/utils_pb2.py +++ b/tiktorch/proto/utils_pb2.py @@ -2,7 +2,7 @@ # Generated by the protocol buffer compiler. DO NOT EDIT! # NO CHECKED-IN PROTOBUF GENCODE # source: utils.proto -# Protobuf Python Version: 5.28.1 +# Protobuf Python Version: 5.27.2 """Generated protocol buffer code.""" from google.protobuf import descriptor as _descriptor from google.protobuf import descriptor_pool as _descriptor_pool @@ -12,8 +12,8 @@ _runtime_version.ValidateProtobufRuntimeVersion( _runtime_version.Domain.PUBLIC, 5, - 28, - 1, + 27, + 2, '', 'utils.proto' ) diff --git a/tiktorch/proto/utils_pb2_grpc.py b/tiktorch/proto/utils_pb2_grpc.py index 8dfce425..3eb59a86 100644 --- 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