-
-
Notifications
You must be signed in to change notification settings - Fork 11k
BLD: update vendored Meson to 1.5.2 #27550
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
Conversation
The only CI failures are unrelated (due to gh-27548). The BLAS detection in those two failing jobs worked fine, so this looks about ready. Will add another fix and retest. |
Tagged this for backport, I will be making at least one more 2.1 release. |
6bf5717
to
6d81623
Compare
6d81623
to
fac2fa0
Compare
Is this based off current main? The macos failure might go away with a rebase. |
Yeah it's up-to-date, only a few commits behind. The macOS conda-forge failure is coming in with the AIX linker change in the vendored Meson it looked like, the job is passing on the first commit in this PR EDIT: looks like it was flaky - it's failing again. Still puzzled by it though, not sure what's going on there. I'll drop the change for now - the primary goal here is to update to Meson 1.5.x and get free-threading on Windows going. |
fac2fa0
to
57f5662
Compare
I see the test run is using xdist with two workers. Is there something in the test that is not thread safe? Maybe some other test is importing and changing |
The failures are in numpy.distutils which is deprecated. Can we avoid testing whether any of its API has changed? |
The reason I ask is that it was common until a cache update. See #27532. |
Hmm, not impossible, although I think my initial PR included that fix already (it was anchored on a commit only 2 days old). That said, your "wrong
An easy way to do that would be to bump this CI job to use Python 3.12 (assuming nothing else is broken there). I'll check that. |
Did you mean to change this? numpy/.github/workflows/macos.yml Line 28 in 855bed7
|
Note that the problems seemed to start with a new release of 3.11. |
Yes indeed. Done in gh-27555. |
Will be included upstream in Meson 1.6.0; cherry-picked in numpy/meson#17.
57f5662
to
467dfc4
Compare
Okay, this is finally ready now. I updated the PR description with what it adds/fixes. Should be back-portable for 2.1.3. |
Thanks Ralf. |
Uh oh!
There was an error while loading. Please reload this page.