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

Temporarily disable __numpy_ufunc__ #7147

Merged
merged 2 commits into from Jan 31, 2016
Merged

Conversation

njsmith
Copy link
Member

@njsmith njsmith commented Jan 30, 2016

Given that we accidentally released 1.11b2 with __numpy_ufunc__ still
enabled, we should probably just disable it in master for now.

When ready to re-enable, grep for NUMPY_UFUNC_DISABLED. Or just revert
bac094c.

Note that this pull request also contains an additional commit that
removes a duplicate test -- that doesn't need reverting.

Needs backport to 1.11 branch.

There are two identical copies of test_dot_override in
test_multiarray.py. This seems surplus to requirements.
Given that we accidentally released 1.11b2 with `__numpy_ufunc__` still
enabled, we should probably just disable it in master for now.

When ready to re-enable, grep for NUMPY_UFUNC_DISABLED. Or just revert
this commit.
@njsmith njsmith added this to the 1.11.0 release milestone Jan 30, 2016
@@ -4615,24 +4633,6 @@ def test_dot_scalar_and_matrix_of_objects(self):
assert_equal(np.dot(arr, 3), desired)
assert_equal(np.dot(3, arr), desired)

def test_dot_override(self):
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Out of curiosity, where is the duplicate of this?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

charris added a commit that referenced this pull request Jan 31, 2016
Temporarily disable __numpy_ufunc__
@charris charris merged commit d077cf5 into numpy:master Jan 31, 2016
@charris
Copy link
Member

charris commented Jan 31, 2016

Thanks Nathaniel.

@charris charris removed this from the 1.11.0 release milestone Jan 31, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants