8000 Merge pull request #18990 from BvB93/version · constanzafierro/numpy@fa6dd59 · GitHub
[go: up one dir, main page]
Skip to content

Commit fa6dd59

Browse files
charrischarris
authored
Merge pull request numpy#18990 from BvB93/version
ENH: Add annotations for `np.lib.NumpyVersion`
2 parents 99b396b + f49fc54 commit fa6dd59

File tree

5 files changed

+58
-16
lines changed

5 files changed

+58
-16
lines changed

‎numpy/lib/_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,5 +151,5 @@ def __gt__(self, other):
151151
def __ge__(self, other):
152152
return self._compare(other) >= 0
153153

154-
def __repr(self):
154+
def __repr__(self):
155155
return "NumpyVersion(%s)" % self.vstring

‎numpy/lib/_version.pyi

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
from typing import Any, List
1+
from typing import Union, List
22

33
__all__: List[str]
44

55
class NumpyVersion:
6-
vstring: Any
7-
version: Any
8-
major: Any
9-
minor: Any
10-
bugfix: Any
11-
pre_release: Any
12-
is_devversion: Any
13-
def __init__(self, vstring): ...
14-
def __lt__(self, other): ...
15-
def __le__(self, other): ...
16-
def __eq__(self, other): ...
17-
def __ne__(self, other): ...
18-
def __gt__(self, other): ...
19-
def __ge__(self, other): ...
6+
vstring: str
7+
version: str
8+
major: int
9+
minor: int
10+
bugfix: int
11+
pre_release: str
12+
is_devversion: bool
13+
def __init__(self, vstring: str) -> None: ...
14+
def __lt__(self, other: Union[str, NumpyVersion]) -> bool: ...
15+
def __le__(self, other: Union[str, NumpyVersion]) -> bool: ...
16+
def __eq__(self, other: Union[str, NumpyVersion]) -> bool: ... # type: ignore[override]
17+
def __ne__(self, other: Union[str, NumpyVersion]) -> bool: ... # type: ignore[override]
18+
def __gt__(self, other: Union[str, NumpyVersion]) -> bool: ...
19+
def __ge__(self, other: Union[str, NumpyVersion]) -> bool: ...

‎numpy/typing/tests/data/fail/lib_version.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
from numpy.lib import NumpyVersion
2+
3+
version: NumpyVersion
4+
5+
NumpyVersion(b"1.8.0") # E: incompatible type
6+
version >= b"1.8.0" # E: Unsupported operand types

‎numpy/typing/tests/data/pass/lib_version.py

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
from numpy.lib import NumpyVersion
2+
3+
version = NumpyVersion("1.8.0")
4+
5+
version.vstring
6+
version.version
7+
version.major
8+
version.minor
9+
version.bugfix
10+
version.pre_release
11+
version.is_devversion
12+
13+
version == version
14+
version != version
15+
version < "1.8.0"
16+
version <= version
17+
version > version
18+
version >= "1.8.0"

‎numpy/typing/tests/data/reveal/lib_version.py

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
from numpy.lib import NumpyVersion
2+
3+
version = NumpyVersion("1.8.0")
4+
5+
reveal_type(version.vstring) # E: str
6+
reveal_type(version.version) # E: str
7+
reveal_type(version.major) # E: int
8+
reveal_type(version.minor) # E: int
9+
reveal_type(version.bugfix) # E: int
10+
reveal_type(version.pre_release) # E: str
11+
reveal_type(version.is_devversion) # E: bool
12+
13+
reveal_type(version == version) # E: bool
14+
reveal_type(version != version) # E: bool
15+
reveal_type(version < "1.8.0") # E: bool
16+
reveal_type(version <= version) # E: bool
17+
reveal_type(version > version) # E: bool
18+
reveal_type(version >= "1.8.0") # E: bool

0 commit comments

Comments
 (0)
0