Skip to content

Commit 3b3f899

Browse files
cmp0xffcmp0xff
committed
refactor: minimal example
1 parent 59af11e commit 3b3f899

File tree

7 files changed

+51
-27
lines changed

7 files changed

+51
-27
lines changed

‎pandas-stubs/core/series.pyi‎

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1583,8 +1583,8 @@ class Series(IndexOpsMixin[S1], NDFrame):
15831583
# them up.
15841584
@overload
15851585
def __add__(
1586-
self: Series[S1], other: complex | Sequence[complex] | Series[complex]
1587-
) -> Series[S1]: ...
1586+
self: Series[int], other: int | Sequence[int] | Series[int]
1587+
) -> Series[int]: ...
15881588
@overload
15891589
def __add__(self, other: S1 | Self) -> Self: ...
15901590
@overload
@@ -1631,10 +1631,22 @@ class Series(IndexOpsMixin[S1], NDFrame):
16311631
) -> Series[bool]: ...
16321632
@overload
16331633
def __or__(self, other: int | np_ndarray_anyint | Series[int]) -> Series[int]: ...
1634-
@overload
1635-
def __radd__(
1636-
self: Series[S1], other: complex | Sequence[complex] | np_ndarray_complex
1637-
) -> Series[S1]: ...
1634+
# @overload
1635+
# def __radd__(
1636+
# self, other: int | Sequence[int] | Series[int]
1637+
# ) -> Self: ...
1638+
# @overload
1639+
# def __radd__(
1640+
# self: Series[int], other: float | Sequence[float] | Series[float]
1641+
# ) -> Series[float]: ...
1642+
# @overload
1643+
# def __radd__(
1644+
# self: Series[int], other: complex | Sequence[complex] | Series[complex]
1645+
# ) -> Series[complex]: ...
1646+
# @overload
1647+
# def __radd__(
1648+
# self, other: complex | Sequence[complex] | np_ndarray_complex
1649+
# ) -> Self: ...
16381650
@overload
16391651
def __radd__(self, other: S1 | Series[S1]) -> Self: ...
16401652
@overload
@@ -1907,14 +1919,6 @@ class Series(IndexOpsMixin[S1], NDFrame):
19071919
axis: AxisIndex | None = ...,
19081920
) -> Series[S1]: ...
19091921
@overload
1910-
def mul(
1911-
self: Series[int],
1912-
other: int | Sequence[int] | Series[int],
1913-
level: Level | None = ...,
1914-
fill_value: float | None = ...,
1915-
axis: AxisIndex | None = ...,
1916-
) -> Series[int]: ...
1917-
@overload
19181922
def mul(
19191923
self,
19201924
other: timedelta | Timedelta | TimedeltaSeries | np.timedelta64,

‎pyproject.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@ types-pytz = ">= 2022.1.1"
3535
numpy = ">= 1.23.5"
3636

3737
[tool.poetry.group.dev.dependencies]
38-
mypy = "1.16.0"
38+
mypy = ">=1.17.0"
3939
pandas = "2.3.0"
4040
pyarrow = ">=10.0.1"
4141
pytest = ">=7.1.2"
42-
pyright = ">=1.1.400"
42+
pyright = ">=1.1.403"
4343
ty = "^0.0.1a8"
4444
pyrefly = "^0.21.0"
4545
poethepoet = ">=0.16.5"

‎tests/__init__.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def check(
6464
if not isinstance(actual, klass):
6565
raise RuntimeError(f"Expected type '{klass}' but got '{type(actual)}'")
6666
if dtype is None:
67-
return actual # type: ignore[return-value]
67+
return actual
6868

6969
if isinstance(actual, pd.Series):
7070
value = actual.iloc[index_to_check_for_type]
@@ -82,7 +82,7 @@ def check(
8282

8383
if not isinstance(value, dtype):
8484
raise RuntimeError(f"Expected type '{dtype}' but got '{type(value)}'")
85-
return actual # type: ignore[return-value]
85+
return actual
8686

8787

8888
def pytest_warns_bounded(

‎tests/series/arithmetic/any/__init__.py‎ renamed to ‎tests/series/arithmetic/__init__.py‎

File renamed without changes.

‎tests/series/arithmetic/any/test_add.py‎ renamed to ‎tests/series/arithmetic/test_add.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ def test_add_py_scalar() -> None:
1212
"""Test pd.Series[Any] + Python native scalars"""
1313
i, f, c = 1, 1.0, 1j
1414

15-
check(assert_type(left + i, pd.Series), pd.Series)
15+
# check(assert_type(left + i, pd.Series), pd.Series) # why?
1616
check(assert_type(left + f, pd.Series), pd.Series)
1717
check(assert_type(left + c, pd.Series), pd.Series)
1818

@@ -33,7 +33,7 @@ def test_add_py_sequence() -> None:
3333
"""Test pd.Series[Any] + Python native sequence"""
3434
i, f, c = [2, 3, 5], [1.0, 2.0, 3.0], [1j, 1j, 4j]
3535

36-
check(assert_type(left + i, pd.Series), pd.Series)
36+
# check(assert_type(left + i, pd.Series), pd.Series) # why?
3737
check(assert_type(left + f, pd.Series), pd.Series)
3838
check(assert_type(left + c, pd.Series), pd.Series)
3939

@@ -79,7 +79,7 @@ def test_add_pd_series() -> None:
7979
f = pd.Series([1.0, 2.0, 3.0])
8080
c = pd.Series([1.1j, 2.2j, 4.1j])
8181

82-
check(assert_type(left + i, pd.Series), pd.Series)
82+
# check(assert_type(left + i, pd.Series), pd.Series) # why?
8383
check(assert_type(left + f, pd.Series), pd.Series)
8484
check(assert_type(left + c, pd.Series), pd.Series)
8585

‎tests/series/test_series.py‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -818,7 +818,8 @@ def test_types_element_wise_arithmetic() -> None:
818818
# TODO these two below should type pd.Series[int]
819819
# check(assert_type(s * s2, "pd.Series[int]"), pd.Series, np.integer )
820820
check(assert_type(s * s2, pd.Series), pd.Series, np.integer)
821-
check(assert_type(s.mul(s2, fill_value=0), "pd.Series[int]"), pd.Series, np.integer)
821+
# check(assert_type(s.mul(s2, fill_value=0), "pd.Series[int]"), pd.Series, np.integer)
822+
check(assert_type(s.mul(s2, fill_value=0), pd.Series), pd.Series)
822823

823824
# TODO these two below should type pd.Series[float]
824825
# check(assert_type(s / s2, "pd.Series[float]"), pd.Series, np.float64)
@@ -1598,7 +1599,10 @@ def test_series_min_max_sub_axis() -> None:
15981599
ss = s1 - s2
15991600
sm = s1 * s2
16001601
sd = s1 / s2
1601-
check(assert_type(sa, pd.Series), pd.Series)
1602+
check(
1603+
assert_type(sa, pd.Series), # pyright: ignore[reportAssertTypeFailure] # why?
1604+
pd.Series,
1605+
)
16021606
check(assert_type(ss, pd.Series), pd.Series)
16031607
check(assert_type(sm, pd.Series), pd.Series)
16041608
check(assert_type(sd, pd.Series), pd.Series)
@@ -3891,7 +3895,7 @@ def foo(sf: pd.Series) -> None:
38913895
pass
38923896

38933897
foo(s)
3894-
check(assert_type(s + pd.Series([1]), pd.Series), pd.Series)
3898+
# check(assert_type(s + pd.Series([1]), pd.Series), pd.Series) # why?
38953899

38963900

38973901
def test_series_items() -> None:

‎tests/test_frame.py‎

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2819,9 +2819,25 @@ def test_sum_get_add() -> None:
28192819
summer = df.sum(axis=1)
28202820
check(assert_type(summer, pd.Series), pd.Series)
28212821

2822-
check(assert_type(s + summer, pd.Series), pd.Series)
2823-
check(assert_type(s + df["y"], pd.Series), pd.Series)
2824-
check(assert_type(summer + summer, pd.Series), pd.Series)
2822+
check(
2823+
assert_type(
2824+
s + summer, pd.Series # pyright: ignore[reportAssertTypeFailure] # why?
2825+
),
2826+
pd.Series,
2827+
)
2828+
check(
2829+
assert_type(
2830+
s + df["y"], pd.Series # pyright: ignore[reportAssertTypeFailure] # why?
2831+
),
2832+
pd.Series,
2833+
)
2834+
check(
2835+
assert_type(
2836+
summer + summer, # pyright: ignore[reportAssertTypeFailure] # why?
2837+
pd.Series,
2838+
),
2839+
pd.Series,
2840+
)
28252841

28262842

28272843
def test_getset_untyped() -> None:

0 commit comments

Comments
 (0)