Updated examples to use NI gRPC Device remoting by default (#140)

tkrebes · web-flow · commit d157fafb45ad · 2022-12-06T10:57:03.000-06:00
* Updated instructions for using prerelease dependencies

* Updated examples to use NI gRPC Device by default
diff --git 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/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/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
@@ -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_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/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/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/measurement.py b/examples/nifgen_standard_function/measurement.py
@@ -174,8 +174,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/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/measurement.py b/examples/niscope_acquire_waveform/measurement.py
@@ -212,8 +212,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/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/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.",
 )
diff --git 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"]

Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,10 @@ def _log_measured_values(measured_value, in_compliance):`
`174`	`174`	`"-v", "--verbose", count=True, help="Enable verbose logging. Repeat to increase verbosity."`
`175`	`175`	`)`
`176`	`176`	`@click.option(`
`177`		`- "--use-grpc-device", default=False, is_flag=True, help="Use the NI gRPC Device Server."`
	`177`	`+ "--use-grpc-device/--no-use-grpc-device",`
	`178`	`+ default=True,`
	`179`	`+ is_flag=True,`
	`180`	`+ help="Use the NI gRPC Device Server.",`
`178`	`181`	`)`
`179`	`182`	`@click.option(`
`180`	`183`	`"--grpc-device-address",`
Original file line number	Diff line number	Diff line change
`@@ -142,8 +142,8 @@ def _create_nidmm_session(`
`142`	`142`	`help="Enable verbose logging. Repeat to increase verbosity.",`
`143`	`143`	`)`
`144`	`144`	`@click.option(`
`145`		`- "--use-grpc-device",`
`146`		`- default=False,`
	`145`	`+ "--use-grpc-device/--no-use-grpc-device",`
	`146`	`+ default=True,`
`147`	`147`	`is_flag=True,`
`148`	`148`	`help="Use the NI gRPC Device Server.",`
`149`	`149`	`)`
Original file line number	Diff line number	Diff line change
`@@ -174,8 +174,8 @@ def _create_nifgen_session(`
`174`	`174`	`help="Enable verbose logging. Repeat to increase verbosity.",`
`175`	`175`	`)`
`176`	`176`	`@click.option(`
`177`		`- "--use-grpc-device",`
`178`		`- default=False,`
	`177`	`+ "--use-grpc-device/--no-use-grpc-device",`
	`178`	`+ default=True,`
`179`	`179`	`is_flag=True,`
`180`	`180`	`help="Use the NI gRPC Device Server.",`
`181`	`181`	`)`
Original file line number	Diff line number	Diff line change
`@@ -212,8 +212,8 @@ def _create_niscope_session(`
`212`	`212`	`help="Enable verbose logging. Repeat to increase verbosity.",`
`213`	`213`	`)`
`214`	`214`	`@click.option(`
`215`		`- "--use-grpc-device",`
`216`		`- default=False,`
	`215`	`+ "--use-grpc-device/--no-use-grpc-device",`
	`216`	`+ default=True,`
`217`	`217`	`is_flag=True,`
`218`	`218`	`help="Use the NI gRPC Device Server.",`
`219`	`219`	`)`