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

MAINT: Update meson build infrastructure. #25049

Merged
merged 4 commits into from Nov 6, 2023

Conversation

charris
Copy link
Member

@charris charris commented Nov 1, 2023

Backport #24969, #24979, #24968, #25068.

@charris charris added this to the 1.26.2 release milestone Nov 1, 2023
@charris
Copy link
Member Author

charris commented Nov 1, 2023

I'm doing multiple backports one PR at a time. Still a work in progress.

Copy link
Member

@rgommers rgommers left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This LGTM, thanks Chuck!

@rgommers
Copy link
Member

rgommers commented Nov 2, 2023

I'm doing multiple backports one PR at a time. Still a work in progress.

Not sure if that means that you want to add more commits here, so I'll hold off on merging this.

@charris
Copy link
Member Author

charris commented Nov 2, 2023

want to add more commits here

Yes, I want to isolate any problems the turn up.

@charris charris merged commit df93b11 into numpy:maintenance/1.26.x Nov 6, 2023
49 checks passed
@charris charris deleted the backport-24969-24979 branch November 6, 2023 19:23
charris added a commit to charris/numpy that referenced this pull request Nov 11, 2023
Backports of numpy#24969, numpy#24979, numpy#24968, numpy#25068.

* apply 24969.diff

* apply 24979.diff

* apply 24968.diff

* TST: skip flaky test in test_histogram

---------

Co-authored-by: mattip <matti.picus@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants