diff --git a/examples/nidcpower_source_dc_voltage/measurement.py b/examples/nidcpower_source_dc_voltage/measurement.py index b169921fd..5c1c18d9d 100644 --- a/examples/nidcpower_source_dc_voltage/measurement.py +++ b/examples/nidcpower_source_dc_voltage/measurement.py @@ -158,7 +158,7 @@ def _create_nidcpower_session( session_grpc_channel = measurement_service.channel_pool.get_channel( target=session_grpc_address ) - session_kwargs["_grpc_options"] = nidcpower.GrpcSessionOptions( + session_kwargs["grpc_options"] = nidcpower.GrpcSessionOptions( session_grpc_channel, session_name=session_info.session_name, initialization_behavior=nidcpower.SessionInitializationBehavior.AUTO, diff --git a/examples/nidcpower_source_dc_voltage/pyproject.toml b/examples/nidcpower_source_dc_voltage/pyproject.toml index 7f438a1bc..3ff6f568b 100644 --- a/examples/nidcpower_source_dc_voltage/pyproject.toml +++ b/examples/nidcpower_source_dc_voltage/pyproject.toml @@ -6,13 +6,13 @@ authors = ["National Instruments"] [tool.poetry.dependencies] python = "^3.8" -nidcpower = ">=1.4.1" +nidcpower = ">=1.4.3" ni-measurement-service = "*" click = ">=7.1.2" [tool.poetry.dev-dependencies] # Uncomment to use prerelease dependencies (requires poetry>=1.2). -nidcpower = { git = "https://github.com/ni/nimi-python.git", subdirectory = "generated/nidcpower"} +# nidcpower = { git = "https://github.com/ni/nimi-python.git", subdirectory = "generated/nidcpower"} # ni-measurement-service = {path = "../..", develop = true} [build-system] diff --git a/examples/nidcpower_source_dc_voltage/teststand_fixture.py b/examples/nidcpower_source_dc_voltage/teststand_fixture.py index c5ce62a2d..411a1512e 100644 --- a/examples/nidcpower_source_dc_voltage/teststand_fixture.py +++ b/examples/nidcpower_source_dc_voltage/teststand_fixture.py @@ -47,7 +47,7 @@ def create_nidcpower_sessions(pin_map_id: str): # Leave session open nidcpower.Session( - resource_name=session_info.resource_name, _grpc_options=grpc_options + resource_name=session_info.resource_name, grpc_options=grpc_options ) session_management_client.register_sessions(reservation.session_info) @@ -80,6 +80,6 @@ def destroy_nidcpower_sessions(): ) session = nidcpower.Session( - resource_name=session_info.resource_name, _grpc_options=grpc_options + resource_name=session_info.resource_name, grpc_options=grpc_options ) session.close() diff --git a/examples/nidcpower_source_dc_voltage_with_labview_ui/measurement.py b/examples/nidcpower_source_dc_voltage_with_labview_ui/measurement.py index 2b85e5cf6..8f3c97223 100644 --- a/examples/nidcpower_source_dc_voltage_with_labview_ui/measurement.py +++ b/examples/nidcpower_source_dc_voltage_with_labview_ui/measurement.py @@ -158,7 +158,7 @@ def _create_nidcpower_session( session_grpc_channel = measurement_service.channel_pool.get_channel( target=session_grpc_address ) - session_kwargs["_grpc_options"] = nidcpower.GrpcSessionOptions( + session_kwargs["grpc_options"] = nidcpower.GrpcSessionOptions( session_grpc_channel, session_name=session_info.session_name, initialization_behavior=nidcpower.SessionInitializationBehavior.AUTO, diff --git a/examples/nidcpower_source_dc_voltage_with_labview_ui/pyproject.toml b/examples/nidcpower_source_dc_voltage_with_labview_ui/pyproject.toml index d7aa8d016..ca1293556 100644 --- a/examples/nidcpower_source_dc_voltage_with_labview_ui/pyproject.toml +++ b/examples/nidcpower_source_dc_voltage_with_labview_ui/pyproject.toml @@ -6,13 +6,13 @@ authors = ["National Instruments"] [tool.poetry.dependencies] python = "^3.8" -nidcpower = ">=1.4.1" +nidcpower = ">=1.4.3" ni-measurement-service = "*" click = ">=7.1.2" [tool.poetry.dev-dependencies] # Uncomment to use prerelease dependencies (requires poetry>=1.2). -nidcpower = { git = "https://github.com/ni/nimi-python.git", subdirectory = "generated/nidcpower"} +# nidcpower = { git = "https://github.com/ni/nimi-python.git", subdirectory = "generated/nidcpower"} # ni-measurement-service = {path = "../..", develop = true} [build-system] diff --git a/examples/nidcpower_source_dc_voltage_with_labview_ui/teststand_fixture.py b/examples/nidcpower_source_dc_voltage_with_labview_ui/teststand_fixture.py index c5ce62a2d..411a1512e 100644 --- a/examples/nidcpower_source_dc_voltage_with_labview_ui/teststand_fixture.py +++ b/examples/nidcpower_source_dc_voltage_with_labview_ui/teststand_fixture.py @@ -47,7 +47,7 @@ def create_nidcpower_sessions(pin_map_id: str): # Leave session open nidcpower.Session( - resource_name=session_info.resource_name, _grpc_options=grpc_options + resource_name=session_info.resource_name, grpc_options=grpc_options ) session_management_client.register_sessions(reservation.session_info) @@ -80,6 +80,6 @@ def destroy_nidcpower_sessions(): ) session = nidcpower.Session( - resource_name=session_info.resource_name, _grpc_options=grpc_options + resource_name=session_info.resource_name, grpc_options=grpc_options ) session.close() diff --git a/examples/nidmm_measurement/measurement.py b/examples/nidmm_measurement/measurement.py index e8abbad33..569a56a34 100644 --- a/examples/nidmm_measurement/measurement.py +++ b/examples/nidmm_measurement/measurement.py @@ -130,7 +130,7 @@ def _create_nidmm_session( session_grpc_channel = measurement_service.channel_pool.get_channel( target=session_grpc_address ) - session_kwargs["_grpc_options"] = nidmm.GrpcSessionOptions( + session_kwargs["grpc_options"] = nidmm.GrpcSessionOptions( session_grpc_channel, session_name=session_info.session_name, initialization_behavior=nidmm.SessionInitializationBehavior.AUTO, diff --git a/examples/nidmm_measurement/pyproject.toml b/examples/nidmm_measurement/pyproject.toml index 505659e2d..916f5fe4b 100644 --- a/examples/nidmm_measurement/pyproject.toml +++ b/examples/nidmm_measurement/pyproject.toml @@ -6,13 +6,13 @@ authors = ["National Instruments"] [tool.poetry.dependencies] python = "^3.8" -nidmm = ">=1.4.1" +nidmm = ">=1.4.3" ni-measurement-service = "*" click = ">=7.1.2" [tool.poetry.dev-dependencies] # Uncomment to use prerelease dependencies (requires poetry>=1.2). -nidmm = { git = "https://github.com/ni/nimi-python.git", subdirectory = "generated/nidmm"} +# nidmm = { git = "https://github.com/ni/nimi-python.git", subdirectory = "generated/nidmm"} # ni-measurement-service = {path = "../..", develop = true} [build-system] diff --git a/examples/nidmm_measurement/teststand_fixture.py b/examples/nidmm_measurement/teststand_fixture.py index 48d1ad699..fc912f7e4 100644 --- a/examples/nidmm_measurement/teststand_fixture.py +++ b/examples/nidmm_measurement/teststand_fixture.py @@ -44,7 +44,7 @@ def create_nidmm_sessions(pin_map_id: str): ) # Leave session open - nidmm.Session(resource_name=session_info.resource_name, _grpc_options=grpc_options) + nidmm.Session(resource_name=session_info.resource_name, grpc_options=grpc_options) session_management_client.register_sessions(reservation.session_info) @@ -73,6 +73,6 @@ def destroy_nidmm_sessions(): ) session = nidmm.Session( - resource_name=session_info.resource_name, _grpc_options=grpc_options + resource_name=session_info.resource_name, grpc_options=grpc_options ) session.close() diff --git a/examples/nifgen_standard_function/measurement.py b/examples/nifgen_standard_function/measurement.py index b049c89ae..ad9ad814d 100644 --- a/examples/nifgen_standard_function/measurement.py +++ b/examples/nifgen_standard_function/measurement.py @@ -162,7 +162,7 @@ def _create_nifgen_session( # Assumption: the pin map specifies one NI-FGEN session per instrument. If the pin map # specified an NI-FGEN session per channel, the session name would need to include the # channel name(s). - session_kwargs["_grpc_options"] = nifgen.GrpcSessionOptions( + session_kwargs["grpc_options"] = nifgen.GrpcSessionOptions( session_grpc_channel, session_name=session_info.session_name, initialization_behavior=nifgen.SessionInitializationBehavior.AUTO, diff --git a/examples/nifgen_standard_function/pyproject.toml b/examples/nifgen_standard_function/pyproject.toml index d1a3f2a8d..dfaebabc1 100644 --- a/examples/nifgen_standard_function/pyproject.toml +++ b/examples/nifgen_standard_function/pyproject.toml @@ -6,13 +6,13 @@ authors = ["National Instruments"] [tool.poetry.dependencies] python = "^3.8" -nifgen = ">=1.4.1" +nifgen = ">=1.4.3" ni-measurement-service = "*" click = ">=7.1.2" [tool.poetry.dev-dependencies] # Uncomment to use prerelease dependencies (requires poetry>=1.2). -nifgen = { git = "https://github.com/ni/nimi-python.git", subdirectory = "generated/nifgen"} +# nifgen = { git = "https://github.com/ni/nimi-python.git", subdirectory = "generated/nifgen"} # ni-measurement-service = {path = "../..", develop = true} [build-system] diff --git a/examples/nifgen_standard_function/teststand_fixture.py b/examples/nifgen_standard_function/teststand_fixture.py index d9042dd30..00c9e0a16 100644 --- a/examples/nifgen_standard_function/teststand_fixture.py +++ b/examples/nifgen_standard_function/teststand_fixture.py @@ -47,7 +47,7 @@ def create_nifgen_sessions(pin_map_id: str): nifgen.Session( resource_name=session_info.resource_name, channel_name=session_info.channel_list, - _grpc_options=grpc_options, + grpc_options=grpc_options, ) session_management_client.register_sessions(reservation.session_info) @@ -80,6 +80,6 @@ def destroy_nifgen_sessions(): session = nifgen.Session( resource_name=session_info.resource_name, channel_name=session_info.channel_list, - _grpc_options=grpc_options, + grpc_options=grpc_options, ) session.close() diff --git a/examples/niscope_acquire_waveform/measurement.py b/examples/niscope_acquire_waveform/measurement.py index 9e40bdb4d..d4efb8661 100644 --- a/examples/niscope_acquire_waveform/measurement.py +++ b/examples/niscope_acquire_waveform/measurement.py @@ -205,7 +205,7 @@ def _create_niscope_session( session_grpc_channel = measurement_service.channel_pool.get_channel( target=session_grpc_address ) - session_kwargs["_grpc_options"] = niscope.GrpcSessionOptions( + session_kwargs["grpc_options"] = niscope.GrpcSessionOptions( session_grpc_channel, session_name=session_info.session_name, initialization_behavior=niscope.SessionInitializationBehavior.AUTO, diff --git a/examples/niscope_acquire_waveform/pyproject.toml b/examples/niscope_acquire_waveform/pyproject.toml index 711b30493..019e519a8 100644 --- a/examples/niscope_acquire_waveform/pyproject.toml +++ b/examples/niscope_acquire_waveform/pyproject.toml @@ -6,13 +6,13 @@ authors = ["National Instruments"] [tool.poetry.dependencies] python = "^3.8" -niscope = ">=1.4.1" +niscope = ">=1.4.3" ni-measurement-service = "*" click = ">=7.1.2" [tool.poetry.dev-dependencies] # Uncomment to use prerelease dependencies (requires poetry>=1.2). -niscope = { git = "https://github.com/ni/nimi-python.git", subdirectory = "generated/niscope"} +# niscope = { git = "https://github.com/ni/nimi-python.git", subdirectory = "generated/niscope"} # ni-measurement-service = {path = "../..", develop = true} [build-system] diff --git a/examples/niscope_acquire_waveform/teststand_fixture.py b/examples/niscope_acquire_waveform/teststand_fixture.py index d033f3289..ff58a24d4 100644 --- a/examples/niscope_acquire_waveform/teststand_fixture.py +++ b/examples/niscope_acquire_waveform/teststand_fixture.py @@ -44,9 +44,7 @@ def create_niscope_sessions(pin_map_id: str): ) # Leave session open - niscope.Session( - resource_name=session_info.resource_name, _grpc_options=grpc_options - ) + niscope.Session(resource_name=session_info.resource_name, grpc_options=grpc_options) session_management_client.register_sessions(reservation.session_info) @@ -76,6 +74,6 @@ def destroy_niscope_sessions(): ) session = niscope.Session( - resource_name=session_info.resource_name, _grpc_options=grpc_options + resource_name=session_info.resource_name, grpc_options=grpc_options ) session.close() diff --git a/examples/niswitch_control_relays/NISwitchControlRelays.seq b/examples/niswitch_control_relays/NISwitchControlRelays.seq index 1f16e3763..fac816ccd 100644 --- a/examples/niswitch_control_relays/NISwitchControlRelays.seq +++ b/examples/niswitch_control_relays/NISwitchControlRelays.seq @@ -9754,7 +9754,7 @@ - true + false 3 @@ -10199,7 +10199,7 @@ - true + false 3 @@ -11325,7 +11325,7 @@ - true + false 3 diff --git a/examples/niswitch_control_relays/measurement.py b/examples/niswitch_control_relays/measurement.py index c3590d23b..4238d368c 100644 --- a/examples/niswitch_control_relays/measurement.py +++ b/examples/niswitch_control_relays/measurement.py @@ -92,7 +92,7 @@ def _create_niswitch_session( session_grpc_channel = measurement_service.channel_pool.get_channel( target=session_grpc_address ) - session_kwargs["_grpc_options"] = niswitch.GrpcSessionOptions( + session_kwargs["grpc_options"] = niswitch.GrpcSessionOptions( session_grpc_channel, session_name=session_info.session_name, initialization_behavior=niswitch.SessionInitializationBehavior.AUTO, diff --git a/examples/niswitch_control_relays/pyproject.toml b/examples/niswitch_control_relays/pyproject.toml index e5c8dd4c6..b3bd25452 100644 --- a/examples/niswitch_control_relays/pyproject.toml +++ b/examples/niswitch_control_relays/pyproject.toml @@ -6,13 +6,13 @@ authors = ["National Instruments"] [tool.poetry.dependencies] python = "^3.8" -niswitch = ">=1.4.1" +niswitch = ">=1.4.3" ni-measurement-service = "*" click = ">=7.1.2" [tool.poetry.dev-dependencies] # Uncomment to use prerelease dependencies (requires poetry>=1.2). -niswitch = { git = "https://github.com/ni/nimi-python.git", subdirectory = "generated/niswitch"} +# niswitch = { git = "https://github.com/ni/nimi-python.git", subdirectory = "generated/niswitch"} # ni-measurement-service = {path = "../..", develop = true} [build-system] diff --git a/examples/niswitch_control_relays/teststand_fixture.py b/examples/niswitch_control_relays/teststand_fixture.py index 5a2d7bf54..53d933de5 100644 --- a/examples/niswitch_control_relays/teststand_fixture.py +++ b/examples/niswitch_control_relays/teststand_fixture.py @@ -45,7 +45,7 @@ def create_niswitch_sessions(pin_map_id: str): # Leave session open niswitch.Session( - resource_name=session_info.resource_name, _grpc_options=grpc_options + resource_name=session_info.resource_name, grpc_options=grpc_options ) session_management_client.register_sessions(reservation.session_info) @@ -76,6 +76,6 @@ def destroy_niswitch_sessions(): ) session = niswitch.Session( - resource_name=session_info.resource_name, _grpc_options=grpc_options + resource_name=session_info.resource_name, grpc_options=grpc_options ) session.close()