Skip to content

feat(series): #1098 arithmetic truediv #1280

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
merged 9 commits into from
Aug 1, 2025
Merged

feat(series): #1098 arithmetic truediv #1280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
82d9d63
feat(series): #1098 arithmetic truediv
cmp0xff Jul 17, 2025
e57e8b4
fix(typing): __truediv__
cmp0xff Jul 29, 2025
58a668b
fix(typing): truediv
cmp0xff Jul 31, 2025
e6e4774
fix(typing): __rtruediv__ and rtruediv
cmp0xff Jul 31, 2025
d02638b
fix(typing): div and rdiv
cmp0xff Aug 1, 2025
c17f2ee
fix(comment): ordering https://github.com/pandas-dev/pandas-stubs/pul…
cmp0xff Aug 1, 2025
465add6
fix(comment): https://github.com/pandas-dev/pandas-stubs/pull/1302#di…
cmp0xff Aug 1, 2025
6a28145
fix(typing): truediv path
cmp0xff Aug 1, 2025
9068f8b
fix(comment): ordering https://github.com/pandas-dev/pandas-stubs/pul…
cmp0xff Aug 1, 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
767 changes: 491 additions & 276 deletions pandas-stubs/core/series.pyi
View file
Open in desktop

Large diffs are not rendered by default.

136 changes: 83 additions & 53 deletions tests/series/arithmetic/complex/test_add.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,42 +12,54 @@ def test_add_py_scalar() -> None:
"""Test pd.Series[complex] + Python native scalars"""
i, f, c = 1, 1.0, 1j

check(assert_type(left + i, "pd.Series[complex]"), pd.Series, np.complex128)
check(assert_type(left + f, "pd.Series[complex]"), pd.Series, np.complex128)
check(assert_type(left + c, "pd.Series[complex]"), pd.Series, np.complex128)
check(assert_type(left + i, "pd.Series[complex]"), pd.Series, np.complexfloating)
check(assert_type(left + f, "pd.Series[complex]"), pd.Series, np.complexfloating)
check(assert_type(left + c, "pd.Series[complex]"), pd.Series, np.complexfloating)

check(assert_type(i + left, "pd.Series[complex]"), pd.Series, np.complex128)
check(assert_type(f + left, "pd.Series[complex]"), pd.Series, np.complex128)
check(assert_type(c + left, "pd.Series[complex]"), pd.Series, np.complex128)
check(assert_type(i + left, "pd.Series[complex]"), pd.Series, np.complexfloating)
check(assert_type(f + left, "pd.Series[complex]"), pd.Series, np.complexfloating)
check(assert_type(c + left, "pd.Series[complex]"), pd.Series, np.complexfloating)

check(assert_type(left.add(i), "pd.Series[complex]"), pd.Series, np.complex128)
check(assert_type(left.add(f), "pd.Series[complex]"), pd.Series, np.complex128)
check(assert_type(left.add(c), "pd.Series[complex]"), pd.Series, np.complex128)
check(assert_type(left.add(i), "pd.Series[complex]"), pd.Series, np.complexfloating)
check(assert_type(left.add(f), "pd.Series[complex]"), pd.Series, np.complexfloating)
check(assert_type(left.add(c), "pd.Series[complex]"), pd.Series, np.complexfloating)

check(assert_type(left.radd(i), "pd.Series[complex]"), pd.Series, np.complex128)
check(assert_type(left.radd(f), "pd.Series[complex]"), pd.Series, np.complex128)
check(assert_type(left.radd(c), "pd.Series[complex]"), pd.Series, np.complex128)
check(
assert_type(left.radd(i), "pd.Series[complex]"), pd.Series, np.complexfloating
)
check(
assert_type(left.radd(f), "pd.Series[complex]"), pd.Series, np.complexfloating
)
check(
assert_type(left.radd(c), "pd.Series[complex]"), pd.Series, np.complexfloating
)


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

check(assert_type(left + i, "pd.Series[complex]"), pd.Series, np.complex128)
check(assert_type(left + f, "pd.Series[complex]"), pd.Series, np.complex128)
check(assert_type(left + c, "pd.Series[complex]"), pd.Series, np.complex128)
check(assert_type(left + i, "pd.Series[complex]"), pd.Series, np.complexfloating)
check(assert_type(left + f, "pd.Series[complex]"), pd.Series, np.complexfloating)
check(assert_type(left + c, "pd.Series[complex]"), pd.Series, np.complexfloating)

check(assert_type(i + left, "pd.Series[complex]"), pd.Series, np.complex128)
check(assert_type(f + left, "pd.Series[complex]"), pd.Series, np.complex128)
check(assert_type(c + left, "pd.Series[complex]"), pd.Series, np.complex128)
check(assert_type(i + left, "pd.Series[complex]"), pd.Series, np.complexfloating)
check(assert_type(f + left, "pd.Series[complex]"), pd.Series, np.complexfloating)
check(assert_type(c + left, "pd.Series[complex]"), pd.Series, np.complexfloating)

check(assert_type(left.add(i), "pd.Series[complex]"), pd.Series, np.complex128)
check(assert_type(left.add(f), "pd.Series[complex]"), pd.Series, np.complex128)
check(assert_type(left.add(c), "pd.Series[complex]"), pd.Series, np.complex128)
check(assert_type(left.add(i), "pd.Series[complex]"), pd.Series, np.complexfloating)
check(assert_type(left.add(f), "pd.Series[complex]"), pd.Series, np.complexfloating)
check(assert_type(left.add(c), "pd.Series[complex]"), pd.Series, np.complexfloating)

check(assert_type(left.radd(i), "pd.Series[complex]"), pd.Series, np.complex128)
check(assert_type(left.radd(f), "pd.Series[complex]"), pd.Series, np.complex128)
check(assert_type(left.radd(c), "pd.Series[complex]"), pd.Series, np.complex128)
check(
assert_type(left.radd(i), "pd.Series[complex]"), pd.Series, np.complexfloating
)
check(
assert_type(left.radd(f), "pd.Series[complex]"), pd.Series, np.complexfloating
)
check(
assert_type(left.radd(c), "pd.Series[complex]"), pd.Series, np.complexfloating
)


def test_add_numpy_array() -> None:
Expand All @@ -56,24 +68,36 @@ def test_add_numpy_array() -> None:
f = np.array([1.0, 2.0, 3.0], np.float64)
c = np.array([1.1j, 2.2j, 4.1j], np.complex128)

check(assert_type(left + i, "pd.Series[complex]"), pd.Series, np.complex128)
check(assert_type(left + f, "pd.Series[complex]"), pd.Series, np.complex128)
check(assert_type(left + c, "pd.Series[complex]"), pd.Series, np.complex128)
check(assert_type(left + i, "pd.Series[complex]"), pd.Series, np.complexfloating)
check(assert_type(left + f, "pd.Series[complex]"), pd.Series, np.complexfloating)
check(assert_type(left + c, "pd.Series[complex]"), pd.Series, np.complexfloating)

# `numpy` typing gives the corresponding `ndarray`s in the static type
# checking, where our `__radd__` cannot override. At runtime, they return
# `Series`s with the correct element type.
check(assert_type(i + left, "npt.NDArray[np.int64]"), pd.Series, np.complex128)
check(assert_type(f + left, "npt.NDArray[np.float64]"), pd.Series, np.complex128)
check(assert_type(c + left, "npt.NDArray[np.complex128]"), pd.Series, np.complex128)

check(assert_type(left.add(i), "pd.Series[complex]"), pd.Series, np.complex128)
check(assert_type(left.add(f), "pd.Series[complex]"), pd.Series, np.complex128)
check(assert_type(left.add(c), "pd.Series[complex]"), pd.Series, np.complex128)

check(assert_type(left.radd(i), "pd.Series[complex]"), pd.Series, np.complex128)
check(assert_type(left.radd(f), "pd.Series[complex]"), pd.Series, np.complex128)
check(assert_type(left.radd(c), "pd.Series[complex]"), pd.Series, np.complex128)
check(assert_type(i + left, "npt.NDArray[np.int64]"), pd.Series, np.complexfloating)
check(
assert_type(f + left, "npt.NDArray[np.float64]"), pd.Series, np.complexfloating
)
check(
assert_type(c + left, "npt.NDArray[np.complex128]"),
pd.Series,
np.complexfloating,
)

check(assert_type(left.add(i), "pd.Series[complex]"), pd.Series, np.complexfloating)
check(assert_type(left.add(f), "pd.Series[complex]"), pd.Series, np.complexfloating)
check(assert_type(left.add(c), "pd.Series[complex]"), pd.Series, np.complexfloating)

check(
assert_type(left.radd(i), "pd.Series[complex]"), pd.Series, np.complexfloating
)
check(
assert_type(left.radd(f), "pd.Series[complex]"), pd.Series, np.complexfloating
)
check(
assert_type(left.radd(c), "pd.Series[complex]"), pd.Series, np.complexfloating
)


def test_add_pd_series() -> None:
Expand All @@ -82,18 +106,24 @@ def test_add_pd_series() -> None:
f = pd.Series([1.0, 2.0, 3.0])
c = pd.Series([1.1j, 2.2j, 4.1j])

check(assert_type(left + i, "pd.Series[complex]"), pd.Series, np.complex128)
check(assert_type(left + f, "pd.Series[complex]"), pd.Series, np.complex128)
check(assert_type(left + c, "pd.Series[complex]"), pd.Series, np.complex128)

check(assert_type(i + left, "pd.Series[complex]"), pd.Series, np.complex128)
check(assert_type(f + left, "pd.Series[complex]"), pd.Series, np.complex128)
check(assert_type(c + left, "pd.Series[complex]"), pd.Series, np.complex128)

check(assert_type(left.add(i), "pd.Series[complex]"), pd.Series, np.complex128)
check(assert_type(left.add(f), "pd.Series[complex]"), pd.Series, np.complex128)
check(assert_type(left.add(c), "pd.Series[complex]"), pd.Series, np.complex128)

check(assert_type(left.radd(i), "pd.Series[complex]"), pd.Series, np.complex128)
check(assert_type(left.radd(f), "pd.Series[complex]"), pd.Series, np.complex128)
check(assert_type(left.radd(c), "pd.Series[complex]"), pd.Series, np.complex128)
check(assert_type(left + i, "pd.Series[complex]"), pd.Series, np.complexfloating)
check(assert_type(left + f, "pd.Series[complex]"), pd.Series, np.complexfloating)
check(assert_type(left + c, "pd.Series[complex]"), pd.Series, np.complexfloating)

check(assert_type(i + left, "pd.Series[complex]"), pd.Series, np.complexfloating)
check(assert_type(f + left, "pd.Series[complex]"), pd.Series, np.complexfloating)
check(assert_type(c + left, "pd.Series[complex]"), pd.Series, np.complexfloating)

check(assert_type(left.add(i), "pd.Series[complex]"), pd.Series, np.complexfloating)
check(assert_type(left.add(f), "pd.Series[complex]"), pd.Series, np.complexfloating)
check(assert_type(left.add(c), "pd.Series[complex]"), pd.Series, np.complexfloating)

check(
assert_type(left.radd(i), "pd.Series[complex]"), pd.Series, np.complexfloating
)
check(
assert_type(left.radd(f), "pd.Series[complex]"), pd.Series, np.complexfloating
)
check(
assert_type(left.radd(c), "pd.Series[complex]"), pd.Series, np.complexfloating
)
Loading
Loading