REV: Revert pull request #20464 from charris/backport-20354#21318
Merged
charris merged 1 commit intonumpy:maintenance/1.21.xfrom Apr 11, 2022
Merged
REV: Revert pull request #20464 from charris/backport-20354#21318charris merged 1 commit intonumpy:maintenance/1.21.xfrom
charris merged 1 commit intonumpy:maintenance/1.21.xfrom
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
1 participant
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.
This reverts commit 1d1f044, reversing changes made to 157ee4f.
The backport was in error, as there is no C++ in NumPy 1.21.x. The
change caused problems with the manylinux1 compiler, which is not
C++11 compatible.
The circleci build is broken for reasons I'm not going to track down. The 1.21.6 release is to provide a 32 bit Python 3.10 wheel for Windows, and also provides an opportunity to fix the mistaken backport of some C++ into the 1.21.5 release. The documentation can live on in the main branch.