diff --git a/examples/nidaqmx/nidaqmx_analog_input_filtering/nidaqmx_analog_input_filtering.py b/examples/nidaqmx/nidaqmx_analog_input_filtering/nidaqmx_analog_input_filtering.py index ad3ef7a..2cf2001 100644 --- a/examples/nidaqmx/nidaqmx_analog_input_filtering/nidaqmx_analog_input_filtering.py +++ b/examples/nidaqmx/nidaqmx_analog_input_filtering/nidaqmx_analog_input_filtering.py @@ -1,13 +1,11 @@ """Data acquisition script that continuously acquires analog input data.""" -import os import time from pathlib import Path -os.environ["NIDAQMX_ENABLE_WAVEFORM_SUPPORT"] = "1" -import nidaqmx # noqa: E402 # Must import after setting os environment variable -import nidaqmx.system # noqa: E402 -from nidaqmx.constants import ( # noqa: E402 +import nidaqmx +import nidaqmx.system +from nidaqmx.constants import ( AcquisitionType, CurrentShuntResistorLocation, CurrentUnits, @@ -19,9 +17,9 @@ TerminalConfiguration, UsageTypeAI, ) -from nidaqmx.errors import DaqError # noqa: E402 +from nidaqmx.errors import DaqError -import nipanel # noqa: E402 +import nipanel panel_script_path = Path(__file__).with_name("nidaqmx_analog_input_filtering_panel.py") panel = nipanel.create_streamlit_panel(panel_script_path) diff --git a/examples/nidaqmx/nidaqmx_analog_output_voltage/nidaqmx_analog_output_voltage.py b/examples/nidaqmx/nidaqmx_analog_output_voltage/nidaqmx_analog_output_voltage.py index 1dd9d06..3341325 100644 --- a/examples/nidaqmx/nidaqmx_analog_output_voltage/nidaqmx_analog_output_voltage.py +++ b/examples/nidaqmx/nidaqmx_analog_output_voltage/nidaqmx_analog_output_voltage.py @@ -1,20 +1,18 @@ """Data acquisition script that continuously generates analog output data.""" -import os import time from pathlib import Path -os.environ["NIDAQMX_ENABLE_WAVEFORM_SUPPORT"] = "1" -import hightime as ht # noqa: E402 -import nidaqmx # noqa: E402 # Must import after setting os environment variable -import nidaqmx.stream_writers # noqa: E402 -import nidaqmx.system # noqa: E402 -import numpy as np # noqa: E402 -from nidaqmx.constants import AcquisitionType, Edge, UsageTypeAO # noqa: E402 -from nidaqmx.errors import DaqError # noqa: E402 -from nitypes.waveform import AnalogWaveform, SampleIntervalMode, Timing # noqa: E402 - -import nipanel # noqa: E402 +import hightime as ht +import nidaqmx +import nidaqmx.stream_writers +import nidaqmx.system +import numpy as np +from nidaqmx.constants import AcquisitionType, Edge, UsageTypeAO +from nidaqmx.errors import DaqError +from nitypes.waveform import AnalogWaveform, SampleIntervalMode, Timing + +import nipanel panel_script_path = Path(__file__).with_name("nidaqmx_analog_output_voltage_panel.py") panel = nipanel.create_streamlit_panel(panel_script_path) diff --git a/examples/nidaqmx/nidaqmx_continuous_analog_input/nidaqmx_continuous_analog_input.py b/examples/nidaqmx/nidaqmx_continuous_analog_input/nidaqmx_continuous_analog_input.py index aa3c66f..03fe6ee 100644 --- a/examples/nidaqmx/nidaqmx_continuous_analog_input/nidaqmx_continuous_analog_input.py +++ b/examples/nidaqmx/nidaqmx_continuous_analog_input/nidaqmx_continuous_analog_input.py @@ -1,15 +1,13 @@ """Data acquisition script that continuously acquires analog input data.""" -import os import time from pathlib import Path from typing import cast -os.environ["NIDAQMX_ENABLE_WAVEFORM_SUPPORT"] = "1" -import nidaqmx # noqa: E402 # Must import after setting os environment variable -import nidaqmx.system # noqa: E402 -import numpy as np # noqa: E402 -from nidaqmx.constants import ( # noqa: E402 +import nidaqmx +import nidaqmx.system +import numpy as np +from nidaqmx.constants import ( AcquisitionType, CJCSource, LoggingMode, @@ -19,10 +17,10 @@ ThermocoupleType, UsageTypeAI, ) -from nidaqmx.errors import DaqError # noqa: E402 -from nitypes.waveform import AnalogWaveform # noqa: E402 +from nidaqmx.errors import DaqError +from nitypes.waveform import AnalogWaveform -import nipanel # noqa: E402 +import nipanel panel_script_path = Path(__file__).with_name("nidaqmx_continuous_analog_input_panel.py") panel = nipanel.create_streamlit_panel(panel_script_path) diff --git a/poetry.lock b/poetry.lock index e09253a..e508d44 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1372,14 +1372,14 @@ toml = ">=0.10.1" [[package]] name = "nidaqmx" -version = "1.3.0" +version = "1.4.0.dev2" description = "NI-DAQmx Python API" optional = false python-versions = "<4.0,>=3.9" groups = ["examples"] files = [ - {file = "nidaqmx-1.3.0-py3-none-any.whl", hash = "sha256:2adfe7c2e997b46ce83b97d5bfa698651ba82f2542952d166dd824dd27abc891"}, - {file = "nidaqmx-1.3.0.tar.gz", hash = "sha256:cb0567e6a43edabea2f18f0eb180928c06ee710ea1ffbb99c055065f147983ac"}, + {file = "nidaqmx-1.4.0.dev2-py3-none-any.whl", hash = "sha256:3e3decf2e6479f4d8141b5106139088f3b7341bb10e30f5448bef74b3b16ddbc"}, + {file = "nidaqmx-1.4.0.dev2.tar.gz", hash = "sha256:0f2fdd3fea0059a28671d42df023fb769f9f09ad92b73e108598ad4f661e4ac6"}, ] [package.dependencies] @@ -1387,7 +1387,7 @@ click = ">=8.0.0" deprecation = ">=2.1" distro = {version = ">=1.9.0", markers = "sys_platform == \"linux\""} hightime = ">=0.2.2" -nitypes = ">=0.1.0dev10" +nitypes = ">=1.0.1" numpy = [ {version = ">=1.22", markers = "python_version >= \"3.9\" and python_version < \"3.13\""}, {version = ">=2.1", markers = "python_version >= \"3.13\" and python_version < \"4.0\""}, @@ -1398,7 +1398,7 @@ typing_extensions = ">=4.0.0" tzlocal = ">=5.0,<6.0" [package.extras] -grpc = ["grpcio (>=1.49.0,<2.0)", "ni-grpcdevice-v1-proto (>=1.0.0)", "protobuf (>=4.21)"] +grpc = ["grpcio (>=1.49.0,<2.0)", "ni-grpcdevice-v1-proto (>=1.0.0)", "ni-protobuf-types (>=1.0.0)", "protobuf (>=4.21)"] [[package]] name = "niscope" @@ -3327,4 +3327,4 @@ files = [ [metadata] lock-version = "2.1" python-versions = ">=3.10,<4.0" -content-hash = "82f3ea3ce69f52074431f74f2986e03ab6df75f6b116f5fdc80291b372332520" +content-hash = "f214346ef64f6fb863ad645d4f92f4f9adde965d5e49622ca3aec34721d5d227" diff --git a/pyproject.toml b/pyproject.toml index 3bb5e69..ece4d5b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -91,7 +91,7 @@ optional = true [tool.poetry.group.examples.dependencies] streamlit-echarts = ">=0.4.0" extra-streamlit-components = "^0.1.80" -nidaqmx = { version = ">=1.3.0-dev0", allow-prereleases = true } +nidaqmx = { version = ">=1.4.0-dev2", allow-prereleases = true } niscope = "^1.4.9" [build-system]