refactor: #718 also drop TimedeltaSeries #1273

cmp0xff · 2025-07-12T19:07:08Z

Closes #xxxx (Replace xxxx with the Github issue number)
Tests added: Please use assert_type() to assert the type of any return value

tests/test_timefuncs.py

tests/test_series.py

tests/test_frame.py

pandas-stubs/core/series.pyi

pandas-stubs/core/indexes/accessors.pyi

loicdiridollou

Overall this is a lot of great work, I have taken a crack at it and was quickly under water with the amount of changes needed.
I believe the __add__ issue that you have seems similar to what I am experiencing with #1098 and you may have the same problem with __sub__ and __truediv__ but you will be able to confirm.
I think we can't let those slip in the current version. Maybe the option is to keep the current TimestampSeries definition as a middle layer and start supporting the Series[Timestamp] along the way (not sure if this is possible).

pandas-stubs/core/tools/datetimes.pyi

cmp0xff · 2025-07-13T00:28:06Z

pandas-stubs/core/series.pyi

@@ -2379,4 +2339,4 @@ class OffsetSeries(Series[BaseOffset]):
 class IntervalSeries(Series[Interval[_OrderableT]], Generic[_OrderableT]):
    @property
    def array(self) -> IntervalArray: ...
-    def diff(self, periods: int = ...) -> Never: ...
+    def diff(self, periods: int = ...) -> Never: ...  # pyrefly: ignore


Additional ignore, potential issue

pandas-stubs/core/series.pyi

cmp0xff · 2025-07-13T00:28:48Z

tests/test_series.py

@@ -1601,7 +1591,7 @@ def test_series_min_max_sub_axis() -> None:
    sd = s1 / s2
    check(assert_type(sa, pd.Series), pd.Series)
    check(assert_type(ss, pd.Series), pd.Series)
-    check(assert_type(sm, pd.Series), pd.Series)
+    check(assert_type(sm, pd.Series), pd.Series)  # type: ignore[assert-type]


Additional ignore, maybe mypy is not very clever here

what does mypy infer?

mypy says the return type is Any

Related: #1274 (comment)

cmp0xff · 2025-07-13T00:29:47Z

tests/test_series.py

+        1 / series
+        [1] / series
+        1 // series
+        [1] // series


I had to remove the ignores, not sure if acceptable

could potentially add -> Never overloads?

cmp0xff · 2025-07-13T00:30:23Z

tests/test_timefuncs.py

+        ssum: pd.Series = s1 + s2
        ts = pd.Timestamp("2022-06-30")
-        tsum: pd.Series = s1 + ts  # type: ignore[operator] # pyright: ignore[reportOperatorIssue]
+        tsum: pd.Series = s1 + ts


I had to remove the ignores, not sure if acceptable

cmp0xff · 2025-07-13T00:30:57Z

tests/test_timefuncs.py

+        r1 = s1 * td  # pyright: ignore[reportOperatorIssue]
+        r2 = s1 / td  # pyright: ignore[reportOperatorIssue]
+        r3 = s3 * td  # pyright: ignore[reportOperatorIssue]


I had to remove the ignores, not sure if acceptable

tests/test_timefuncs.py

twoertwein

Thank you for working on this!

(It might be too late for that, but it could be nice to split timedelta and timestamp into separate MRs.)

Overload order can be important when we have Series[Any] or Series[unknown]. After you get feedback from @Dr-Irv, it might be nice to add new tests for overloads that might have changed their any/unknown behavior.

pandas-stubs/core/indexes/accessors.pyi

twoertwein · 2025-07-13T01:39:48Z

pandas-stubs/core/series.pyi

+_nonseries_int: TypeAlias = int | np_ndarray_anyint | Sequence[int]
+
+_T_INT = TypeVar("_T_INT", bound=int)
+_T_STAMP_AND_DELTA = TypeVar("_T_STAMP_AND_DELTA", bound=Timestamp | Timedelta)


might be nice to use consistent upper/lower-case across type-aliases/var: _int_t or _intT (similar to NDFrameT)

It's not very consistent everywhere, e.g.

pandas-stubs/pandas-stubs/core/strings.pyi

Line 42 in 19767bb

_T_INT = TypeVar("_T_INT", bound=Series[int] | Index[int])

pandas-stubs/core/series.pyi

twoertwein · 2025-07-13T02:07:33Z

tests/test_series.py

@@ -1601,7 +1591,7 @@ def test_series_min_max_sub_axis() -> None:
    sd = s1 / s2
    check(assert_type(sa, pd.Series), pd.Series)
    check(assert_type(ss, pd.Series), pd.Series)
-    check(assert_type(sm, pd.Series), pd.Series)
+    check(assert_type(sm, pd.Series), pd.Series)  # type: ignore[assert-type]


what does mypy infer?

twoertwein · 2025-07-13T02:13:31Z

tests/test_series.py

+        1 / series
+        [1] / series
+        1 // series
+        [1] // series


could potentially add -> Never overloads?

…3 (review)

cmp0xff · 2025-07-13T07:03:32Z

(It might be too late for that, but it could be nice to split timedelta and timestamp into separate MRs.)

I managed to isolate #1274 which just removes TimestampSeries. This PR can be reviewed after #1274.

…3 (review)

cmp0xff commented Jul 12, 2025

View reviewed changes

cmp0xff marked this pull request as ready for review July 12, 2025 21:49

loicdiridollou reviewed Jul 12, 2025

View reviewed changes

pandas-stubs/core/tools/datetimes.pyi Show resolved Hide resolved

cmp0xff commented Jul 13, 2025

View reviewed changes

twoertwein reviewed Jul 13, 2025

View reviewed changes

cmp0xff added a commit to cmp0xff/pandas-stubs that referenced this pull request Jul 13, 2025

fix(comment): pandas-dev#718 only drop TimestampSeries pandas-dev#127…

1b270b1

…3 (review)

cmp0xff force-pushed the hotfix/cmp0xff/gh718-drop-tss-tds branch from 5916fe1 to 3a27b71 Compare July 13, 2025 06:59

cmp0xff marked this pull request as draft July 13, 2025 07:01

cmp0xff changed the title ~~fix: #718 drop TimestampSeries and TimedeltaSeries~~ fix: #718 also drop TimedeltaSeries Jul 13, 2025

cmp0xff changed the title ~~fix: #718 also drop TimedeltaSeries~~ refactor: #718 also drop TimedeltaSeries Jul 13, 2025

cmp0xff mentioned this pull request Jul 13, 2025

refactor: #718 only drop TimestampSeries #1274

Open

2 tasks

cmp0xff force-pushed the hotfix/cmp0xff/gh718-drop-tss-tds branch from 3a27b71 to dfd0dc5 Compare July 13, 2025 10:48

cmp0xff mentioned this pull request Jul 13, 2025

feat(series): #1098 arithmetic addition #1275

Open

2 tasks

cmp0xff added a commit to cmp0xff/pandas-stubs that referenced this pull request Jul 16, 2025

fix(comment): pandas-dev#718 only drop TimestampSeries pandas-dev#127…

d5e1089

…3 (review)

cmp0xff added 2 commits July 16, 2025 20:19

fix(comment): pandas-dev#718 only drop TimestampSeries pandas-dev#127…

41c7015

…3 (review)

refactor: also remove TimedeltaSeries

6caa0c8

cmp0xff force-pushed the hotfix/cmp0xff/gh718-drop-tss-tds branch from dfd0dc5 to 6caa0c8 Compare July 16, 2025 18:47

Uh oh!

refactor: #718 also drop TimedeltaSeries #1273

Are you sure you want to change the base?

refactor: #718 also drop TimedeltaSeries #1273

Uh oh!

Conversation

cmp0xff commented Jul 12, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

loicdiridollou left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

twoertwein left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

cmp0xff commented Jul 13, 2025

Uh oh!

Uh oh!