Skip to content

Address additional feedback on the refactoring of stream_readers and stream_writers #825

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

Merged
mikeprosserni merged 5 commits into from
Sep 8, 2025
Merged

Address additional feedback on the refactoring of stream_readers and stream_writers #825

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4ca1da4
made submodules in stream_readers and stream_writters private
Sep 8, 2025
542c530
rename component\readers to component\stream_readers
Sep 8, 2025
c482db9
fix AUTO_START_UNSET compatibility breakage
Sep 8, 2025
91160a8
change relative imports to absolute imports
Sep 8, 2025
51d9f1a
export UnsetAutoStartSentinel also
Sep 8, 2025
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
14 changes: 7 additions & 7 deletions generated/nidaqmx/stream_readers/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@

from nidaqmx import DaqError

from .analog_single_channel_reader import AnalogSingleChannelReader
from .analog_multi_channel_reader import AnalogMultiChannelReader
from .analog_unscaled_reader import AnalogUnscaledReader
from .counter_reader import CounterReader
from .digital_single_channel_reader import DigitalSingleChannelReader
from .digital_multi_channel_reader import DigitalMultiChannelReader
from .power_readers import (
from ._analog_single_channel_reader import AnalogSingleChannelReader
from ._analog_multi_channel_reader import AnalogMultiChannelReader
from ._analog_unscaled_reader import AnalogUnscaledReader
from ._counter_reader import CounterReader
from ._digital_single_channel_reader import DigitalSingleChannelReader
from ._digital_multi_channel_reader import DigitalMultiChannelReader
from ._power_readers import (
PowerSingleChannelReader,
PowerMultiChannelReader,
PowerBinaryReader,
Expand Down
0 ...am_readers/analog_multi_channel_reader.py → ...m_readers/_analog_multi_channel_reader.py
View file
Open in desktop
File renamed without changes.
0 ...m_readers/analog_single_channel_reader.py → ..._readers/_analog_single_channel_reader.py
View file
Open in desktop
File renamed without changes.
0 .../stream_readers/analog_unscaled_reader.py → ...stream_readers/_analog_unscaled_reader.py
View file
Open in desktop
File renamed without changes.
0 .../nidaqmx/stream_readers/counter_reader.py → ...nidaqmx/stream_readers/_counter_reader.py
View file
Open in desktop
File renamed without changes.
0 ...m_readers/digital_multi_channel_reader.py → ..._readers/_digital_multi_channel_reader.py
View file
Open in desktop
File renamed without changes.
0 ..._readers/digital_single_channel_reader.py → ...readers/_digital_single_channel_reader.py
View file
Open in desktop
File renamed without changes.
0 ...d/nidaqmx/stream_readers/power_readers.py → .../nidaqmx/stream_readers/_power_readers.py
View file
Open in desktop
File renamed without changes.
16 changes: 9 additions & 7 deletions generated/nidaqmx/stream_writers/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,19 @@

from __future__ import annotations

from .analog_single_channel_writer import AnalogSingleChannelWriter
from .analog_multi_channel_writer import AnalogMultiChannelWriter
from .analog_unscaled_writer import AnalogUnscaledWriter
from .counter_writer import CounterWriter
from .digital_single_channel_writer import DigitalSingleChannelWriter
from .digital_multi_channel_writer import DigitalMultiChannelWriter
from ._analog_single_channel_writer import AnalogSingleChannelWriter
from ._analog_multi_channel_writer import AnalogMultiChannelWriter
from ._analog_unscaled_writer import AnalogUnscaledWriter
from ._counter_writer import CounterWriter
from ._digital_single_channel_writer import DigitalSingleChannelWriter
from ._digital_multi_channel_writer import DigitalMultiChannelWriter
from ._channel_writer_base import AUTO_START_UNSET

__all__ = [
'AnalogSingleChannelWriter',
'AnalogMultiChannelWriter',
'AnalogUnscaledWriter',
'CounterWriter',
'DigitalSingleChannelWriter',
'DigitalMultiChannelWriter']
'DigitalMultiChannelWriter',
'AUTO_START_UNSET']
0 ...am_writers/analog_multi_channel_writer.py → ...m_writers/_analog_multi_channel_writer.py
View file
Open in desktop
File renamed without changes.
0 ...m_writers/analog_single_channel_writer.py → ..._writers/_analog_single_channel_writer.py
View file
Open in desktop
File renamed without changes.
0 .../stream_writers/analog_unscaled_writer.py → ...stream_writers/_analog_unscaled_writer.py
View file
Open in desktop
File renamed without changes.
0 .../nidaqmx/stream_writers/counter_writer.py → ...nidaqmx/stream_writers/_counter_writer.py
View file
Open in desktop
File renamed without changes.
0 ...m_writers/digital_multi_channel_writer.py → ..._writers/_digital_multi_channel_writer.py
View file
Open in desktop
File renamed without changes.
0 ..._writers/digital_single_channel_writer.py → ...writers/_digital_single_channel_writer.py
View file
Open in desktop
File renamed without changes.
14 changes: 7 additions & 7 deletions src/handwritten/stream_readers/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@

from nidaqmx import DaqError

from .analog_single_channel_reader import AnalogSingleChannelReader
from .analog_multi_channel_reader import AnalogMultiChannelReader
from .analog_unscaled_reader import AnalogUnscaledReader
from .counter_reader import CounterReader
from .digital_single_channel_reader import DigitalSingleChannelReader
from .digital_multi_channel_reader import DigitalMultiChannelReader
from .power_readers import (
from ._analog_single_channel_reader import AnalogSingleChannelReader
from ._analog_multi_channel_reader import AnalogMultiChannelReader
from ._analog_unscaled_reader import AnalogUnscaledReader
from ._counter_reader import CounterReader
from ._digital_single_channel_reader import DigitalSingleChannelReader
from ._digital_multi_channel_reader import DigitalMultiChannelReader
from ._power_readers import (
PowerSingleChannelReader,
PowerMultiChannelReader,
PowerBinaryReader,
Expand Down
0 ...am_readers/analog_multi_channel_reader.py → ...m_readers/_analog_multi_channel_reader.py
View file
Open in desktop
File renamed without changes.
0 ...m_readers/analog_single_channel_reader.py → ..._readers/_analog_single_channel_reader.py
View file
Open in desktop
File renamed without changes.
0 .../stream_readers/analog_unscaled_reader.py → ...stream_readers/_analog_unscaled_reader.py
View file
Open in desktop
File renamed without changes.
0 ...dwritten/stream_readers/counter_reader.py → ...written/stream_readers/_counter_reader.py
View file
Open in desktop
File renamed without changes.
0 ...m_readers/digital_multi_channel_reader.py → ..._readers/_digital_multi_channel_reader.py
View file
Open in desktop
File renamed without changes.
0 ..._readers/digital_single_channel_reader.py → ...readers/_digital_single_channel_reader.py
View file
Open in desktop
File renamed without changes.
0 ...ndwritten/stream_readers/power_readers.py → ...dwritten/stream_readers/_power_readers.py
View file
Open in desktop
File renamed without changes.
16 changes: 9 additions & 7 deletions src/handwritten/stream_writers/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,19 @@

from __future__ import annotations

from .analog_single_channel_writer import AnalogSingleChannelWriter
from .analog_multi_channel_writer import AnalogMultiChannelWriter
from .analog_unscaled_writer import AnalogUnscaledWriter
from .counter_writer import CounterWriter
from .digital_single_channel_writer import DigitalSingleChannelWriter
from .digital_multi_channel_writer import DigitalMultiChannelWriter
from ._analog_single_channel_writer import AnalogSingleChannelWriter
from ._analog_multi_channel_writer import AnalogMultiChannelWriter
from ._analog_unscaled_writer import AnalogUnscaledWriter
from ._counter_writer import CounterWriter
from ._digital_single_channel_writer import DigitalSingleChannelWriter
from ._digital_multi_channel_writer import DigitalMultiChannelWriter
from ._channel_writer_base import AUTO_START_UNSET

__all__ = [
'AnalogSingleChannelWriter',
'AnalogMultiChannelWriter',
'AnalogUnscaledWriter',
'CounterWriter',
'DigitalSingleChannelWriter',
'DigitalMultiChannelWriter']
'DigitalMultiChannelWriter',
'AUTO_START_UNSET']
0 ...am_writers/analog_multi_channel_writer.py → ...m_writers/_analog_multi_channel_writer.py
View file
Open in desktop
File renamed without changes.
0 ...m_writers/analog_single_channel_writer.py → ..._writers/_analog_single_channel_writer.py
View file
Open in desktop
File renamed without changes.
0 .../stream_writers/analog_unscaled_writer.py → ...stream_writers/_analog_unscaled_writer.py
View file
Open in desktop
File renamed without changes.
0 ...dwritten/stream_writers/counter_writer.py → ...written/stream_writers/_counter_writer.py
View file
Open in desktop
File renamed without changes.
0 ...m_writers/digital_multi_channel_writer.py → ..._writers/_digital_multi_channel_writer.py
View file
Open in desktop
File renamed without changes.
0 ..._writers/digital_single_channel_writer.py → ...writers/_digital_single_channel_writer.py
View file
Open in desktop
File renamed without changes.
0 tests/component/readers/conftest.py → tests/component/conftest.py
View file
Open in desktop
File renamed without changes.
0 tests/component/readers/__init__.py → tests/component/stream_readers/__init__.py
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...aders/test_analog_multi_channel_reader.py → ...aders/test_analog_multi_channel_reader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from nidaqmx.constants import WaveformAttributeMode
from nidaqmx.error_codes import DAQmxErrors
from nidaqmx.stream_readers import AnalogMultiChannelReader, DaqError
from .conftest import (
from ..conftest import (
VOLTAGE_EPSILON,
_get_voltage_offset_for_chan,
_is_timestamp_close_to_now,
Expand Down
2 changes: 1 addition & 1 deletion ...ders/test_analog_single_channel_reader.py → ...ders/test_analog_single_channel_reader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
from nidaqmx.constants import AcquisitionType, WaveformAttributeMode
from nidaqmx.error_codes import DAQmxErrors
from nidaqmx.stream_readers import AnalogSingleChannelReader, DaqError
from .conftest import (
from ..conftest import (
VOLTAGE_EPSILON,
_get_voltage_offset_for_chan,
_is_timestamp_close_to_now,
Expand Down
2 changes: 1 addition & 1 deletion ...nt/readers/test_analog_unscaled_reader.py → ...am_readers/test_analog_unscaled_reader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import nidaqmx
from nidaqmx.stream_readers import AnalogUnscaledReader
from .conftest import (
from ..conftest import (
VOLTAGE_CODE_EPSILON,
_get_voltage_code_offset_for_chan,
)
Expand Down
2 changes: 1 addition & 1 deletion ...ders/test_digital_multi_channel_reader.py → ...ders/test_digital_multi_channel_reader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
from nidaqmx.error_codes import DAQmxErrors
from nidaqmx.stream_readers import DaqError, DigitalMultiChannelReader
from nidaqmx.utils import flatten_channel_string
from .conftest import (
from ..conftest import (
_bool_array_to_int,
_get_expected_data_for_line,
_get_expected_digital_data,
Expand Down
2 changes: 1 addition & 1 deletion ...ers/test_digital_single_channel_reader.py → ...ers/test_digital_single_channel_reader.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
from nidaqmx.error_codes import DAQmxErrors
from nidaqmx.stream_readers import DaqError, DigitalSingleChannelReader
from nidaqmx.utils import flatten_channel_string
from .conftest import (
from ..conftest import (
_bool_array_to_int,
_get_expected_data_for_line,
_get_expected_digital_data,
Expand Down
2 changes: 1 addition & 1 deletion ...omponent/readers/test_power_readers_ai.py → ...t/stream_readers/test_power_readers_ai.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
PowerMultiChannelReader,
PowerSingleChannelReader,
)
from .conftest import (
from ..conftest import (
POWER_BINARY_EPSILON,
POWER_EPSILON,
_get_current_code_setpoint_for_chan,
Expand Down
2 changes: 1 addition & 1 deletion tests/component/readers/test_task_read_ai.py → tests/component/task/test_task_read_ai.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

import nidaqmx
from nidaqmx.constants import AcquisitionType
from .conftest import (
from ..conftest import (
POWER_EPSILON,
VOLTAGE_EPSILON,
_assert_equal_2d,
Expand Down
2 changes: 1 addition & 1 deletion ...ent/readers/test_task_read_waveform_ai.py → ...ponent/task/test_task_read_waveform_ai.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from nitypes.waveform import AnalogWaveform

import nidaqmx
from .conftest import (
from ..conftest import (
VOLTAGE_EPSILON,
_get_voltage_offset_for_chan,
)
Expand Down
2 changes: 1 addition & 1 deletion ...ent/readers/test_task_read_waveform_di.py → ...ponent/task/test_task_read_waveform_di.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import nidaqmx
import nidaqmx.system
from .conftest import (
from ..conftest import (
_get_expected_data_for_line,
_get_waveform_data,
)
Expand Down
Loading