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

Backport #59144 on 2.2.x / 2.3.x (remove ops div class to solve #2137) #59535

Merged
merged 2 commits into from
Sep 18, 2024

Conversation

bnavigator
Copy link
Contributor

@bnavigator bnavigator commented Aug 17, 2024

Backport #59144


…olve pandas-dev#2137)

* remove core.computation.ops.Div resolves pandas-dev#21374 pandas-dev#58748

* need to preserve order

* updating tests

* (update whatsnew -- no whatsnew for 2.2.x and 2.3 yet)

* solve mypy issue

* fixing pytests

* better than cast

* adding specific test

(* Update pandas/tests/frame/test_query_eval.py // Not backported, fails on 2.2)

Co-authored-by: Matthew Roeschke <[email protected]>

* Update pandas/tests/computation/test_eval.py

Co-authored-by: Matthew Roeschke <[email protected]>

---------

Co-authored-by: Laurent Mutricy <[email protected]>
Co-authored-by: Matthew Roeschke <[email protected]>
@bnavigator bnavigator force-pushed the 2.2.x-pr59144backport branch from 81e2b2e to 495c9ed Compare August 17, 2024 08:46
@rhshadrach rhshadrach added Bug expressions pd.eval, query labels Aug 25, 2024
@rhshadrach
Copy link
Member

@WillAyd - 2.3.x should only have backports related to PDEP-14, is that right?

@bnavigator
Copy link
Contributor Author

If that's your policy, be advised that the current stable release 2.2 is not and minor release updates of it will never fully work with Numpy 2

@WillAyd
Copy link
Member

WillAyd commented Aug 25, 2024

There's a few things not required for PDEP-14 that have made their way in just to get the test suite green, but mostly it is for PDEP-14.

We actually haven't started backporting anything yet to 2.3 - the first PR to do so an get that branch up to speed is #59513

I'll take a look at this particular change as part of that

@rhshadrach
Copy link
Member

Thanks @WillAyd - I wouldn't push for this PR to be backported to 2.3, but no objection either.

@WillAyd
Copy link
Member

WillAyd commented Aug 25, 2024

I've actually been wondering about a few of the errors on 2.3 (see #59513 (comment)) and this appears to address some of them, so I think it will be required (thanks @bnavigator for investigating!)

@jorisvandenbossche
Copy link
Member

cc @lithomas1

@jorisvandenbossche jorisvandenbossche added this to the 2.2.3 milestone Sep 12, 2024
@lithomas1 lithomas1 changed the base branch from 2.3.x to 2.2.x September 14, 2024 11:36
@lithomas1
Copy link
Member

I think this fixes the failures, so going to merge on red.

thanks @bnavigator

@lithomas1 lithomas1 merged commit 2127b42 into pandas-dev:2.2.x Sep 18, 2024
19 of 53 checks passed
@bnavigator
Copy link
Contributor Author

AFAICT most of this has also been used in #59513 by @WillAyd, so now that this one has been merged into 2.2.x, his PR into 2.3.x will probably need adjustments as well. Plus 2.3.x probably needs a forward

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Bug expressions pd.eval, query
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants