Skip to content

added np.timedelta64 for series arithmatic methods #432

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 21 commits into from
Nov 23, 2022
Merged

added np.timedelta64 for series arithmatic methods #432

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
acd9ac8
update
ramvikrams Nov 18, 2022
19a7df2
update
ramvikrams Nov 19, 2022
e06f583
Update test_timefuncs.py
ramvikrams Nov 19, 2022
fb9dc01
Update test_timefuncs.py
ramvikrams Nov 19, 2022
83aa4c0
Update test_timefuncs.py
ramvikrams Nov 19, 2022
9fc4c76
Update test_timefuncs.py
ramvikrams Nov 19, 2022
dda43a9
Update test_timefuncs.py
ramvikrams Nov 19, 2022
994c6db
Update test_timefuncs.py
ramvikrams Nov 19, 2022
c0ea3b0
Update test_timefuncs.py
ramvikrams Nov 19, 2022
2284670
Update test_timefuncs.py
ramvikrams Nov 19, 2022
9e03f29
update
ramvikrams Nov 20, 2022
258e32a
update
ramvikrams Nov 21, 2022
a5ed64d
update
ramvikrams Nov 22, 2022
fee79d6
update
ramvikrams Nov 22, 2022
fd59d02
Update series.pyi
ramvikrams Nov 22, 2022
31db112
Update series.pyi
ramvikrams Nov 22, 2022
f01d3c0
Update test_timefuncs.py
ramvikrams Nov 22, 2022
fc41d33
Update test_timefuncs.py
ramvikrams Nov 22, 2022
21992b8
update
ramvikrams Nov 22, 2022
cb26631
update
ramvikrams Nov 23, 2022
ca75099
Update test_timefuncs.py
ramvikrams Nov 23, 2022
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
20 changes: 13 additions & 7 deletions pandas-stubs/core/series.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1211,7 +1211,7 @@ class Series(IndexOpsMixin, NDFrame, Generic[S1]):
def __add__(self, other: Timestamp) -> TimestampSeries: ...
@overload
def __add__(
self, other: num | _str | Timedelta | _ListLike | Series[S1]
self, other: num | _str | Timedelta | _ListLike | Series[S1] | np.timedelta64
) -> Series: ...
# ignore needed for mypy as we want different results based on the arguments
@overload
Expand Down Expand Up @@ -1243,7 +1243,9 @@ class Series(IndexOpsMixin, NDFrame, Generic[S1]):
def __le__(self, other: S1 | _ListLike | Series[S1]) -> Series[_bool]: ...
def __lt__(self, other: S1 | _ListLike | Series[S1]) -> Series[_bool]: ...
@overload
def __mul__(self, other: Timedelta | TimedeltaSeries) -> TimedeltaSeries: ...
def __mul__(
self, other: Timedelta | TimedeltaSeries | np.timedelta64
) -> TimedeltaSeries: ...
@overload
def __mul__(self, other: num | _ListLike | Series) -> Series: ...
def __mod__(self, other: num | _ListLike | Series[S1]) -> Series[S1]: ...
Expand Down Expand Up @@ -1304,17 +1306,19 @@ class Series(IndexOpsMixin, NDFrame, Generic[S1]):
) -> TimedeltaSeries: ...
@overload
def __sub__(
self: Series[Timestamp], other: Timedelta | TimedeltaSeries | TimedeltaIndex
self: Series[Timestamp],
other: Timedelta | TimedeltaSeries | TimedeltaIndex | np.timedelta64,
) -> TimestampSeries: ...
@overload
def __sub__(
self: Series[Timedelta], other: Timedelta | TimedeltaSeries | TimedeltaIndex
self: Series[Timedelta],
other: Timedelta | TimedeltaSeries | TimedeltaIndex | np.timedelta64,
) -> TimedeltaSeries: ...
@overload
def __sub__(self, other: num | _ListLike | Series) -> Series: ...
@overload
def __truediv__(
self, other: Timedelta | TimedeltaSeries | TimedeltaIndex
self, other: Timedelta | TimedeltaSeries | TimedeltaIndex | np.timedelta64
) -> Series[float]: ...
@overload
def __truediv__(self, other: num | _ListLike | Series[S1]) -> Series: ...
Expand Down Expand Up @@ -1739,6 +1743,8 @@ class TimestampSeries(Series[Timestamp]):
# ignore needed because of mypy
@property
def dt(self) -> TimestampProperties: ... # type: ignore[override]
@overload
def __add__(self, other: Timedelta | np.timedelta64) -> TimedeltaSeries: ...
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

result here of adding TimestampSeries plus a timedelta is TimestampSeries

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sir here there is no TimestampSeries

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Look at line 1742


class TimedeltaSeries(Series[Timedelta]):
# ignores needed because of mypy
Expand All @@ -1747,11 +1753,11 @@ class TimedeltaSeries(Series[Timedelta]):
@overload
def __add__(self, other: Timestamp | DatetimeIndex) -> TimestampSeries: ...
@overload
def __add__(self, other: Timedelta) -> TimedeltaSeries: ...
def __add__(self, other: Timedelta | np.timedelta64) -> TimedeltaSeries: ...
def __radd__(self, pther: Timestamp | TimestampSeries) -> TimestampSeries: ... # type: ignore[override]
def __mul__(self, other: num) -> TimedeltaSeries: ... # type: ignore[override]
def __sub__( # type: ignore[override]
self, other: Timedelta | TimedeltaSeries | TimedeltaIndex
self, other: Timedelta | TimedeltaSeries | TimedeltaIndex | np.timedelta64
) -> TimedeltaSeries: ...
@property
def dt(self) -> TimedeltaProperties: ... # type: ignore[override]
Expand Down
15 changes: 15 additions & 0 deletions tests/test_timefuncs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1035,3 +1035,18 @@ def test_timedelta_range() -> None:
def test_dateoffset_freqstr() -> None:
offset = DateOffset(minutes=10)
check(assert_type(offset.freqstr, str), str)


def timedelta64_and_arithmatic_operator() -> None:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the name of any test function must begin with test_. If you make that change, you will see that the tests will fail. They were never getting tested.

You will have to change the tests as well. See example.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sir even after adding the test_ the poe mypy test doesn't fail on my system

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do poe test to run all tests or poe pytest to just run pytest which is where the failures will occur

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes sir there were errors, I'll fix it then

s1 = pd.Series(data=pd.date_range("1/1/2020", "2/1/2020"))
s2 = pd.Series(data=pd.date_range("1/1/2021", "2/1/2021"))
s3 = s2 - s1
td = np.timedelta64(1, "M")
check(assert_type((s1 - td), TimestampSeries), pd.Series, pd.Timestamp)
check(assert_type((s1 + td), TimestampSeries), pd.Series, pd.Timestamp)
check(assert_type((s1 * td), TimedeltaSeries), pd.Series, pd.Timestamp)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

multipying a TimestampSeries times a Timedelta is not allowed, so have to fix that.

In TimestampSeries, put in a method for __mul__() that takes the two timedelta arguments, and returns Never from typing_extensions

Change the test to assert the type, but do not do the check part.

check(assert_type((s1 / td), TimestampSeries), pd.Series, pd.Timestamp)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dividing a TimestampSEries by a Timedelta is not allowed, so have to fix that

In TimestampSeries, put in a method for __truediv__() that takes the two timedelta arguments, and returns Never from typing_extensions

Change the test to assert the type, but do not do the check part.

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), TimedeltaSeries), pd.Series, pd.Timedelta)
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

multiplying a TimedeltaSeries by a timedelta fails, so have to fix that

In TimedeltaSeries, put in a method for __mul__() that takes the two timedelta arguments, and returns Never from typing_extensions

Change the test to assert the type, but do not do the check part.

Copy link
Contributor Author

@ramvikrams ramvikrams Nov 21, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sir in TimedeltaSeries should a __trudiv__() be added because it is showing errors

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and sir __mul__() it is still showing errors after adding it.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sir in TimedeltaSeries should a __trudiv__() be added because it is showing errors

Yes, you should add that. It is valid to divide TimedeltaSeries by Timedelta or np.timedelta64 to get a Series[float], and to divde by a float to get TimedeltaSeries

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and sir __mul__() it is still showing errors after adding it.

Your job to fix them!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sir just not able to fix this error: Name "__mul__" already defined on line 1761 [no-redef] could not find about it over internet also

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You probably have __mul__() defined in there twice, with different arguments. You need to put a @overload before each def __mul__() statement

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sir still mypy hows the same error

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Without seeing your code, I can't see what you are doing wrong. You can push and it will fail and I will tell you what you did wrong.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes sir

check(assert_type((s3 / td), TimedeltaSeries), pd.Series, np.float)