Skip to content
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

Do not specify version in the MeasurementService constructor #907

Merged
merged 9 commits into from
Sep 22, 2024
Merged

Do not specify version in the MeasurementService constructor #907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
00b781f
Do not specify version in the MeasurementService constructor
dixonjoel Sep 20, 2024
24ed8ec
Add version to serviceconfig files in examples
dixonjoel Sep 20, 2024
d1ca720
Specify 1.0.0.0 for version in measurement.py
dixonjoel Sep 20, 2024
f51f2c6
Use 1.0.0 instead of 1.0.0.0 to match the default value in TestStand …
dixonjoel Sep 20, 2024
e8f4c5e
Update examples to use latest prerelease version
dixonjoel Sep 20, 2024
41bd4cf
Correct 2.1.0-dev0 versions
dixonjoel Sep 20, 2024
4aae655
Correct allow-prereleases
dixonjoel Sep 20, 2024
bfc196c
Fix allow-prereleases
dixonjoel Sep 20, 2024
7c0cb39
Remove version spec
dixonjoel Sep 20, 2024
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
1 change: 1 addition & 0 deletions examples/game_of_life/game_of_life.serviceconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"services": [
{
"displayName": "Conway's Game of Life (Py)",
"version": "1.0.0",
"serviceClass": "ni.examples.GameOfLife_Python",
"descriptionUrl": "",
"providedInterfaces": [
Expand Down
1 change: 0 additions & 1 deletion examples/game_of_life/measurement.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
service_directory = pathlib.Path(__file__).resolve().parent
measurement_service = nims.MeasurementService(
service_config_path=service_directory / "game_of_life.serviceconfig",
version="1.0.0.0",
ui_file_paths=[service_directory / "game_of_life.measui"],
)

Expand Down
2 changes: 1 addition & 1 deletion examples/game_of_life/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ authors = ["National Instruments"]

[tool.poetry.dependencies]
python = "^3.8"
ni-measurement-plugin-sdk-service = {version = "^2.0.0"}
dixonjoel marked this conversation as resolved.
Show resolved Hide resolved
ni-measurement-plugin-sdk-service = {version = "^2.1.0-dev0", allow-prereleases = true}
click = ">=7.1.2, !=8.1.4" # mypy fails with click 8.1.4: https://github.com/pallets/click/issues/2558

[tool.poetry.group.dev.dependencies]
Expand Down
1 change: 1 addition & 0 deletions examples/nidaqmx_analog_input/NIDAQmxAnalogInput.serviceconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"services": [
{
"displayName": "NI-DAQmx Analog Input (Py)",
"version": "1.0.0",
"serviceClass": "ni.examples.NIDAQmxAnalogInput_Python",
"descriptionUrl": "",
"providedInterfaces": [
Expand Down
1 change: 0 additions & 1 deletion examples/nidaqmx_analog_input/measurement.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
service_directory = pathlib.Path(script_or_exe).resolve().parent
measurement_service = nims.MeasurementService(
service_config_path=service_directory / "NIDAQmxAnalogInput.serviceconfig",
version="0.1.0.0",
ui_file_paths=[service_directory / "NIDAQmxAnalogInput.measui"],
)

Expand Down
2 changes: 1 addition & 1 deletion examples/nidaqmx_analog_input/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ authors = ["National Instruments"]
[tool.poetry.dependencies]
python = "^3.8"
nidaqmx = { version = ">=0.8.0", extras = ["grpc"] }
ni-measurement-plugin-sdk-service = {version = "^2.0.0"}
ni-measurement-plugin-sdk-service = {version = "^2.1.0-dev0", allow-prereleases = true}
click = ">=7.1.2, !=8.1.4" # mypy fails with click 8.1.4: https://github.com/pallets/click/issues/2558

[tool.poetry.group.dev.dependencies]
Expand Down
1 change: 1 addition & 0 deletions examples/nidcpower_source_dc_voltage/NIDCPowerSourceDCVoltage.serviceconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"services": [
{
"displayName": "NI-DCPower Source DC Voltage (Py)",
"version": "1.0.0",
"serviceClass": "ni.examples.NIDCPowerSourceDCVoltage_Python",
"descriptionUrl": "",
"providedInterfaces": [
Expand Down
1 change: 0 additions & 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 @@ -29,7 +29,6 @@
service_directory = pathlib.Path(script_or_exe).resolve().parent
measurement_service = nims.MeasurementService(
service_config_path=service_directory / "NIDCPowerSourceDCVoltage.serviceconfig",
version="0.1.0.0",
ui_file_paths=[
service_directory / "NIDCPowerSourceDCVoltage.measui",
service_directory / "NIDCPowerSourceDCVoltageUI.vi",
Expand Down
2 changes: 1 addition & 1 deletion examples/nidcpower_source_dc_voltage/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ authors = ["National Instruments"]
[tool.poetry.dependencies]
python = "^3.8"
nidcpower = { version = ">=1.4.4", extras = ["grpc"] }
ni-measurement-plugin-sdk-service = {version = "^2.0.0"}
ni-measurement-plugin-sdk-service = {version = "^2.1.0-dev0", allow-prereleases = true}
click = ">=7.1.2, !=8.1.4" # mypy fails with click 8.1.4: https://github.com/pallets/click/issues/2558
grpcio = "*"

Expand Down
1 change: 1 addition & 0 deletions ..._source_dc_voltage_with_multiplexer/NIDCPowerSourceDCVoltageWithMultiplexer.serviceconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"services": [
{
"displayName": "NI-DCPower Source DC Voltage With Multiplexer (Py)",
"version": "1.0.0",
"serviceClass": "ni.examples.NIDCPowerSourceDCVoltageWithMultiplexer_Python",
"descriptionUrl": "",
"providedInterfaces": [
Expand Down
1 change: 0 additions & 1 deletion examples/nidcpower_source_dc_voltage_with_multiplexer/measurement.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
service_directory = pathlib.Path(script_or_exe).resolve().parent
measurement_service = nims.MeasurementService(
service_config_path=service_directory / "NIDCPowerSourceDCVoltageWithMultiplexer.serviceconfig",
version="0.1.0.0",
ui_file_paths=[service_directory / "NIDCPowerSourceDCVoltageWithMultiplexer.measui"],
)

Expand Down
2 changes: 1 addition & 1 deletion examples/nidcpower_source_dc_voltage_with_multiplexer/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ authors = ["National Instruments"]
python = "^3.8"
nidcpower = { version = ">=1.4.4", extras = ["grpc"] }
niswitch = { version = ">=1.4.4", extras = ["grpc"] }
ni-measurement-plugin-sdk-service = {version = "^2.0.0"}
ni-measurement-plugin-sdk-service = {version = "^2.1.0-dev0", allow-prereleases = true}
click = ">=7.1.2, !=8.1.4" # mypy fails with click 8.1.4: https://github.com/pallets/click/issues/2558
grpcio = "*"

Expand Down
1 change: 1 addition & 0 deletions examples/nidigital_spi/NIDigitalSPI.serviceconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"services": [
{
"displayName": "NI-Digital SPI (Py)",
"version": "1.0.0",
"serviceClass": "ni.examples.NIDigitalSPI_Python",
"descriptionUrl": "",
"providedInterfaces": [
Expand Down
1 change: 0 additions & 1 deletion examples/nidigital_spi/measurement.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
service_directory = pathlib.Path(script_or_exe).resolve().parent
measurement_service = nims.MeasurementService(
service_config_path=service_directory / "NIDigitalSPI.serviceconfig",
version="0.1.0.0",
ui_file_paths=[service_directory / "NIDigitalSPI.measui"],
)

Expand Down
2 changes: 1 addition & 1 deletion examples/nidigital_spi/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ authors = ["National Instruments"]
[tool.poetry.dependencies]
python = "^3.8"
nidigital = { version = ">=1.4.4", extras = ["grpc"] }
ni-measurement-plugin-sdk-service = {version = "^2.0.0"}
ni-measurement-plugin-sdk-service = {version = "^2.1.0-dev0", allow-prereleases = true}
click = ">=7.1.2, !=8.1.4" # mypy fails with click 8.1.4: https://github.com/pallets/click/issues/2558
grpcio = "*"

Expand Down
1 change: 1 addition & 0 deletions examples/nidmm_measurement/NIDmmMeasurement.serviceconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"services": [
{
"displayName": "NI-DMM Measurement (Py)",
"version": "1.0.0",
"serviceClass": "ni.examples.NIDmmMeasurement_Python",
"descriptionUrl": "",
"providedInterfaces": [
Expand Down
1 change: 0 additions & 1 deletion examples/nidmm_measurement/measurement.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
service_directory = pathlib.Path(script_or_exe).resolve().parent
measurement_service = nims.MeasurementService(
service_config_path=service_directory / "NIDmmMeasurement.serviceconfig",
version="0.1.0.0",
ui_file_paths=[service_directory / "NIDmmMeasurement.measui"],
)

Expand Down
2 changes: 1 addition & 1 deletion examples/nidmm_measurement/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ authors = ["National Instruments"]
[tool.poetry.dependencies]
python = "^3.8"
nidmm = { version = ">=1.4.4", extras = ["grpc"] }
ni-measurement-plugin-sdk-service = {version = "^2.0.0"}
ni-measurement-plugin-sdk-service = {version = "^2.1.0-dev0", allow-prereleases = true}
click = ">=7.1.2, !=8.1.4" # mypy fails with click 8.1.4: https://github.com/pallets/click/issues/2558
grpcio = "*"

Expand Down
1 change: 1 addition & 0 deletions examples/nifgen_standard_function/NIFgenStandardFunction.serviceconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"services": [
{
"displayName": "NI-FGEN Standard Function (Py)",
"version": "1.0.0",
"serviceClass": "ni.examples.NIFgenStandardFunction_Python",
"descriptionUrl": "",
"providedInterfaces": [
Expand Down
1 change: 0 additions & 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 @@ -27,7 +27,6 @@
service_directory = pathlib.Path(script_or_exe).resolve().parent
measurement_service = nims.MeasurementService(
service_config_path=service_directory / "NIFgenStandardFunction.serviceconfig",
version="0.1.0.0",
ui_file_paths=[service_directory / "NIFgenStandardFunction.measui"],
)

Expand Down
2 changes: 1 addition & 1 deletion examples/nifgen_standard_function/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ authors = ["National Instruments"]
[tool.poetry.dependencies]
python = "^3.8"
nifgen = { version = ">=1.4.4", extras = ["grpc"] }
ni-measurement-plugin-sdk-service = {version = "^2.0.0"}
ni-measurement-plugin-sdk-service = {version = "^2.1.0-dev0", allow-prereleases = true}
click = ">=7.1.2, !=8.1.4" # mypy fails with click 8.1.4: https://github.com/pallets/click/issues/2558
grpcio = "*"

Expand Down
1 change: 1 addition & 0 deletions examples/niscope_acquire_waveform/NIScopeAcquireWaveform.serviceconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"services": [
{
"displayName": "NI-SCOPE Acquire Waveform (Py)",
"version": "1.0.0",
"serviceClass": "ni.examples.NIScopeAcquireWaveform_Python",
"descriptionUrl": "",
"providedInterfaces": [
Expand Down
1 change: 0 additions & 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 @@ -17,7 +17,6 @@
service_directory = pathlib.Path(script_or_exe).resolve().parent
measurement_service = nims.MeasurementService(
service_config_path=service_directory / "NIScopeAcquireWaveform.serviceconfig",
version="0.1.0.0",
ui_file_paths=[service_directory / "NIScopeAcquireWaveform.measui"],
)

Expand Down
2 changes: 1 addition & 1 deletion examples/niscope_acquire_waveform/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ authors = ["National Instruments"]
[tool.poetry.dependencies]
python = "^3.8"
niscope = { version = ">=1.4.4", extras = ["grpc"] }
ni-measurement-plugin-sdk-service = {version = "^2.0.0"}
ni-measurement-plugin-sdk-service = {version = "^2.1.0-dev0", allow-prereleases = true}
click = ">=7.1.2, !=8.1.4" # mypy fails with click 8.1.4: https://github.com/pallets/click/issues/2558
grpcio = "*"

Expand Down
1 change: 1 addition & 0 deletions examples/niswitch_control_relays/NISwitchControlRelays.serviceconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"services": [
{
"displayName": "NI-SWITCH Control Relays (Py)",
"version": "1.0.0",
"serviceClass": "ni.examples.NISwitchControlRelays_Python",
"descriptionUrl": "",
"providedInterfaces": [
Expand Down
1 change: 0 additions & 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 @@ -14,7 +14,6 @@
service_directory = pathlib.Path(script_or_exe).resolve().parent
measurement_service = nims.MeasurementService(
service_config_path=service_directory / "NISwitchControlRelays.serviceconfig",
version="0.1.0.0",
ui_file_paths=[service_directory / "NISwitchControlRelays.measui"],
)

Expand Down
2 changes: 1 addition & 1 deletion examples/niswitch_control_relays/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ authors = ["National Instruments"]
[tool.poetry.dependencies]
python = "^3.8"
niswitch = { version = ">=1.4.4", extras = ["grpc"] }
ni-measurement-plugin-sdk-service = {version = "^2.0.0"}
ni-measurement-plugin-sdk-service = {version = "^2.1.0-dev0", allow-prereleases = true}
click = ">=7.1.2, !=8.1.4" # mypy fails with click 8.1.4: https://github.com/pallets/click/issues/2558
grpcio = "*"

Expand Down
1 change: 1 addition & 0 deletions examples/nivisa_dmm_measurement/NIVisaDmmMeasurement.serviceconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"services": [
{
"displayName": "NI-VISA DMM Measurement (Py)",
"version": "1.0.0",
"serviceClass": "ni.examples.NIVisaDmmMeasurement_Python",
"descriptionUrl": "",
"providedInterfaces": [
Expand Down
1 change: 0 additions & 1 deletion examples/nivisa_dmm_measurement/measurement.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
service_directory = pathlib.Path(script_or_exe).resolve().parent
measurement_service = nims.MeasurementService(
service_config_path=service_directory / "NIVisaDmmMeasurement.serviceconfig",
version="0.1.0.0",
ui_file_paths=[service_directory / "NIVisaDmmMeasurement.measui"],
)

Expand Down
2 changes: 1 addition & 1 deletion examples/nivisa_dmm_measurement/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ authors = ["National Instruments"]

[tool.poetry.dependencies]
python = "^3.8"
ni-measurement-plugin-sdk-service = {version = "^2.0.0"}
ni-measurement-plugin-sdk-service = {version = "^2.1.0-dev0", allow-prereleases = true}
PyVISA = "^1.13.0"
PyVISA-sim = "^0.5.1"
click = ">=7.1.2, !=8.1.4" # mypy fails with click 8.1.4: https://github.com/pallets/click/issues/2558
Expand Down
1 change: 1 addition & 0 deletions examples/output_voltage_measurement/OutputVoltageMeasurement.serviceconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"services": [
{
"displayName": "Output Voltage Measurement (Py)",
"version": "1.0.0",
"serviceClass": "ni.examples.OutputVoltageMeasurement_Python",
"descriptionUrl": "",
"providedInterfaces": [
Expand Down
1 change: 0 additions & 1 deletion examples/output_voltage_measurement/measurement.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
service_directory = pathlib.Path(__file__).resolve().parent
measurement_service = nims.MeasurementService(
service_config_path=service_directory / "OutputVoltageMeasurement.serviceconfig",
version="1.0.0.0",
ui_file_paths=[service_directory / "OutputVoltageMeasurement.measui"],
)

Expand Down
2 changes: 1 addition & 1 deletion examples/output_voltage_measurement/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ authors = ["National Instruments"]

[tool.poetry.dependencies]
python = "^3.8"
ni-measurement-plugin-sdk-service = {version = "^2.0.0"}
ni-measurement-plugin-sdk-service = {version = "^2.1.0-dev0", allow-prereleases = true}
PyVISA = "^1.13.0"
PyVISA-sim = "^0.5.1"
nidcpower = { version = ">=1.4.4", extras = ["grpc"] }
Expand Down
1 change: 1 addition & 0 deletions examples/sample_measurement/SampleMeasurement.serviceconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
"services": [
{
"displayName": "Sample Measurement (Py)",
"version": "1.0.0",
"serviceClass": "ni.examples.SampleMeasurement_Python",
"descriptionUrl": "",
"providedInterfaces": [
Expand Down
1 change: 0 additions & 1 deletion examples/sample_measurement/measurement.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
service_directory = pathlib.Path(script_or_exe).resolve().parent
measurement_service = nims.MeasurementService(
service_config_path=service_directory / "SampleMeasurement.serviceconfig",
version="0.1.0.0",
ui_file_paths=[
service_directory / "SampleMeasurement.measui",
service_directory / "SampleAllParameters.measui",
Expand Down
2 changes: 1 addition & 1 deletion examples/sample_measurement/pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ authors = ["National Instruments"]

[tool.poetry.dependencies]
python = "^3.8"
ni-measurement-plugin-sdk-service = {version = "^2.0.0"}
ni-measurement-plugin-sdk-service = {version = "^2.1.0-dev0", allow-prereleases = true}
click = ">=7.1.2, !=8.1.4" # mypy fails with click 8.1.4: https://github.com/pallets/click/issues/2558

[tool.poetry.group.dev.dependencies]
Expand Down