refactor: #718 only drop TimestampSeries #1274

cmp0xff · 2025-07-13T06:40:48Z

Addresses CLEAN: Investigate whether TimestampSeries, TimedeltaSeries, etc. can be removed #718
Tests added: Please use assert_type() to assert the type of any return value

cmp0xff · 2025-07-13T09:54:09Z

tests/test_timefuncs.py

+    check(
+        assert_type(s5.dt.as_unit("s"), "pd.Series[pd.Timedelta]"),  # type: ignore[assert-type]
+        pd.Series,
+        pd.Timedelta,
+    )
+    check(
+        assert_type(s5.dt.as_unit("ms"), "pd.Series[pd.Timedelta]"),  # type: ignore[assert-type]
+        pd.Series,
+        pd.Timedelta,
+    )
+    check(
+        assert_type(s5.dt.as_unit("us"), "pd.Series[pd.Timedelta]"),  # type: ignore[assert-type]
+        pd.Series,
+        pd.Timedelta,
+    )
+    check(
+        assert_type(s5.dt.as_unit("ns"), "pd.Series[pd.Timedelta]"),  # type: ignore[assert-type]
+        pd.Series,
+        pd.Timedelta,
+    )


These type: ignores will be removed in #1273

need to not be there now

pandas-stubs/core/series.pyi

cmp0xff · 2025-07-13T10:51:21Z

pandas-stubs/core/series.pyi

+    @overload
+    def __add__(
+        self: Series[Timestamp], other: _nonseries_timestamp | Series[Timestamp]
+    ) -> Never: ...


Disabling mypy from recognising Series[Any] + Series[Any] -> Series[Any] in test_sum_get_add and test_series_min_max_sub_axis

I don't understand this comment.

cmp0xff · 2025-07-13T10:53:37Z

tests/test_series.py

-    check(assert_type(sa, pd.Series), pd.Series)
-    check(assert_type(ss, pd.Series), pd.Series)
+    check(assert_type(sa, pd.Series), pd.Series)  # type: ignore[assert-type]
+    check(assert_type(ss, pd.Series), pd.Series)  # type: ignore[assert-type]


Got fixed in https://github.com/pandas-dev/pandas-stubs/pull/1273/files#r2203336771

but you shouldn't have the ignores here. I'm really hesitant to accept this change in this PR without knowing that both PRs work together without this change.

cmp0xff · 2025-07-13T10:59:14Z

tests/test_frame.py

+    check(assert_type(s + summer, pd.Series), pd.Series)  # type: ignore[assert-type]
+    check(assert_type(s + df["y"], pd.Series), pd.Series)  # type: ignore[assert-type]
+    check(assert_type(summer + summer, pd.Series), pd.Series)  # type: ignore[assert-type]


#1274 (comment)

tests/test_scalars.py

Dr-Irv · 2025-07-23T16:53:15Z

@cmp0xff you have a number of PRs submitted while I was out on vacation for 2 weeks. Can you let me know which ones I should prioritize for review?

cmp0xff · 2025-07-23T18:15:12Z

Hi @Dr-Irv, I hope you had a nice vacation. My pull requests are categorised below. Each category is independent, but those in a higher position have a slightly higher priority in my opinion.

`Series`: arithmetic operations

The following two PRs are independent. They migrate test_series.py to a subfolder series, and add quite a few test_*.py files there.

add: feat(series): #1098 arithmetic addition #1275
truediv: feat(series): #1098 arithmetic truediv #1280

`DataFrame.to_dict`

fix(DataFrame): #799 to_dict #1283

`Index.append`

feat(index): append #1282

`Series`: address #718

refactor: #718 only drop TimestampSeries #1274 - this is a prerequisite for the next one.
refactor: #718 also drop TimedeltaSeries #1273

Dr-Irv

Thanks for doing this. It's a lot of good work.

Main thing - if I'm going to merge this PR, it needs to be in a state where we don't need the followup PR.

Basic rule - we don't put ignore in the tests unless we are testing that the stubs should not accept something that is invalid. You have places where you have added ignore in the tests and I won't merge that in (unless we know it is a bug in the type checker)

Dr-Irv · 2025-07-24T20:51:33Z

docs/philosophy.md

+The above code (without the `reveal_type()` statements) will get a `Never`
+on the computation of `ssum` because it is
 inappropriate to add two series containing `Timestamp` values.  The types will be


No, the above code will raise an Exception at runtime - not Never. Please revert this change.

Dr-Irv · 2025-07-24T20:54:17Z

docs/philosophy.md

@@ -46,19 +48,21 @@ ssum = s1 + s2
 reveal_type(ssum)
 ```

-The above code (without the `reveal_type()` statements) will raise an `Exception` on the computation of `ssum` because it is
+The above code (without the `reveal_type()` statements) will get a `Never`
+on the computation of `ssum` because it is
 inappropriate to add two series containing `Timestamp` values.  The types will be
 revealed as follows:


Suggested change

revealed as follows:

revealed by `mypy` as follows:

(I'm assuming this was using mypy in your updated example)

Dr-Irv · 2025-07-24T20:59:41Z

tests/test_frame.py

+    check(assert_type(s + summer, pd.Series), pd.Series)  # type: ignore[assert-type]
+    check(assert_type(s + df["y"], pd.Series), pd.Series)  # type: ignore[assert-type]
+    check(assert_type(summer + summer, pd.Series), pd.Series)  # type: ignore[assert-type]


don't want to have ignore in the tests. Fix the types to make this work.

Dr-Irv · 2025-07-24T20:59:53Z

tests/test_frame.py

@@ -3469,6 +3466,7 @@ def test_groupby_apply() -> None:
    df = pd.DataFrame({"col1": [1, 2, 3], "col2": [4, 5, 6]})

    def sum_mean(x: pd.DataFrame) -> float:
+        x.sum()


Dr-Irv · 2025-07-24T21:01:18Z

tests/test_scalars.py

@@ -1264,9 +1268,13 @@ def test_timestamp_cmp() -> None:
    # DatetimeIndex, but the type checker detects it to be UnknownIndex.
    c_unknown_index = pd.DataFrame({"a": [1]}, index=c_datetimeindex).index
    c_np_ndarray_dt64 = np_dt64_arr
-    c_series_dt64: TimestampSeries = pd.Series([1, 2, 3], dtype="datetime64[ns]")
+    c_series_dt64 = pd.Series([1, 2, 3], dtype="datetime64[ns]")


can you add a check(assert_type(... on c_series_dt64 to make sure we get a Series[Timestamp] ?

Dr-Irv · 2025-07-24T21:09:50Z

tests/test_timefuncs.py

+    check(
+        assert_type(s5.dt.as_unit("s"), "pd.Series[pd.Timedelta]"),  # type: ignore[assert-type]
+        pd.Series,
+        pd.Timedelta,
+    )
+    check(
+        assert_type(s5.dt.as_unit("ms"), "pd.Series[pd.Timedelta]"),  # type: ignore[assert-type]
+        pd.Series,
+        pd.Timedelta,
+    )
+    check(
+        assert_type(s5.dt.as_unit("us"), "pd.Series[pd.Timedelta]"),  # type: ignore[assert-type]
+        pd.Series,
+        pd.Timedelta,
+    )
+    check(
+        assert_type(s5.dt.as_unit("ns"), "pd.Series[pd.Timedelta]"),  # type: ignore[assert-type]
+        pd.Series,
+        pd.Timedelta,
+    )


need to not be there now

Dr-Irv · 2025-07-24T21:10:19Z

tests/test_timefuncs.py

    check(assert_type((s3 - td), "TimedeltaSeries"), pd.Series, pd.Timedelta)
    check(assert_type((s3 + td), "TimedeltaSeries"), pd.Series, pd.Timedelta)
    check(assert_type((s3 / td), "pd.Series[float]"), pd.Series, float)
    if TYPE_CHECKING_INVALID_USAGE:
-        r1 = s1 * td  # type: ignore[operator] # pyright: ignore[reportOperatorIssue]
+        r1 = s1 * td  # type: ignore[var-annotated]


need to include a pyright ignore here as well

Dr-Irv · 2025-07-24T21:12:47Z

pandas-stubs/core/series.pyi

+    @overload
+    def __add__(
+        self: Series[Timestamp], other: _nonseries_timestamp | Series[Timestamp]
+    ) -> Never: ...


I don't understand this comment.

Dr-Irv · 2025-07-24T21:14:15Z

pandas-stubs/core/series.pyi

+    @overload
+    def __add__(self: Series[Timedelta], other: Period) -> PeriodSeries: ...
+    @overload
+    def __add__(
+        self: Series[Timedelta], other: _nonseries_timestamp | Series[Timestamp]
+    ) -> Series[Timestamp]: ...


Shouldn't anything referring to Series[Timedelta] be methods in TimedeltaSeries and then you fix that in the other PR?

Dr-Irv · 2025-07-24T21:16:50Z

pandas-stubs/core/series.pyi

@@ -1910,7 +2053,7 @@ class Series(IndexOpsMixin[S1], NDFrame):
        level: None = ...,
        numeric_only: _bool = ...,
        **kwargs: Any,
-    ) -> float: ...
+    ) -> S1: ...


this has to remain float . Ideally, we would return Never for things like Series[str] where mean is not defined.

Dr-Irv · 2025-07-24T21:28:34Z

Hi @Dr-Irv, I hope you had a nice vacation. My pull requests are categorised below. Each category is independent, but those in a higher position have a slightly higher priority in my opinion.

I've reviewed them all, except #1273 as noted there.

Thanks for all the great work.

cmp0xff mentioned this pull request Jul 13, 2025

refactor: #718 also drop TimedeltaSeries #1273

Draft

2 tasks

cmp0xff marked this pull request as ready for review July 13, 2025 07:05

cmp0xff changed the title ~~fix: #718 only drop TimestampSeries~~ refactor: #718 only drop TimestampSeries Jul 13, 2025

cmp0xff commented Jul 13, 2025

View reviewed changes

tests/test_scalars.py Outdated Show resolved Hide resolved

cmp0xff force-pushed the hotfix/cmp0xff/gh718-drop-tss branch from c81cd6e to d5e1089 Compare July 16, 2025 17:54

cmp0xff marked this pull request as draft July 16, 2025 17:56

cmp0xff force-pushed the hotfix/cmp0xff/gh718-drop-tss branch from d5e1089 to 41c7015 Compare July 16, 2025 18:19

cmp0xff marked this pull request as ready for review July 16, 2025 20:11

cmp0xff force-pushed the hotfix/cmp0xff/gh718-drop-tss branch from 41c7015 to abf9147 Compare July 17, 2025 09:13

refactor: only drop TimestampSeries pandas-dev#1273 (review)

cbbd372

cmp0xff force-pushed the hotfix/cmp0xff/gh718-drop-tss branch from abf9147 to cbbd372 Compare July 17, 2025 15:10

Dr-Irv requested changes Jul 24, 2025

View reviewed changes

Uh oh!

refactor: #718 only drop TimestampSeries #1274

Are you sure you want to change the base?

refactor: #718 only drop TimestampSeries #1274

Conversation

cmp0xff commented Jul 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

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!

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!

Dr-Irv commented Jul 23, 2025

Uh oh!

cmp0xff commented Jul 23, 2025

Series: arithmetic operations

DataFrame.to_dict

Index.append

Series: address #718

Uh oh!

Dr-Irv left a comment

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!

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!

Dr-Irv commented Jul 24, 2025

Uh oh!

Uh oh!

cmp0xff commented Jul 13, 2025 •

edited

Loading

`Series`: arithmetic operations

`DataFrame.to_dict`

`Index.append`

`Series`: address #718