Skip to content

CI: remove usage of legacy NPY_PROMOTION_STATE #60144

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

Conversation

jorisvandenbossche
Copy link
Member

@jorisvandenbossche jorisvandenbossche commented Oct 30, 2024

We no longer need this, see also discussion in #60140.

And this fixes CI on main (tests are currently failing if you use numpy >= 2 with this env variable set)

@jorisvandenbossche
Copy link
Member Author

CI is passing, except for the pyarrow nightly build, which seems to be using numpy 1.26

@mroeschke
Copy link
Member

Looks like I added a numpy < 2 pin in ci/deps/actions-311-pyarrownightly.yaml in #59046. Maybe that can be removed now.

If that works, maybe we can also remove the nomkl install patch as well now.

@jorisvandenbossche
Copy link
Member Author

The Arrow nightly build seems a good one to use a later numpy version, but it might still be useful to test 1.26 somewhere?

@jorisvandenbossche jorisvandenbossche marked this pull request as ready for review October 31, 2024 07:49
@jorisvandenbossche jorisvandenbossche added this to the 2.3 milestone Oct 31, 2024
@jorisvandenbossche
Copy link
Member Author

This is all passing, so going to merge this to get CI green again.

But I still think we ideally get the tests passing for numpy 1.26 as well (at some point our min version might be that version and we will test with it anyway. But will open a separate follow-up PR for that)

@jorisvandenbossche jorisvandenbossche merged commit 4bbb3ce into pandas-dev:main Oct 31, 2024
51 checks passed
@jorisvandenbossche jorisvandenbossche deleted the ci-numpy-legacy-state branch October 31, 2024 08:41
Copy link

lumberbot-app bot commented Oct 31, 2024

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 4bbb3ce5d5a7e0f24dc2d8c1faf26c3b5d55670d
  1. You will likely have some merge/cherry-pick conflict here, fix them and commit:
git commit -am 'Backport PR #60144: CI: remove usage of legacy NPY_PROMOTION_STATE'
  1. Push to a named branch:
git push YOURFORK 2.3.x:auto-backport-of-pr-60144-on-2.3.x
  1. Create a PR against branch 2.3.x, I would have named this PR:

"Backport PR #60144 on branch 2.3.x (CI: remove usage of legacy NPY_PROMOTION_STATE)"

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.

@jorisvandenbossche
Copy link
Member Author

Manual backport -> #60153

jorisvandenbossche added a commit that referenced this pull request Oct 31, 2024
…) (#60153)

CI: remove usage of legacy NPY_PROMOTION_STATE (#60144)

(cherry picked from commit 4bbb3ce)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI Continuous Integration
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants