MAINT: fix a few issues with CPython main/3.13.0a1 #24969
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
3a73e13 to
5e562ab
Compare
seberg
reviewed
Oct 20, 2023
| @@ -168,6 +168,9 @@ | |||
| #define npy_ftell ftell | |||
| #endif | |||
| #include <sys/types.h> | |||
| #ifndef _WIN32 | |||
| #include <unistd.h> | |||
| #endif | |||
There was a problem hiding this comment.
Interesting, seems like the windows <io.h> equivalence is still in python, I guess. (or maybe I misunderstand).
Anyway, LGTM, thanks. If something is odd on _WIN32 here we would notice it anyway.
There was a problem hiding this comment.
CI failed for 32-bit Python on Windows. I checked in a few other libraries like zlib and blosc, and they all protect this include like that, so it should be fine.
There was a problem hiding this comment.
Right, was just waiting for CI, thanks. It seems to me that lseek on windows may need <io.h> but Python probably still has that.
There was a problem hiding this comment.
Guess we'll find out if and when they clean it up:)
charris
added a commit
that referenced
this pull request
Nov 6, 2023
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
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.
Follows up on #24318 (comment). As noted there,
numpystill doesn't build, because Cython currently doesn't work with CPython main. But thelseekissue seems like a valid fix anyway (EDIT: due to python/cpython#108783), and the Meson fix can't hurt.