Skip to content

1.7.x fix: revert patches #463

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

Merged
merged 2 commits into from
Sep 30, 2012
Merged

1.7.x fix: revert patches #463

merged 2 commits into from
Sep 30, 2012

Conversation

certik
Copy link
Contributor

@certik certik commented Sep 29, 2012

This is removing Stefan's patches. Please do not merge. I still need to make sure that all tests pass and that this is what we want.

@certik
Copy link
Contributor Author

certik commented Sep 29, 2012

@stefanv, @njsmith, do we need to keep the "Retain backward compatibility. Enforce C order." patch, or should we remove that one as well? This PR removes it, but maybe we should keep that one.

@stefanv
Copy link
Contributor

stefanv commented Sep 29, 2012

The one builds on top of the other, so I don't think you can keep it.

@njsmith
Copy link
Member

njsmith commented Sep 30, 2012

I'm pretty sure that patch is purely an adjustment to the code that's added by the "Improve ndindex execution speed" patch. They should be treated together like they were a single patch I think.

@certik
Copy link
Contributor Author

certik commented Sep 30, 2012

Ok, cool. So I am removing both of them. Merging.

certik added a commit that referenced this pull request Sep 30, 2012
1.7.x fix: revert patches
@certik certik merged commit 7ae2fb0 into numpy:maintenance/1.7.x Sep 30, 2012
@certik certik mentioned this pull request Dec 16, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants