Update grpc dependencies for 3.13 compatibility

Author: ni-jfitzger

build/templates/setup.py.mako

@@ -46,7 +46,7 @@ setup(
     extras_require={
         'grpc': [
             'grpcio>=1.59.0,<2.0',
-            'protobuf>=4.21.6,<5.0'
+            'protobuf>=4.21.6'
         ],
     },
     % endif

generated/nidcpower/nidcpower/nidcpower_pb2.py

@@ -1,4 +1,24 @@
 # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
 """Client and server classes corresponding to protobuf-defined services."""
 import grpc
+import warnings
 
+
+GRPC_GENERATED_VERSION = '1.67.0'
+GRPC_VERSION = grpc.__version__
+_version_not_supported = False
+
+try:
+    from grpc._utilities import first_version_is_lower
+    _version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION)
+except ImportError:
+    _version_not_supported = True
+
+if _version_not_supported:
+    raise RuntimeError(
+        f'The grpc package installed is at version {GRPC_VERSION},'
+        + f' but the generated code in nidevice_pb2_grpc.py depends on'
+        + f' grpcio>={GRPC_GENERATED_VERSION}.'
+        + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
+        + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
+    )

generated/nidcpower/nidcpower/nidcpower_pb2_grpc.py

@@ -1,9 +1,29 @@
 # Generated by the gRPC Python protocol compiler plugin. DO NOT EDIT!
 """Client and server classes corresponding to protobuf-defined services."""
 import grpc
+import warnings
 
 from . import session_pb2 as session__pb2
 
+GRPC_GENERATED_VERSION = '1.67.0'
+GRPC_VERSION = grpc.__version__
+_version_not_supported = False
+
+try:
+    from grpc._utilities import first_version_is_lower
+    _version_not_supported = first_version_is_lower(GRPC_VERSION, GRPC_GENERATED_VERSION)
+except ImportError:
+    _version_not_supported = True
+
+if _version_not_supported:
+    raise RuntimeError(
+        f'The grpc package installed is at version {GRPC_VERSION},'
+        + f' but the generated code in session_pb2_grpc.py depends on'
+        + f' grpcio>={GRPC_GENERATED_VERSION}.'
+        + f' Please upgrade your grpc module to grpcio>={GRPC_GENERATED_VERSION}'
+        + f' or downgrade your generated code using grpcio-tools<={GRPC_VERSION}.'
+    )
+
 
 class SessionUtilitiesStub(object):
     """Missing associated documentation comment in .proto file."""
@@ -18,27 +38,27 @@ def __init__(self, channel):
                 '/nidevice_grpc.SessionUtilities/EnumerateDevices',
                 request_serializer=session__pb2.EnumerateDevicesRequest.SerializeToString,
                 response_deserializer=session__pb2.EnumerateDevicesResponse.FromString,
-                )
+                _registered_method=True)
         self.Reserve = channel.unary_unary(
                 '/nidevice_grpc.SessionUtilities/Reserve',
                 request_serializer=session__pb2.ReserveRequest.SerializeToString,
                 response_deserializer=session__pb2.ReserveResponse.FromString,
-                )
+                _registered_method=True)
         self.IsReservedByClient = channel.unary_unary(
                 '/nidevice_grpc.SessionUtilities/IsReservedByClient',
                 request_serializer=session__pb2.IsReservedByClientRequest.SerializeToString,
                 response_deserializer=session__pb2.IsReservedByClientResponse.FromString,
-                )
+                _registered_method=True)
         self.Unreserve = channel.unary_unary(
                 '/nidevice_grpc.SessionUtilities/Unreserve',
                 request_serializer=session__pb2.UnreserveRequest.SerializeToString,
                 response_deserializer=session__pb2.UnreserveResponse.FromString,
-                )
+                _registered_method=True)
         self.ResetServer = channel.unary_unary(
                 '/nidevice_grpc.SessionUtilities/ResetServer',
                 request_serializer=session__pb2.ResetServerRequest.SerializeToString,
                 response_deserializer=session__pb2.ResetServerResponse.FromString,
-                )
+                _registered_method=True)
 
 
 class SessionUtilitiesServicer(object):
@@ -112,6 +132,7 @@ def add_SessionUtilitiesServicer_to_server(servicer, server):
     generic_handler = grpc.method_handlers_generic_handler(
             'nidevice_grpc.SessionUtilities', rpc_method_handlers)
     server.add_generic_rpc_handlers((generic_handler,))
+    server.add_registered_method_handlers('nidevice_grpc.SessionUtilities', rpc_method_handlers)
 
 
  # This class is part of an EXPERIMENTAL API.
@@ -129,11 +150,21 @@ def EnumerateDevices(request,
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/nidevice_grpc.SessionUtilities/EnumerateDevices',
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/nidevice_grpc.SessionUtilities/EnumerateDevices',
             session__pb2.EnumerateDevicesRequest.SerializeToString,
             session__pb2.EnumerateDevicesResponse.FromString,
-            options, channel_credentials,
-            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
 
     @staticmethod
     def Reserve(request,
@@ -146,11 +177,21 @@ def Reserve(request,
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/nidevice_grpc.SessionUtilities/Reserve',
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/nidevice_grpc.SessionUtilities/Reserve',
             session__pb2.ReserveRequest.SerializeToString,
             session__pb2.ReserveResponse.FromString,
-            options, channel_credentials,
-            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
 
     @staticmethod
     def IsReservedByClient(request,
@@ -163,11 +204,21 @@ def IsReservedByClient(request,
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/nidevice_grpc.SessionUtilities/IsReservedByClient',
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/nidevice_grpc.SessionUtilities/IsReservedByClient',
             session__pb2.IsReservedByClientRequest.SerializeToString,
             session__pb2.IsReservedByClientResponse.FromString,
-            options, channel_credentials,
-            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
 
     @staticmethod
     def Unreserve(request,
@@ -180,11 +231,21 @@ def Unreserve(request,
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/nidevice_grpc.SessionUtilities/Unreserve',
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/nidevice_grpc.SessionUtilities/Unreserve',
             session__pb2.UnreserveRequest.SerializeToString,
             session__pb2.UnreserveResponse.FromString,
-            options, channel_credentials,
-            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)
 
     @staticmethod
     def ResetServer(request,
@@ -197,8 +258,18 @@ def ResetServer(request,
             wait_for_ready=None,
             timeout=None,
             metadata=None):
-        return grpc.experimental.unary_unary(request, target, '/nidevice_grpc.SessionUtilities/ResetServer',
+        return grpc.experimental.unary_unary(
+            request,
+            target,
+            '/nidevice_grpc.SessionUtilities/ResetServer',
             session__pb2.ResetServerRequest.SerializeToString,
             session__pb2.ResetServerResponse.FromString,
-            options, channel_credentials,
-            insecure, call_credentials, compression, wait_for_ready, timeout, metadata)
+            options,
+            channel_credentials,
+            insecure,
+            call_credentials,
+            compression,
+            wait_for_ready,
+            timeout,
+            metadata,
+            _registered_method=True)

generated/nidcpower/nidcpower/nidevice_pb2.py

@@ -36,7 +36,7 @@ def read_contents(file_to_read):
     extras_require={
         'grpc': [
             'grpcio>=1.59.0,<2.0',
-            'protobuf>=4.21.6,<5.0'
+            'protobuf>=4.21.6'
         ],
     },
     classifiers=[