[releases/2.3] Update to typeshed version of gRPC stubs (#1184)

bkeryan · web-flow · commit 88ca43fd982e · 2025-06-24T19:18:38.000Z
Update to typeshed version of gRPC stubs (#1115) * Upgrade to typeshed gRPC stubs * Update poetry.lock * Retrofit for types-grpcio changes (cherry picked from commit 65d348e)
diff --git a/examples/game_of_life/pyproject.toml b/examples/game_of_life/pyproject.toml
@@ -13,7 +13,7 @@ click = ">=7.1.2, !=8.1.4" # mypy fails with click 8.1.4: https://github.com/pal
 [tool.poetry.group.dev.dependencies]
 ni-python-styleguide = ">=0.4.1"
 mypy = ">=1.0"
-grpc-stubs = "^1.53"
+types-grpcio = ">=1.0"
 types-protobuf = ">=4.21"
 # Uncomment to use prerelease dependencies.
 # ni-measurement-plugin-sdk-service = {path = "../../packages/service", develop = true}
diff --git a/examples/nidaqmx_analog_input/pyproject.toml b/examples/nidaqmx_analog_input/pyproject.toml
@@ -14,7 +14,7 @@ click = ">=7.1.2, !=8.1.4" # mypy fails with click 8.1.4: https://github.com/pal
 [tool.poetry.group.dev.dependencies]
 ni-python-styleguide = ">=0.4.1"
 mypy = ">=1.0"
-grpc-stubs = "^1.53"
+types-grpcio = ">=1.0"
 # Uncomment to use prerelease dependencies.
 # nidaqmx = { git = "https://github.com/ni/nidaqmx-python.git", branch = "master", extras = ["grpc"] }
 # ni-measurement-plugin-sdk-service = {path = "../../packages/service", develop = true}
diff --git a/examples/nidcpower_source_dc_voltage/pyproject.toml b/examples/nidcpower_source_dc_voltage/pyproject.toml
@@ -15,7 +15,7 @@ grpcio = "*"
 [tool.poetry.group.dev.dependencies]
 ni-python-styleguide = ">=0.4.1"
 mypy = ">=1.0"
-grpc-stubs = "^1.53"
+types-grpcio = ">=1.0"
 # Uncomment to use prerelease dependencies.
 # nidcpower = { git = "https://github.com/ni/nimi-python.git", subdirectory = "generated/nidcpower", extras = ["grpc"] }
 # ni-measurement-plugin-sdk-service = {path = "../../packages/service", develop = true}
diff --git a/examples/nidcpower_source_dc_voltage_with_multiplexer/pyproject.toml b/examples/nidcpower_source_dc_voltage_with_multiplexer/pyproject.toml
@@ -16,7 +16,7 @@ grpcio = "*"
 [tool.poetry.group.dev.dependencies]
 ni-python-styleguide = ">=0.4.1"
 mypy = ">=1.0"
-grpc-stubs = "^1.53"
+types-grpcio = ">=1.0"
 # Uncomment to use prerelease dependencies.
 # nidcpower = { git = "https://github.com/ni/nimi-python.git", subdirectory = "generated/nidcpower", extras = ["grpc"] }
 # niswitch = { git = "https://github.com/ni/nimi-python.git", subdirectory = "generated/niswitch", extras = ["grpc"] }
diff --git a/examples/nidigital_spi/pyproject.toml b/examples/nidigital_spi/pyproject.toml
@@ -15,7 +15,7 @@ grpcio = "*"
 [tool.poetry.group.dev.dependencies]
 ni-python-styleguide = ">=0.4.1"
 mypy = ">=1.0"
-grpc-stubs = "^1.53"
+types-grpcio = ">=1.0"
 # Uncomment to use prerelease dependencies.
 # nidigital = { git = "https://github.com/ni/nimi-python.git", subdirectory = "generated/nidigital", extras = ["grpc"] }
 # ni-measurement-plugin-sdk-service = {path = "../../packages/service", develop = true}
diff --git a/examples/nidmm_measurement/pyproject.toml b/examples/nidmm_measurement/pyproject.toml
@@ -15,7 +15,7 @@ grpcio = "*"
 [tool.poetry.group.dev.dependencies]
 ni-python-styleguide = ">=0.4.1"
 mypy = ">=1.0"
-grpc-stubs = "^1.53"
+types-grpcio = ">=1.0"
 # Uncomment to use prerelease dependencies.
 # nidmm = { git = "https://github.com/ni/nimi-python.git", subdirectory = "generated/nidmm", extras = ["grpc"] }
 # ni-measurement-plugin-sdk-service = {path = "../../packages/service", develop = true}
diff --git a/examples/nifgen_standard_function/pyproject.toml b/examples/nifgen_standard_function/pyproject.toml
@@ -15,7 +15,7 @@ grpcio = "*"
 [tool.poetry.group.dev.dependencies]
 ni-python-styleguide = ">=0.4.1"
 mypy = ">=1.0"
-grpc-stubs = "^1.53"
+types-grpcio = ">=1.0"
 # Uncomment to use prerelease dependencies.
 # nifgen = { git = "https://github.com/ni/nimi-python.git", subdirectory = "generated/nifgen", extras = ["grpc"] }
 # ni-measurement-plugin-sdk-service = {path = "../../packages/service", develop = true}
diff --git a/examples/niscope_acquire_waveform/pyproject.toml b/examples/niscope_acquire_waveform/pyproject.toml
@@ -15,7 +15,7 @@ grpcio = "*"
 [tool.poetry.group.dev.dependencies]
 ni-python-styleguide = ">=0.4.1"
 mypy = ">=1.0"
-grpc-stubs = "^1.53"
+types-grpcio = ">=1.0"
 # Uncomment to use prerelease dependencies.
 # niscope = { git = "https://github.com/ni/nimi-python.git", subdirectory = "generated/niscope", extras = ["grpc"] }
 # ni-measurement-plugin-sdk-service = {path = "../../packages/service", develop = true}
diff --git a/examples/niswitch_control_relays/pyproject.toml b/examples/niswitch_control_relays/pyproject.toml
@@ -15,7 +15,7 @@ grpcio = "*"
 [tool.poetry.group.dev.dependencies]
 ni-python-styleguide = ">=0.4.1"
 mypy = ">=1.0"
-grpc-stubs = "^1.53"
+types-grpcio = ">=1.0"
 # Uncomment to use prerelease dependencies.
 # niswitch = { git = "https://github.com/ni/nimi-python.git", subdirectory = "generated/niswitch", extras = ["grpc"] }
 # ni-measurement-plugin-sdk-service = {path = "../../packages/service", develop = true}
diff --git a/examples/nivisa_dmm_measurement/pyproject.toml b/examples/nivisa_dmm_measurement/pyproject.toml
@@ -17,7 +17,7 @@ python-decouple = ">=3.8"
 [tool.poetry.group.dev.dependencies]
 ni-python-styleguide = ">=0.4.1"
 mypy = ">=1.0"
-grpc-stubs = "^1.53"
+types-grpcio = ">=1.0"
 # Uncomment to use prerelease dependencies.
 # ni-measurement-plugin-sdk-service = {path = "../../packages/service", develop = true}
 
diff --git a/examples/output_voltage_measurement/pyproject.toml b/examples/output_voltage_measurement/pyproject.toml
@@ -18,7 +18,7 @@ python-decouple = ">=3.8"
 [tool.poetry.group.dev.dependencies]
 ni-python-styleguide = ">=0.4.1"
 mypy = ">=1.0"
-grpc-stubs = "^1.53"
+types-grpcio = ">=1.0"
 # Uncomment to use prerelease dependencies.
 # nidcpower = { git = "https://github.com/ni/nimi-python.git", subdirectory = "generated/nidcpower", extras=["grpc"] }
 # ni-measurement-plugin-sdk-service = {path = "../../packages/service", develop = true}
diff --git a/examples/sample_measurement/pyproject.toml b/examples/sample_measurement/pyproject.toml
@@ -13,7 +13,7 @@ click = ">=7.1.2, !=8.1.4" # mypy fails with click 8.1.4: https://github.com/pal
 [tool.poetry.group.dev.dependencies]
 ni-python-styleguide = ">=0.4.1"
 mypy = ">=1.0"
-grpc-stubs = "^1.53"
+types-grpcio = ">=1.0"
 grpcio-tools = "1.49.1"
 mypy-protobuf = "^3.6.0"
 types-protobuf = ">=4.21"
diff --git a/packages/generator/ni_measurement_plugin_sdk_generator/client/templates/measurement_plugin_client.py.mako b/packages/generator/ni_measurement_plugin_sdk_generator/client/templates/measurement_plugin_client.py.mako
@@ -112,7 +112,7 @@ class ${class_name}:
         self._pin_map_client = pin_map_client
         self._stub: v2_measurement_service_pb2_grpc.MeasurementServiceStub | None = None
         self._measure_response: None | (
-            grpc.CallIterator[v2_measurement_service_pb2.MeasureResponse]
+            grpc._CallIterator[v2_measurement_service_pb2.MeasureResponse]
         ) = None
         self._configuration_metadata = {
             % for key, value in configuration_metadata.items():
diff --git a/packages/generator/poetry.lock b/packages/generator/poetry.lock
diff --git a/packages/generator/pyproject.toml b/packages/generator/pyproject.toml
@@ -35,7 +35,7 @@ ni-python-styleguide = ">=0.4.1"
 mypy = ">=1.0"
 mypy-protobuf = ">=3.4"
 types-protobuf = ">=4.21"
-grpc-stubs = "^1.53"
+types-grpcio = ">=1.0"
 # During development, use file paths to reference the latest source for packages
 # in the same Git repository.
 ni-measurement-plugin-sdk-service = {path = "../../packages/service", develop = true}
diff --git a/packages/generator/tests/test_assets/example_renders/measurement_plugin_client/localized_measurement_client.py b/packages/generator/tests/test_assets/example_renders/measurement_plugin_client/localized_measurement_client.py
@@ -101,7 +101,7 @@ def __init__(
         self._pin_map_client = pin_map_client
         self._stub: v2_measurement_service_pb2_grpc.MeasurementServiceStub | None = None
         self._measure_response: None | (
-            grpc.CallIterator[v2_measurement_service_pb2.MeasureResponse]
+            grpc._CallIterator[v2_measurement_service_pb2.MeasureResponse]
         ) = None
         self._configuration_metadata = {
             1: ParameterMetadata(
diff --git a/packages/generator/tests/test_assets/example_renders/measurement_plugin_client/non_streaming_data_measurement_client.py b/packages/generator/tests/test_assets/example_renders/measurement_plugin_client/non_streaming_data_measurement_client.py
@@ -111,7 +111,7 @@ def __init__(
         self._pin_map_client = pin_map_client
         self._stub: v2_measurement_service_pb2_grpc.MeasurementServiceStub | None = None
         self._measure_response: None | (
-            grpc.CallIterator[v2_measurement_service_pb2.MeasureResponse]
+            grpc._CallIterator[v2_measurement_service_pb2.MeasureResponse]
         ) = None
         self._configuration_metadata = {
             1: ParameterMetadata(
diff --git a/packages/generator/tests/test_assets/example_renders/measurement_plugin_client/void_measurement_client.py b/packages/generator/tests/test_assets/example_renders/measurement_plugin_client/void_measurement_client.py
@@ -59,7 +59,7 @@ def __init__(
         self._pin_map_client = pin_map_client
         self._stub: v2_measurement_service_pb2_grpc.MeasurementServiceStub | None = None
         self._measure_response: None | (
-            grpc.CallIterator[v2_measurement_service_pb2.MeasureResponse]
+            grpc._CallIterator[v2_measurement_service_pb2.MeasureResponse]
         ) = None
         self._configuration_metadata = {
             1: ParameterMetadata(
diff --git a/packages/service/ni_measurement_plugin_sdk_service/grpc/loggers.py b/packages/service/ni_measurement_plugin_sdk_service/grpc/loggers.py
diff --git a/packages/service/poetry.lock b/packages/service/poetry.lock
diff --git a/packages/service/pyproject.toml b/packages/service/pyproject.toml
