Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ from ni_measurement_plugin_sdk_service.measurement.client_support import (
% endif
serialize_parameters,
)
from ni_measurement_plugin_sdk_service.pin_map import PinMapClient
from ni.measurementlink.pinmap.v1.client import PinMapClient

_logger = logging.getLogger(__name__)

Expand Down
23 changes: 22 additions & 1 deletion packages/generator/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions packages/generator/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,12 @@ grpcio = "^1.49.1"
protobuf = ">=4.21"
black = ">=24.8.0"
click-option-group = ">=0.5.6"
ni-grpc-extensions = { version = ">=0.1.0dev1", allow-prereleases = true }
ni-grpcdevice-v1-proto = { version = ">=0.1.0dev2", allow-prereleases = true }
ni-measurement-plugin-sdk-service = {version = "^2.2.0"}
ni-measurementlink-discovery-v1-client = { version = ">=0.1.0dev0", allow-prereleases = true }
ni-measurementlink-pinmap-v1-client = { version = ">=0.1.0dev0", allow-prereleases = true }
ni-protobuf-types = { version = ">=0.1.0dev2", allow-prereleases = true }
ni-grpcdevice-v1-proto = { version = ">=0.1.0dev2", allow-prereleases = true }
ni-grpc-extensions = { version = ">=0.1.0dev1", allow-prereleases = true }

[tool.poetry.group.dev.dependencies]
pytest = ">=7.2.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
deserialize_parameters,
serialize_parameters,
)
from ni_measurement_plugin_sdk_service.pin_map import PinMapClient
from ni.measurementlink.pinmap.v1.client import PinMapClient

_logger = logging.getLogger(__name__)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
deserialize_parameters,
serialize_parameters,
)
from ni_measurement_plugin_sdk_service.pin_map import PinMapClient
from ni.measurementlink.pinmap.v1.client import PinMapClient

_logger = logging.getLogger(__name__)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
create_file_descriptor,
serialize_parameters,
)
from ni_measurement_plugin_sdk_service.pin_map import PinMapClient
from ni.measurementlink.pinmap.v1.client import PinMapClient

_logger = logging.getLogger(__name__)

Expand Down

This file was deleted.

This file was deleted.

22 changes: 21 additions & 1 deletion packages/service/poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions packages/service/pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ niscope = { version = ">=1.4.4", extras = ["grpc"], optional = true }
niswitch = { version = ">=1.4.4", extras = ["grpc"], optional = true }
ni-measurementlink-measurement-v1-proto = { version = ">=0.1.0dev0", allow-prereleases = true }
ni-measurementlink-measurement-v2-proto = { version = ">=0.1.0dev0", allow-prereleases = true }
ni-measurementlink-pinmap-v1-client = { version = ">=0.1.0dev0", allow-prereleases = true }
ni-measurementlink-sessionmanagement-v1-client = { version = ">=0.1.0dev0", allow-prereleases = true }
ni-protobuf-types = { version = ">=0.1.0dev2", allow-prereleases = true }

Expand Down
2 changes: 1 addition & 1 deletion packages/service/tests/acceptance/test_logging.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
measurement_service_pb2 as v2_measurement_service_pb2,
measurement_service_pb2_grpc as v2_measurement_service_pb2_grpc,
)
from ni.measurementlink.pinmap.v1.client import PinMapClient
from ni.measurementlink.sessionmanagement.v1.client import (
GRPC_SERVICE_CLASS,
GRPC_SERVICE_INTERFACE_NAME,
Expand All @@ -17,7 +18,6 @@
from pytest import FixtureRequest, LogCaptureFixture

from ni_measurement_plugin_sdk_service.measurement.service import MeasurementService
from ni_measurement_plugin_sdk_service.pin_map import PinMapClient
from tests.acceptance.test_streaming_data_measurement import (
_get_configuration_parameters as get_streaming_data_configuration_parameters,
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
from ni.measurementlink.pin_map_context_pb2 import (
PinMapContext,
)
from ni.measurementlink.pinmap.v1.client import PinMapClient

from ni_measurement_plugin_sdk_service.measurement.service import MeasurementService
from ni_measurement_plugin_sdk_service.pin_map import PinMapClient
from tests.utilities.measurements import nidaqmx_measurement
from tests.utilities.stubs.nidaqmx.types_pb2 import Configurations, Outputs

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
from ni.measurementlink.pin_map_context_pb2 import (
PinMapContext,
)
from ni.measurementlink.pinmap.v1.client import PinMapClient

from ni_measurement_plugin_sdk_service.measurement.service import MeasurementService
from ni_measurement_plugin_sdk_service.pin_map import PinMapClient
from tests.utilities.measurements import nidcpower_measurement
from tests.utilities.stubs.nidcpower.types_pb2 import Configurations, Outputs

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
from ni.measurementlink.pin_map_context_pb2 import (
PinMapContext,
)
from ni.measurementlink.pinmap.v1.client import PinMapClient

from ni_measurement_plugin_sdk_service.measurement.service import MeasurementService
from ni_measurement_plugin_sdk_service.pin_map import PinMapClient
from tests.utilities.measurements import nidigital_measurement
from tests.utilities.stubs.nidigital.types_pb2 import Configurations, Outputs

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
from ni.measurementlink.pin_map_context_pb2 import (
PinMapContext,
)
from ni.measurementlink.pinmap.v1.client import PinMapClient

from ni_measurement_plugin_sdk_service.measurement.service import MeasurementService
from ni_measurement_plugin_sdk_service.pin_map import PinMapClient
from tests.utilities.measurements import nidmm_measurement
from tests.utilities.stubs.nidmm.types_pb2 import Configurations, Outputs

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
from ni.measurementlink.pin_map_context_pb2 import (
PinMapContext,
)
from ni.measurementlink.pinmap.v1.client import PinMapClient

from ni_measurement_plugin_sdk_service.measurement.service import MeasurementService
from ni_measurement_plugin_sdk_service.pin_map import PinMapClient
from tests.utilities.measurements import nifgen_measurement
from tests.utilities.stubs.nifgen.types_pb2 import Configurations, Outputs

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
from ni.measurementlink.pin_map_context_pb2 import (
PinMapContext,
)
from ni.measurementlink.pinmap.v1.client import PinMapClient

from ni_measurement_plugin_sdk_service.measurement.service import MeasurementService
from ni_measurement_plugin_sdk_service.pin_map import PinMapClient
from tests.utilities.measurements import niscope_measurement
from tests.utilities.stubs.niscope.types_pb2 import Configurations, Outputs

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
from ni.measurementlink.pin_map_context_pb2 import (
PinMapContext,
)
from ni.measurementlink.pinmap.v1.client import PinMapClient

from ni_measurement_plugin_sdk_service.measurement.service import MeasurementService
from ni_measurement_plugin_sdk_service.pin_map import PinMapClient
from tests.utilities.measurements import niswitch_measurement
from tests.utilities.stubs.niswitch.types_pb2 import Configurations, Outputs

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
from ni.measurementlink.pin_map_context_pb2 import (
PinMapContext,
)
from ni.measurementlink.pinmap.v1.client import PinMapClient

from ni_measurement_plugin_sdk_service.measurement.service import MeasurementService
from ni_measurement_plugin_sdk_service.pin_map import PinMapClient
from tests.utilities.measurements import niswitch_multiplexer_measurement
from tests.utilities.stubs.niswitchmultiplexer.types_pb2 import Configurations, Outputs

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
from ni.measurementlink.pin_map_context_pb2 import (
PinMapContext,
)
from ni.measurementlink.pinmap.v1.client import PinMapClient

from ni_measurement_plugin_sdk_service.measurement.service import MeasurementService
from ni_measurement_plugin_sdk_service.pin_map import PinMapClient
from tests.utilities.discovery_service_process import DiscoveryServiceProcess
from tests.utilities.measurements import pin_aware_measurement
from tests.utilities.stubs.pinaware.types_pb2 import Configurations, Outputs
Expand Down
2 changes: 1 addition & 1 deletion packages/service/tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
from ni.measurementlink.measurement.v2 import (
measurement_service_pb2_grpc as v2_measurement_service_pb2_grpc,
)
from ni.measurementlink.pinmap.v1.client import PinMapClient
from ni.measurementlink.sessionmanagement.v1.client import SessionManagementClient

from ni_measurement_plugin_sdk_service import _featuretoggles
Expand All @@ -29,7 +30,6 @@
GrpcChannelPool,
MeasurementService,
)
from ni_measurement_plugin_sdk_service.pin_map import PinMapClient
from tests.utilities.discovery_service_process import DiscoveryServiceProcess


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
from contextlib import ExitStack

import pytest
from ni.measurementlink.pinmap.v1.client import PinMapClient
from ni.measurementlink.sessionmanagement.v1.client import (
PinMapContext,
SessionManagementClient,
)

from ni_measurement_plugin_sdk_service.pin_map import PinMapClient
from tests.utilities.connection_subset import ConnectionSubset, get_connection_subset

_SITE = 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
from contextlib import ExitStack

import pytest
from ni.measurementlink.pinmap.v1.client import PinMapClient
from ni.measurementlink.sessionmanagement.v1.client import (
PinMapContext,
SessionManagementClient,
)

from ni_measurement_plugin_sdk_service.pin_map import PinMapClient
from tests.utilities.connection_subset import ConnectionSubset, get_connection_subset

_SITE = 0
Expand Down
Loading
Loading