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

CI/DEPS: Add xfail(strict=False) to related unstable sorting changes in Numpy 1.25 #53548

Merged
merged 9 commits into from
Jun 8, 2023

Conversation

mroeschke
Copy link
Member

@mroeschke mroeschke commented Jun 7, 2023

Notes:

@mroeschke mroeschke changed the title DEBUG: npdev build CI/DEPS: Add xfail(strict=False) to related unstable sorting changes in Numpy 1.25 Jun 8, 2023
@mroeschke mroeschke added the Compat pandas objects compatability with Numpy or Python functions label Jun 8, 2023
@mroeschke mroeschke added this to the 2.0.3 milestone Jun 8, 2023
@mroeschke
Copy link
Member Author

Going to merge to get the CI green, but I think discussion on what to do should happen in #53558

@mroeschke mroeschke merged commit bdfaca6 into pandas-dev:main Jun 8, 2023
@mroeschke mroeschke deleted the deps/npdev/sort branch June 8, 2023 18:09
@lumberbot-app
Copy link

lumberbot-app bot commented Jun 8, 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 bdfaca634e9946c0612c497456332fee80e7db37
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #53548: CI/DEPS: Add xfail(strict=False) to related unstable sorting changes in Numpy 1.25'
  1. Push to a named branch:
git push YOURFORK 2.0.x:auto-backport-of-pr-53548-on-2.0.x
  1. Create a PR against branch 2.0.x, I would have named this PR:

"Backport PR #53548 on branch 2.0.x (CI/DEPS: Add xfail(strict=False) to related unstable sorting changes in Numpy 1.25)"

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 added a commit to mroeschke/pandas that referenced this pull request Jun 8, 2023
…ated unstable sorting changes in Numpy 1.25
mroeschke added a commit that referenced this pull request Jun 8, 2023
canthonyscott pushed a commit to canthonyscott/pandas-anthony that referenced this pull request Jun 23, 2023
…in Numpy 1.25 (pandas-dev#53548)

* DEBUG: npdev build

* Address tests where sorting changed

* Adjust more tests

* Undo everything, even nanargsort

* xfail the relevant tests

* Add xfail to test_sort_column_level_and_index_label
Charlie-XIAO added a commit to Charlie-XIAO/pandas that referenced this pull request Jun 24, 2023
Daquisu pushed a commit to Daquisu/pandas that referenced this pull request Jul 8, 2023
…in Numpy 1.25 (pandas-dev#53548)

* DEBUG: npdev build

* Address tests where sorting changed

* Adjust more tests

* Undo everything, even nanargsort

* xfail the relevant tests

* Add xfail to test_sort_column_level_and_index_label
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Compat pandas objects compatability with Numpy or Python functions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants