Skip to content

Fixed #169: Removed underscore from _grpc_options #174

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bkeryan merged 3 commits into from
Dec 19, 2022
Merged

Fixed #169: Removed underscore from _grpc_options #174

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ea9c5b
Replaced _grpc_options with grpc_options
tkrebes Dec 16, 2022
fc17fc7
Updated nimi-python dependency version to 1.4.3
tkrebes Dec 16, 2022
52cfffb
niswitch_control_relays: Uncheck "Use adapter settings for Python int…
bkeryan Dec 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/nidcpower_source_dc_voltage/measurement.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ def _create_nidcpower_session(
session_grpc_channel = measurement_service.channel_pool.get_channel(
target=session_grpc_address
)
Comment thread
bkeryan marked this conversation as resolved.
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,
Expand Down
4 changes: 2 additions & 2 deletions examples/nidcpower_source_dc_voltage/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions examples/nidcpower_source_dc_voltage/teststand_fixture.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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()
2 changes: 1 addition & 1 deletion examples/nidcpower_source_dc_voltage_with_labview_ui/measurement.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions examples/nidcpower_source_dc_voltage_with_labview_ui/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions examples/nidcpower_source_dc_voltage_with_labview_ui/teststand_fixture.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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()
2 changes: 1 addition & 1 deletion examples/nidmm_measurement/measurement.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions examples/nidmm_measurement/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions examples/nidmm_measurement/teststand_fixture.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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()
2 changes: 1 addition & 1 deletion examples/nifgen_standard_function/measurement.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions examples/nifgen_standard_function/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions examples/nifgen_standard_function/teststand_fixture.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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()
2 changes: 1 addition & 1 deletion examples/niscope_acquire_waveform/measurement.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions examples/niscope_acquire_waveform/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
6 changes: 2 additions & 4 deletions examples/niscope_acquire_waveform/teststand_fixture.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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()
6 changes: 3 additions & 3 deletions examples/niswitch_control_relays/NISwitchControlRelays.seq
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9754,7 +9754,7 @@
<PythonCall classname='CPythonCall'>
<subprops>
<UseAdapterSettingsForInterpreterSession classname='Bool'>
<value>true</value>
<value>false</value>
</UseAdapterSettingsForInterpreterSession>
<InterpreterSessionScope classname='Num'>
<value>3</value>
Expand Down Expand Up @@ -10199,7 +10199,7 @@
<PythonCall classname='CPythonCall'>
<subprops>
<UseAdapterSettingsForInterpreterSession classname='Bool'>
<value>true</value>
<value>false</value>
</UseAdapterSettingsForInterpreterSession>
<InterpreterSessionScope classname='Num'>
<value>3</value>
Expand Down Expand Up @@ -11325,7 +11325,7 @@
<PythonCall classname='CPythonCall'>
<subprops>
<UseAdapterSettingsForInterpreterSession classname='Bool'>
<value>true</value>
<value>false</value>
</UseAdapterSettingsForInterpreterSession>
<InterpreterSessionScope classname='Num'>
<value>3</value>
Expand Down
2 changes: 1 addition & 1 deletion examples/niswitch_control_relays/measurement.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions examples/niswitch_control_relays/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
4 changes: 2 additions & 2 deletions examples/niswitch_control_relays/teststand_fixture.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Comment thread
bkeryan marked this conversation as resolved.
)

session_management_client.register_sessions(reservation.session_info)
Expand Down Expand Up @@ -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()