BLD: update vendored Meson to 1.5.2 #27550
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
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.
6bf5717to6d81623Compare6d81623tofac2fa0CompareIs this based off current main? The macos failure might go away with a rebase.
Uh oh!
There was an error while loading. Please reload this page.
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.
BLD: update vendored Meson to 1.5.24e91d9bfac2fa0to57f5662CompareUgh, the macOS failure is a flake that just happened to also touch on
icc. It shows up on gh-27544 from 3 days ago as well, and also on several other issues from years ago (e.g., gh-17635). None of the other issues have an explanation.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
sys.modulesin parallel with this one?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
setuptoolsversion" is quite plausible.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.
pythonto 3.12 in environment.yml #27555Did 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.
BLD: update vendored Meson to include a fix for AIX467dfc457f5662to467dfc4CompareOkay, this is finally ready now. I updated the PR description with what it adds/fixes. Should be back-portable for 2.1.3.
45ae70dinto numpy:mainUh oh!
There was an error while loading. Please reload this page.
Thanks Ralf.