Skip to content

MAINT: Update meson build infrastructure. - #25049

Merged
charris merged 4 commits into
numpy:maintenance/1.26.xfrom
charris:backport-24969-24979
Nov 6, 2023
Merged

charris merged 4 commits into
numpy:maintenance/1.26.xfrom
charris:backport-24969-24979

Conversation

@charris

@charris charris commented Nov 1, 2023

Copy link
Copy Markdown
Member

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

@charris charris added this to the 1.26.2 release milestone Nov 1, 2023
@charris

charris commented Nov 1, 2023

Copy link
Copy Markdown
Member Author

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

@rgommers rgommers left a comment

Copy link
Copy Markdown
Member

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

rgommers commented Nov 2, 2023

Copy link
Copy Markdown
Member

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

charris commented Nov 2, 2023

Copy link
Copy Markdown
Member Author

want to add more commits here

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

@charris
charris force-pushed the backport-24969-24979 branch from 847c32b to de58f45 Compare November 6, 2023 16:15
@charris
charris merged commit df93b11 into numpy:maintenance/1.26.x Nov 6, 2023
@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>
@TimotheusBachinger TimotheusBachinger mentioned this pull request Nov 25, 2024
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.

3 participants