8000 1.10 deprecated removal by charris · Pull Request #5990 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

1.10 deprecated removal #5990

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.

Sign up for GitHub

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
charris merged 9 commits into from
Jun 21, 2015
Merged

1.10 deprecated removal #5990

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5b8ec89
DEP,MAINT: Remove deprecated functions from npy_3kcompat.h
charris Jun 19, 2015
f686192
DEP,MAINT: Raise IndexError if axis != 0 when concatenating 1-D arrays.
charris Jun 19, 2015
505b0f4
MAINT: Mark deprecation warning with a date and Numpy version.
charris Jun 20, 2015
81788b4
BUG: Fix wrong deprecation message for logical unary '-' operator.
charris Jun 21, 2015
16f1622
DEP,MAINT: Remove deprecated splitcmdline.
charris Jun 20, 2015
3ed8030
DEP,MAINT: Remove try_run and get_output.
charris Jun 20, 2015
e1693d4
DEP,MAINT: Remove support for a._format array printing.
charris Jun 20, 2015
e22ae74
MAINT: Rearrange 1.10-notes a bit.
charris Jun 20, 2015
a27f560
DEP: Add notes to some deprecations.
charris Jun 20, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
BUG: Fix wrong deprecation message for logical unary '-' operator.
  • Loading branch information
@charris
charris committed Jun 21, 2015
commit 81788b45e383d2f6494cf3daadbd7fb6bfc550b1
10 changes: 5 additions & 5 deletions numpy/core/src/umath/ufunc_type_resolution.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,9 +385,9 @@ PyUFunc_NegativeTypeResolver(PyUFuncObject *ufunc,
/* The type resolver would have upcast already */
if (out_dtypes[0]->type_num == NPY_BOOL) {
/* 2013-12-05, 1.9 */
if (DEPRECATE("numpy boolean negative (the unary `-` operator) is "
"deprecated, use the bitwise_xor (the `^` operator) "
"or the logical_xor function instead.") < 0) {
if (DEPRECATE("numpy boolean negative, the `-` operator, is "
"deprecated, use the `~` operator or the logical_not "
"function instead.") < 0) {
return -1;
}
}
Expand Down Expand Up @@ -801,8 +801,8 @@ PyUFunc_SubtractionTypeResolver(PyUFuncObject *ufunc,
/* The type resolver would have upcast already */
if (out_dtypes[0]->type_num == NPY_BOOL) {
/* 2013-12-05, 1.9 */
if (DEPRECATE("numpy boolean subtract (the binary `-` operator) is "
"deprecated, use the bitwise_xor (the `^` operator) "
if (DEPRECATE("numpy boolean subtract, the `-` operator, is "
"deprecated, use the bitwise_xor, the `^` operator, "
"or the logical_xor function instead.") < 0) {
return -1;
}
Expand Down
30 changes: 22 additions & 8 deletions numpy/core/tests/test_deprecations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,15 +345,32 @@ def test_basic(self):
assert_raises(IndexError, a.__getitem__, ((Ellipsis, ) * 3,))


class TestBooleanSubtractDeprecations(_DeprecationTestCase):
"""Test deprecation of boolean `-`. While + and * are well
defined, - is not and even a corrected form seems to have
class TestBooleanUnaryMinusDeprecation(_DeprecationTestCase):
"""Test deprecation of unary boolean `-`. While + and * are well
defined, unary - is not and even a corrected form seems to have
no real uses.

The deprecation process was started in NumPy 1.9.
"""
message = r"numpy boolean .* \(the .* `-` operator\) is deprecated, " \
"use the bitwise"
message = r"numpy boolean negative, the `-` operator, .*"

def test_unary_minus_operator_deprecation(self):
array = np.array([True])
generic = np.bool_(True)

# Unary minus/negative ufunc:
self.assert_deprecated(operator.neg, args=(array,))
self.assert_deprecated(operator.neg, args=(generic,))


class TestBooleanBinaryMinusDeprecation(_DeprecationTestCase):
"""Test deprecation of binary boolean `-`. While + and * are well
defined, binary - is not and even a corrected form seems to have
no real uses.

The deprecation process was started in NumPy 1.9.
"""
message = r"numpy boolean subtract, the `-` operator, .*"

def test_operator_deprecation(self):
array = np.array([True])
Expand All @@ -363,9 +380,6 @@ def test_operator_deprecation(self):
self.assert_deprecated(operator.sub, args=(array, array))
self.assert_deprecated(operator.sub, args=(generic, generic))

# Unary minus/negative ufunc:
self.assert_deprecated(operator.neg, args=(array,))
self.assert_deprecated(operator.neg, args=(generic,))


class TestRankDeprecation(_DeprecationTestCase):
Expand Down
0