From 1f27c9d6d38bd8141160337d26e7195ed5c9cc87 Mon Sep 17 00:00:00 2001 From: Tyler Krehbiel Date: Tue, 6 Dec 2022 09:04:09 -0600 Subject: [PATCH 1/2] Updated instructions for using prerelease dependencies --- examples/nidcpower_source_dc_voltage/pyproject.toml | 6 +++--- .../pyproject.toml | 6 +++--- examples/nidmm_measurement/pyproject.toml | 6 +++--- examples/nifgen_standard_function/pyproject.toml | 6 +++--- examples/niscope_acquire_waveform/pyproject.toml | 6 +++--- examples/niswitch_control_relays/pyproject.toml | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/examples/nidcpower_source_dc_voltage/pyproject.toml b/examples/nidcpower_source_dc_voltage/pyproject.toml index 8911c6802..9da793bee 100644 --- a/examples/nidcpower_source_dc_voltage/pyproject.toml +++ b/examples/nidcpower_source_dc_voltage/pyproject.toml @@ -6,14 +6,14 @@ authors = ["National Instruments"] [tool.poetry.dependencies] python = "^3.8" -# Uncomment to use prerelease dependencies. -# nidcpower = {path = "../../../nimi-python/generated/nidcpower", develop = true} -# ni-measurement-service = {path = "../..", develop = true} nidcpower = "1.4.1" 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"} +# ni-measurement-service = {path = "../..", develop = true} [build-system] requires = ["poetry-core>=1.0.0"] 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 dea16a611..1e80b97fb 100644 --- a/examples/nidcpower_source_dc_voltage_with_labview_ui/pyproject.toml +++ b/examples/nidcpower_source_dc_voltage_with_labview_ui/pyproject.toml @@ -6,14 +6,14 @@ authors = ["National Instruments"] [tool.poetry.dependencies] python = "^3.8" -# Uncomment to use prerelease dependencies. -# nidcpower = {path = "../../../nimi-python/generated/nidcpower", develop = true} -# ni-measurement-service = {path = "../..", develop = true} nidcpower = "1.4.1" 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"} +# ni-measurement-service = {path = "../..", develop = true} [build-system] requires = ["poetry-core>=1.0.0"] diff --git a/examples/nidmm_measurement/pyproject.toml b/examples/nidmm_measurement/pyproject.toml index dc7b6d5e9..3404425b4 100644 --- a/examples/nidmm_measurement/pyproject.toml +++ b/examples/nidmm_measurement/pyproject.toml @@ -6,14 +6,14 @@ authors = ["National Instruments"] [tool.poetry.dependencies] python = "^3.8" -# Uncomment to use prerelease dependencies. -# nidmm = {path = "../../../nimi-python/generated/nidmm", develop = true} -# ni-measurement-service = {path = "../..", develop = true} nidmm = "1.4.1" 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"} +# ni-measurement-service = {path = "../..", develop = true} [build-system] requires = ["poetry-core>=1.0.0"] diff --git a/examples/nifgen_standard_function/pyproject.toml b/examples/nifgen_standard_function/pyproject.toml index 868359388..e1f872bcc 100644 --- a/examples/nifgen_standard_function/pyproject.toml +++ b/examples/nifgen_standard_function/pyproject.toml @@ -6,14 +6,14 @@ authors = ["National Instruments"] [tool.poetry.dependencies] python = "^3.8" -# Uncomment to use prerelease dependencies. -# nifgen = {path = "../../../nimi-python/generated/nifgen", develop = true} -# ni-measurement-service = {path = "../..", develop = true} nifgen = "1.4.1" 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"} +# ni-measurement-service = {path = "../..", develop = true} [build-system] requires = ["poetry-core>=1.0.0"] diff --git a/examples/niscope_acquire_waveform/pyproject.toml b/examples/niscope_acquire_waveform/pyproject.toml index 7fd7086cb..f862df85b 100644 --- a/examples/niscope_acquire_waveform/pyproject.toml +++ b/examples/niscope_acquire_waveform/pyproject.toml @@ -6,14 +6,14 @@ authors = ["National Instruments"] [tool.poetry.dependencies] python = "^3.8" -# Uncomment to use prerelease dependencies. -# niscope = {path = "../../../nimi-python/generated/niscope", develop = true} -# ni-measurement-service = {path = "../..", develop = true} niscope = "1.4.1" 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"} +# ni-measurement-service = {path = "../..", develop = true} [build-system] requires = ["poetry-core>=1.0.0"] diff --git a/examples/niswitch_control_relays/pyproject.toml b/examples/niswitch_control_relays/pyproject.toml index 910ef1b0b..68daa8292 100644 --- a/examples/niswitch_control_relays/pyproject.toml +++ b/examples/niswitch_control_relays/pyproject.toml @@ -6,14 +6,14 @@ authors = ["National Instruments"] [tool.poetry.dependencies] python = "^3.8" -# Uncomment to use prerelease dependencies. -# niswitch = {path = "../../../nimi-python/generated/niswitch", develop = true} -# ni-measurement-service = {path = "../..", develop = true} niswitch = "1.4.1" 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"} +# ni-measurement-service = {path = "../..", develop = true} [build-system] requires = ["poetry-core>=1.0.0"] From 6edce85abe1c2bd0d99c4d5c3da21d7bb109068c Mon Sep 17 00:00:00 2001 From: Tyler Krehbiel Date: Tue, 6 Dec 2022 09:05:06 -0600 Subject: [PATCH 2/2] Updated examples to use NI gRPC Device by default --- examples/nidcpower_source_dc_voltage/measurement.py | 5 ++++- examples/nidcpower_source_dc_voltage/start.bat | 2 +- .../measurement.py | 5 ++++- examples/nidmm_measurement/measurement.py | 4 ++-- examples/nifgen_standard_function/measurement.py | 4 ++-- examples/niscope_acquire_waveform/measurement.py | 4 ++-- examples/niswitch_control_relays/measurement.py | 4 ++-- 7 files changed, 17 insertions(+), 11 deletions(-) diff --git a/examples/nidcpower_source_dc_voltage/measurement.py b/examples/nidcpower_source_dc_voltage/measurement.py index 59746317b..c06e8794c 100644 --- a/examples/nidcpower_source_dc_voltage/measurement.py +++ b/examples/nidcpower_source_dc_voltage/measurement.py @@ -174,7 +174,10 @@ def _log_measured_values(measured_value, in_compliance): "-v", "--verbose", count=True, help="Enable verbose logging. Repeat to increase verbosity." ) @click.option( - "--use-grpc-device", default=False, is_flag=True, help="Use the NI gRPC Device Server." + "--use-grpc-device/--no-use-grpc-device", + default=True, + is_flag=True, + help="Use the NI gRPC Device Server.", ) @click.option( "--grpc-device-address", diff --git a/examples/nidcpower_source_dc_voltage/start.bat b/examples/nidcpower_source_dc_voltage/start.bat index d54152e23..a1d37a657 100644 --- a/examples/nidcpower_source_dc_voltage/start.bat +++ b/examples/nidcpower_source_dc_voltage/start.bat @@ -3,4 +3,4 @@ REM The discovery service uses this script to start the measurement service. REM You can customize this script for your Python setup. The -v option logs REM messages with level INFO and above. -.venv\Scripts\python.exe measurement.py -v --use-grpc-device +.venv\Scripts\python.exe measurement.py -v 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 abf0155b0..6994962bd 100644 --- a/examples/nidcpower_source_dc_voltage_with_labview_ui/measurement.py +++ b/examples/nidcpower_source_dc_voltage_with_labview_ui/measurement.py @@ -174,7 +174,10 @@ def _log_measured_values(measured_value, in_compliance): "-v", "--verbose", count=True, help="Enable verbose logging. Repeat to increase verbosity." ) @click.option( - "--use-grpc-device", default=False, is_flag=True, help="Use the NI gRPC Device Server." + "--use-grpc-device/--no-use-grpc-device", + default=True, + is_flag=True, + help="Use the NI gRPC Device Server.", ) @click.option( "--grpc-device-address", diff --git a/examples/nidmm_measurement/measurement.py b/examples/nidmm_measurement/measurement.py index c1eec99c2..65bcabc00 100644 --- a/examples/nidmm_measurement/measurement.py +++ b/examples/nidmm_measurement/measurement.py @@ -142,8 +142,8 @@ def _create_nidmm_session( help="Enable verbose logging. Repeat to increase verbosity.", ) @click.option( - "--use-grpc-device", - default=False, + "--use-grpc-device/--no-use-grpc-device", + default=True, is_flag=True, help="Use the NI gRPC Device Server.", ) diff --git a/examples/nifgen_standard_function/measurement.py b/examples/nifgen_standard_function/measurement.py index 967bbbd8a..275f3af6d 100644 --- a/examples/nifgen_standard_function/measurement.py +++ b/examples/nifgen_standard_function/measurement.py @@ -173,8 +173,8 @@ def _create_nifgen_session( help="Enable verbose logging. Repeat to increase verbosity.", ) @click.option( - "--use-grpc-device", - default=False, + "--use-grpc-device/--no-use-grpc-device", + default=True, is_flag=True, help="Use the NI gRPC Device Server.", ) diff --git a/examples/niscope_acquire_waveform/measurement.py b/examples/niscope_acquire_waveform/measurement.py index d36bd11d1..81de5ec10 100644 --- a/examples/niscope_acquire_waveform/measurement.py +++ b/examples/niscope_acquire_waveform/measurement.py @@ -211,8 +211,8 @@ def _create_niscope_session( help="Enable verbose logging. Repeat to increase verbosity.", ) @click.option( - "--use-grpc-device", - default=False, + "--use-grpc-device/--no-use-grpc-device", + default=True, is_flag=True, help="Use the NI gRPC Device Server.", ) diff --git a/examples/niswitch_control_relays/measurement.py b/examples/niswitch_control_relays/measurement.py index f59ecd513..0d27c4dbd 100644 --- a/examples/niswitch_control_relays/measurement.py +++ b/examples/niswitch_control_relays/measurement.py @@ -110,8 +110,8 @@ def _create_niswitch_session( help="Enable verbose logging. Repeat to increase verbosity.", ) @click.option( - "--use-grpc-device", - default=False, + "--use-grpc-device/--no-use-grpc-device", + default=True, is_flag=True, help="Use the NI gRPC Device Server.", )