Skip to content

Commit e8cbf0d

Browse files
authored
nitypes: Delete _typing submodule and use typing_extensions directly (#21)
* pyproject.toml: Add dependency on typing-extensions * Update poetry.lock * nitypes: Use typing_extensions directly * nitypes: Delete _typing.py * docs: Add intersphinx typing-extensions * Revert "docs: Add intersphinx typing-extensions" This reverts commit eb3dc85.
1 parent 10bdfbe commit e8cbf0d

File tree

17 files changed

+21
-60
lines changed

17 files changed

+21
-60
lines changed

poetry.lock

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ numpy = [
1515
{ version = ">=2.1", python = "^3.13" },
1616
]
1717
hightime = "^0.2.2"
18+
typing-extensions = ">=4.13.2"
1819

1920
[tool.poetry.group.lint.dependencies]
2021
bandit = { version = ">=1.7", extras = ["toml"] }

src/nitypes/_typing.py

Lines changed: 0 additions & 41 deletions
This file was deleted.

src/nitypes/time/_conversion.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
from typing import Any, TypeVar, Union, cast
77

88
import hightime as ht
9+
from typing_extensions import TypeAlias
910

1011
from nitypes._exceptions import invalid_arg_type, invalid_requested_type
11-
from nitypes._typing import TypeAlias
1212

1313
_AnyDateTime: TypeAlias = Union[dt.datetime, ht.datetime]
1414
_TDateTime = TypeVar("_TDateTime", dt.datetime, ht.datetime)

src/nitypes/waveform/_analog_waveform.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
import hightime as ht
1010
import numpy as np
1111
import numpy.typing as npt
12+
from typing_extensions import Self, TypeAlias
1213

1314
from nitypes._arguments import arg_to_uint, validate_dtype, validate_unsupported_arg
1415
from nitypes._exceptions import invalid_arg_type, invalid_array_ndim
15-
from nitypes._typing import Self, TypeAlias
1616
from nitypes.waveform._exceptions import (
1717
input_array_data_type_mismatch,
1818
input_waveform_data_type_mismatch,

src/nitypes/waveform/_extended_properties.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
from collections.abc import Mapping
55
from typing import Iterator, MutableMapping, Union
66

7-
from nitypes._typing import TypeAlias
7+
from typing_extensions import TypeAlias
88

99
# Extended property keys
1010
CHANNEL_NAME = "NI_ChannelName"

src/nitypes/waveform/_timing/_base.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@
66
from collections.abc import Iterable, Sequence
77
from typing import Any, Generic, SupportsIndex, TypeVar
88

9+
from typing_extensions import Self
10+
911
from nitypes._exceptions import add_note
10-
from nitypes._typing import Self
1112
from nitypes.waveform._timing._sample_interval import (
1213
SampleIntervalMode,
1314
SampleIntervalStrategy,

src/nitypes/waveform/_timing/_conversion.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,14 @@
66
from typing import Any, TypeVar, Union, cast
77

88
import hightime as ht
9+
from typing_extensions import TypeAlias
910

1011
from nitypes._exceptions import invalid_arg_type, invalid_requested_type
11-
from nitypes._typing import TypeAlias
1212
from nitypes.time._conversion import convert_datetime, convert_timedelta
1313
from nitypes.waveform._timing._base import BaseTiming
1414
from nitypes.waveform._timing._precision import PrecisionTiming
1515
from nitypes.waveform._timing._standard import Timing
1616

17-
1817
_AnyTiming: TypeAlias = Union[BaseTiming[Any, Any], Timing, PrecisionTiming]
1918
_TTiming = TypeVar("_TTiming", bound=BaseTiming[Any, Any])
2019

src/nitypes/waveform/_timing/_precision.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
from typing import ClassVar
55

66
import hightime as ht
7+
from typing_extensions import override
78

8-
from nitypes._typing import override
99
from nitypes.waveform._timing._base import BaseTiming
1010
from nitypes.waveform._timing._sample_interval import SampleIntervalMode
1111

src/nitypes/waveform/_timing/_standard.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
from collections.abc import Sequence
55
from typing import ClassVar
66

7-
from nitypes._typing import override
7+
from typing_extensions import override
8+
89
from nitypes.waveform._timing._base import BaseTiming
910
from nitypes.waveform._timing._sample_interval import SampleIntervalMode
1011

0 commit comments

Comments
 (0)