Skip to content
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

Adjust unxfail condition for nat test #52867

Merged
merged 1 commit into from
Apr 23, 2023
Merged

Conversation

phofl
Copy link
Member

@phofl phofl commented Apr 23, 2023

  • 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.

@phofl phofl added CI Continuous Integration Dependencies Required and optional dependencies labels Apr 23, 2023
@phofl phofl added this to the 2.0.1 milestone Apr 23, 2023
@phofl
Copy link
Member Author

phofl commented Apr 23, 2023

merging to ensure that ci on 2.0.1 will be green as well for release

@phofl phofl merged commit ce94afa into pandas-dev:main Apr 23, 2023
@phofl phofl deleted the unxfail_test branch April 23, 2023 10:10
@lumberbot-app
Copy link

lumberbot-app bot commented Apr 23, 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 ce94afa62fbc7079863c190d89e78dd1d2e69c02
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #52867: Adjust unxfail condition for nat test'
  1. Push to a named branch:
git push YOURFORK 2.0.x:auto-backport-of-pr-52867-on-2.0.x
  1. Create a PR against branch 2.0.x, I would have named this PR:

"Backport PR #52867 on branch 2.0.x (Adjust unxfail condition for nat test)"

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.

phofl added a commit to phofl/pandas that referenced this pull request Apr 23, 2023
phofl added a commit that referenced this pull request Apr 23, 2023
…test for new numpy release) (#52875)

Adjust unxfail condition for nat test for new numpy release (#52867)

(cherry picked from commit ce94afa)
Rylie-W pushed a commit to Rylie-W/pandas that referenced this pull request May 19, 2023
Daquisu pushed a commit to Daquisu/pandas that referenced this pull request Jul 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI Continuous Integration Dependencies Required and optional dependencies
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

1 participant