Skip to content

Conversation

mroeschke
Copy link
Member

Split from #60847

Will be fixed in the next Dask release #60847 (comment)

@mroeschke mroeschke added the Testing pandas testing functions or related to the test suite label Feb 7, 2025
@mroeschke mroeschke added this to the 2.3 milestone Feb 7, 2025
@mroeschke
Copy link
Member Author

Unit Tests / Downstream Compat is passing so merging

@mroeschke mroeschke merged commit c5ea524 into pandas-dev:main Feb 7, 2025
36 of 46 checks passed
@mroeschke mroeschke deleted the ci/dask branch February 7, 2025 19:07
Copy link

lumberbot-app bot commented Feb 7, 2025

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.3.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 c5ea5248d8e1c3ec4e0414480e574b5f6710e377
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #60873: TST/CI: xfail test_frame_setitem_dask_array_into_new_col for numpy>2.1'
  1. Push to a named branch:
git push YOURFORK 2.3.x:auto-backport-of-pr-60873-on-2.3.x
  1. Create a PR against branch 2.3.x, I would have named this PR:

"Backport PR #60873 on branch 2.3.x (TST/CI: xfail test_frame_setitem_dask_array_into_new_col for numpy>2.1)"

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Testing pandas testing functions or related to the test suite

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant