Skip to content
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

REV: Revert pull request #20464 from charris/backport-20354 #21318

Merged
merged 1 commit into from
Apr 11, 2022

Conversation

charris
Copy link
Member

@charris charris commented Apr 10, 2022

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.

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.
@charris charris added the 34 - Reversion Reversion of previous commit or merge label Apr 10, 2022
@charris charris added this to the 1.21.6 release milestone Apr 10, 2022
@charris charris merged commit 68ff2d3 into numpy:maintenance/1.21.x Apr 11, 2022
@charris charris deleted the revert-20354 branch April 11, 2022 00:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
34 - Reversion Reversion of previous commit or merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant