Skip to content

ENH: consistent add/sub behavior for mixed resolutions #47394

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.

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 4 commits into from
Jun 23, 2022

Conversation

jbrockmendel
Copy link
Member

  • closes #xxxx (Replace xxxx with the Github issue number)
  • Tests added and passed if fixing a bug or adding a new feature
  • All code checks passed.
  • Added type annotations to new arguments/methods/functions.
  • Added an entry in the latest doc/source/whatsnew/vX.X.X.rst file if fixing a bug or adding a new feature.

raise
except ValueError as err:
raise ValueError(
"Addition between Timestamp and Timedelta with mismatched "
Copy link
Member

Choose a reason for hiding this comment

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

Is this case tested?

Copy link
Member Author

Choose a reason for hiding this comment

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

good catch, updated

@mroeschke mroeschke added Numeric Operations Arithmetic, Comparison, and Logical operations Non-Nano datetime64/timedelta64 with non-nanosecond resolution labels Jun 21, 2022
@mroeschke mroeschke added this to the 1.5 milestone Jun 21, 2022
Copy link
Member

@mroeschke mroeschke left a comment

Choose a reason for hiding this comment

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

LGTM. Could you merge main one more time post the CI failures?

@mroeschke mroeschke merged commit 1b79e2d into pandas-dev:main Jun 23, 2022
@jbrockmendel jbrockmendel deleted the nano-addsub-3 branch June 23, 2022 22:10
yehoshuadimarsky pushed a commit to yehoshuadimarsky/pandas that referenced this pull request Jul 13, 2022
)

* ENH: consistent add/sub behavior for mixed resolutions

* test with td64
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Non-Nano datetime64/timedelta64 with non-nanosecond resolution Numeric Operations Arithmetic, Comparison, and Logical operations
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants