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
8 changes: 4 additions & 4 deletions 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 pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ numpy = [
{ version = ">=2.1", python = "^3.13" },
]
hightime = "^0.2.2"
typing-extensions = ">=4.13.2"

[tool.poetry.group.lint.dependencies]
bandit = { version = ">=1.7", extras = ["toml"] }
Expand Down
41 changes: 0 additions & 41 deletions src/nitypes/_typing.py

This file was deleted.

2 changes: 1 addition & 1 deletion src/nitypes/time/_conversion.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
from typing import Any, TypeVar, Union, cast

import hightime as ht
from typing_extensions import TypeAlias

from nitypes._exceptions import invalid_arg_type, invalid_requested_type
from nitypes._typing import TypeAlias

_AnyDateTime: TypeAlias = Union[dt.datetime, ht.datetime]
_TDateTime = TypeVar("_TDateTime", dt.datetime, ht.datetime)
Expand Down
2 changes: 1 addition & 1 deletion src/nitypes/waveform/_analog_waveform.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
import hightime as ht
import numpy as np
import numpy.typing as npt
from typing_extensions import Self, TypeAlias

from nitypes._arguments import arg_to_uint, validate_dtype, validate_unsupported_arg
from nitypes._exceptions import invalid_arg_type, invalid_array_ndim
from nitypes._typing import Self, TypeAlias
from nitypes.waveform._exceptions import (
input_array_data_type_mismatch,
input_waveform_data_type_mismatch,
Expand Down
2 changes: 1 addition & 1 deletion src/nitypes/waveform/_extended_properties.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from collections.abc import Mapping
from typing import Iterator, MutableMapping, Union

from nitypes._typing import TypeAlias
from typing_extensions import TypeAlias

# Extended property keys
CHANNEL_NAME = "NI_ChannelName"
Expand Down
3 changes: 2 additions & 1 deletion src/nitypes/waveform/_timing/_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@
from collections.abc import Iterable, Sequence
from typing import Any, Generic, SupportsIndex, TypeVar

from typing_extensions import Self

from nitypes._exceptions import add_note
from nitypes._typing import Self
from nitypes.waveform._timing._sample_interval import (
SampleIntervalMode,
SampleIntervalStrategy,
Expand Down
3 changes: 1 addition & 2 deletions src/nitypes/waveform/_timing/_conversion.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,14 @@
from typing import Any, TypeVar, Union, cast

import hightime as ht
from typing_extensions import TypeAlias

from nitypes._exceptions import invalid_arg_type, invalid_requested_type
from nitypes._typing import TypeAlias
from nitypes.time._conversion import convert_datetime, convert_timedelta
from nitypes.waveform._timing._base import BaseTiming
from nitypes.waveform._timing._precision import PrecisionTiming
from nitypes.waveform._timing._standard import Timing


_AnyTiming: TypeAlias = Union[BaseTiming[Any, Any], Timing, PrecisionTiming]
_TTiming = TypeVar("_TTiming", bound=BaseTiming[Any, Any])

Expand Down
2 changes: 1 addition & 1 deletion src/nitypes/waveform/_timing/_precision.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
from typing import ClassVar

import hightime as ht
from typing_extensions import override

from nitypes._typing import override
from nitypes.waveform._timing._base import BaseTiming
from nitypes.waveform._timing._sample_interval import SampleIntervalMode

Expand Down
3 changes: 2 additions & 1 deletion src/nitypes/waveform/_timing/_standard.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
from collections.abc import Sequence
from typing import ClassVar

from nitypes._typing import override
from typing_extensions import override

from nitypes.waveform._timing._base import BaseTiming
from nitypes.waveform._timing._sample_interval import SampleIntervalMode

Expand Down
2 changes: 1 addition & 1 deletion tests/unit/time/test_conversion.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

import hightime as ht
import pytest
from typing_extensions import assert_type

from nitypes._typing import assert_type
from nitypes.time import convert_datetime, convert_timedelta


Expand Down
2 changes: 1 addition & 1 deletion tests/unit/waveform/_scaling/test_linear.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import numpy as np
import numpy.typing as npt
import pytest
from typing_extensions import assert_type

from nitypes._typing import assert_type
from nitypes.waveform import NO_SCALING, LinearScaleMode, ScaleMode


Expand Down
2 changes: 1 addition & 1 deletion tests/unit/waveform/_scaling/test_none.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@

import numpy as np
import numpy.typing as npt
from typing_extensions import assert_type

from nitypes._typing import assert_type
from nitypes.waveform import NO_SCALING, NoneScaleMode


Expand Down
2 changes: 1 addition & 1 deletion tests/unit/waveform/_timing/test_conversion.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import datetime as dt

import hightime as ht
from typing_extensions import assert_type

from nitypes._typing import assert_type
from nitypes.waveform import PrecisionTiming, SampleIntervalMode, Timing
from nitypes.waveform._timing import convert_timing

Expand Down
2 changes: 1 addition & 1 deletion tests/unit/waveform/_timing/test_precision.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@

import hightime as ht
import pytest
from typing_extensions import assert_type

from nitypes._typing import assert_type
from nitypes.waveform import PrecisionTiming, SampleIntervalMode
from tests.unit.waveform._timing._utils import assert_deep_copy, assert_shallow_copy

Expand Down
2 changes: 1 addition & 1 deletion tests/unit/waveform/_timing/test_standard.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
import pickle

import pytest
from typing_extensions import assert_type

from nitypes._typing import assert_type
from nitypes.waveform import SampleIntervalMode, Timing
from tests.unit.waveform._timing._utils import assert_deep_copy, assert_shallow_copy

Expand Down
2 changes: 1 addition & 1 deletion tests/unit/waveform/test_analog_waveform.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
import numpy as np
import numpy.typing as npt
import pytest
from typing_extensions import assert_type

from nitypes._typing import assert_type
from nitypes.waveform import (
NO_SCALING,
AnalogWaveform,
Expand Down