Skip to content

BUG: tm.assert_series_equalcheck_dtype=False) with different resos #52458

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 6 commits into from
Apr 7, 2023

Conversation

mroeschke
Copy link
Member

@mroeschke mroeschke commented Apr 5, 2023

@mroeschke mroeschke added Testing pandas testing functions or related to the test suite Non-Nano datetime64/timedelta64 with non-nanosecond resolution labels Apr 5, 2023
@mroeschke mroeschke added this to the 2.0.1 milestone Apr 6, 2023
@phofl phofl merged commit b637ad2 into pandas-dev:main Apr 7, 2023
@phofl
Copy link
Member

phofl commented Apr 7, 2023

thx @mroeschke

@lumberbot-app
Copy link

lumberbot-app bot commented Apr 7, 2023

Owee, I'm MrMeeseeks, Look at me.

There seem to be a conflict, please backport manually. Here are approximate instructions:

  1. Checkout backport branch and update it.
git checkout 2.0.x
git pull
  1. Cherry pick the first parent branch of the this PR on top of the older branch:
git cherry-pick -x -m1 b637ad2a7d75c85d39f4e042e960bb82c76e518a
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #52458: BUG: tm.assert_series_equalcheck_dtype=False) with different resos'
  1. Push to a named branch:
git push YOURFORK 2.0.x:auto-backport-of-pr-52458-on-2.0.x
  1. Create a PR against branch 2.0.x, I would have named this PR:

"Backport PR #52458 on branch 2.0.x (BUG: tm.assert_series_equalcheck_dtype=False) with different resos)"

And apply the correct labels and milestones.

Congratulations — you did some good work! Hopefully your backport PR will be tested by the continuous integration and merged soon!

Remember to remove the Still Needs Manual Backport label once the PR gets merged.

If these instructions are inaccurate, feel free to suggest an improvement.

@mroeschke mroeschke deleted the bug/testing_reso branch April 7, 2023 17:27
mroeschke added a commit to mroeschke/pandas that referenced this pull request Apr 7, 2023
mroeschke added a commit that referenced this pull request Apr 7, 2023
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 Testing pandas testing functions or related to the test suite
Projects
None yet
2 participants