summaryrefslogtreecommitdiff
path: root/numpy/core
diff options
context:
space:
mode:
Diffstat (limited to 'numpy/core')
-rw-r--r--numpy/core/arrayprint.py69
-rw-r--r--numpy/core/fromnumeric.py1
-rw-r--r--numpy/core/include/numpy/npy_3kcompat.h45
-rw-r--r--numpy/core/numeric.py3
-rw-r--r--numpy/core/src/multiarray/arrayobject.c9
-rw-r--r--numpy/core/src/multiarray/conversion_utils.c4
-rw-r--r--numpy/core/src/multiarray/ctors.c2
-rw-r--r--numpy/core/src/multiarray/descriptor.c2
-rw-r--r--numpy/core/src/multiarray/item_selection.c1
-rw-r--r--numpy/core/src/multiarray/mapping.c8
-rw-r--r--numpy/core/src/multiarray/multiarraymodule.c12
-rw-r--r--numpy/core/src/multiarray/nditer_constr.c1
-rw-r--r--numpy/core/src/multiarray/number.c1
-rw-r--r--numpy/core/src/umath/loops.c.src3
-rw-r--r--numpy/core/src/umath/ufunc_type_resolution.c12
-rw-r--r--numpy/core/tests/test_deprecations.py30
-rw-r--r--numpy/core/tests/test_shape_base.py174
17 files changed, 182 insertions, 195 deletions
diff --git a/numpy/core/arrayprint.py b/numpy/core/arrayprint.py
index 2dc56928c..4a9765639 100644
--- a/numpy/core/arrayprint.py
+++ b/numpy/core/arrayprint.py
@@ -286,38 +286,31 @@ def _array2string(a, max_line_width, precision, suppress_small, separator=' ',
if key in fkeys:
formatdict[key] = formatter[key]
- try:
- format_function = a._format
- msg = "The `_format` attribute is deprecated in Numpy 2.0 and " \
- "will be removed in 2.1. Use the `formatter` kw instead."
- import warnings
- warnings.warn(msg, DeprecationWarning)
- except AttributeError:
- # find the right formatting function for the array
- dtypeobj = a.dtype.type
- if issubclass(dtypeobj, _nt.bool_):
- format_function = formatdict['bool']
- elif issubclass(dtypeobj, _nt.integer):
- if issubclass(dtypeobj, _nt.timedelta64):
- format_function = formatdict['timedelta']
- else:
- format_function = formatdict['int']
- elif issubclass(dtypeobj, _nt.floating):
- if issubclass(dtypeobj, _nt.longfloat):
- format_function = formatdict['longfloat']
- else:
- format_function = formatdict['float']
- elif issubclass(dtypeobj, _nt.complexfloating):
- if issubclass(dtypeobj, _nt.clongfloat):
- format_function = formatdict['longcomplexfloat']
- else:
- format_function = formatdict['complexfloat']
- elif issubclass(dtypeobj, (_nt.unicode_, _nt.string_)):
- format_function = formatdict['numpystr']
- elif issubclass(dtypeobj, _nt.datetime64):
- format_function = formatdict['datetime']
+ # find the right formatting function for the array
+ dtypeobj = a.dtype.type
+ if issubclass(dtypeobj, _nt.bool_):
+ format_function = formatdict['bool']
+ elif issubclass(dtypeobj, _nt.integer):
+ if issubclass(dtypeobj, _nt.timedelta64):
+ format_function = formatdict['timedelta']
+ else:
+ format_function = formatdict['int']
+ elif issubclass(dtypeobj, _nt.floating):
+ if issubclass(dtypeobj, _nt.longfloat):
+ format_function = formatdict['longfloat']
else:
- format_function = formatdict['numpystr']
+ format_function = formatdict['float']
+ elif issubclass(dtypeobj, _nt.complexfloating):
+ if issubclass(dtypeobj, _nt.clongfloat):
+ format_function = formatdict['longcomplexfloat']
+ else:
+ format_function = formatdict['complexfloat']
+ elif issubclass(dtypeobj, (_nt.unicode_, _nt.string_)):
+ format_function = formatdict['numpystr']
+ elif issubclass(dtypeobj, _nt.datetime64):
+ format_function = formatdict['datetime']
+ else:
+ format_function = formatdict['numpystr']
# skip over "["
next_line_prefix = " "
@@ -440,17 +433,9 @@ def array2string(a, max_line_width=None, precision=None,
if a.shape == ():
x = a.item()
- try:
- lst = a._format(x)
- msg = "The `_format` attribute is deprecated in Numpy " \
- "2.0 and will be removed in 2.1. Use the " \
- "`formatter` kw instead."
- import warnings
- warnings.warn(msg, DeprecationWarning)
- except AttributeError:
- if isinstance(x, tuple):
- x = _convert_arrays(x)
- lst = style(x)
+ if isinstance(x, tuple):
+ x = _convert_arrays(x)
+ lst = style(x)
elif reduce(product, a.shape) == 0:
# treat as a null array if any of shape elements == 0
lst = "[]"
diff --git a/numpy/core/fromnumeric.py b/numpy/core/fromnumeric.py
index 3741d821d..5f96b1d61 100644
--- a/numpy/core/fromnumeric.py
+++ b/numpy/core/fromnumeric.py
@@ -2624,6 +2624,7 @@ def rank(a):
0
"""
+ # 2014-04-12, 1.9
warnings.warn(
"`rank` is deprecated; use the `ndim` attribute or function instead. "
"To find the rank of a matrix see `numpy.linalg.matrix_rank`.",
diff --git a/numpy/core/include/numpy/npy_3kcompat.h b/numpy/core/include/numpy/npy_3kcompat.h
index ef5b5694c..72ddaf66b 100644
--- a/numpy/core/include/numpy/npy_3kcompat.h
+++ b/numpy/core/include/numpy/npy_3kcompat.h
@@ -272,35 +272,8 @@ npy_PyFile_Check(PyObject *file)
return 1;
}
-/*
- * DEPRECATED DO NOT USE
- * use npy_PyFile_DupClose2 instead
- * this function will mess ups python3 internal file object buffering
- * Close the dup-ed file handle, and seek the Python one to the current position
- */
-static NPY_INLINE int
-npy_PyFile_DupClose(PyObject *file, FILE* handle)
-{
- PyObject *ret;
- Py_ssize_t position;
- position = npy_ftell(handle);
- fclose(handle);
-
- ret = PyObject_CallMethod(file, "seek", NPY_SSIZE_T_PYFMT "i", position, 0);
- if (ret == NULL) {
- return -1;
- }
- Py_DECREF(ret);
- return 0;
-}
-
-
#else
-/* DEPRECATED, DO NOT USE */
-#define npy_PyFile_DupClose(f, h) npy_PyFile_DupClose2((f), (h), 0)
-
-/* use these */
static NPY_INLINE FILE *
npy_PyFile_Dup2(PyObject *file,
const char *NPY_UNUSED(mode), npy_off_t *NPY_UNUSED(orig_pos))
@@ -319,24 +292,6 @@ npy_PyFile_DupClose2(PyObject *NPY_UNUSED(file), FILE* NPY_UNUSED(handle),
#endif
-/*
- * DEPRECATED, DO NOT USE
- * Use npy_PyFile_Dup2 instead.
- * This function will mess up python3 internal file object buffering.
- * Get a FILE* handle to the file represented by the Python object.
- */
-static NPY_INLINE FILE*
-npy_PyFile_Dup(PyObject *file, char *mode)
-{
- npy_off_t orig;
- if (DEPRECATE("npy_PyFile_Dup is deprecated, use "
- "npy_PyFile_Dup2") < 0) {
- return NULL;
- }
-
- return npy_PyFile_Dup2(file, mode, &orig);
-}
-
static NPY_INLINE PyObject*
npy_PyFile_OpenFile(PyObject *filename, const char *mode)
{
diff --git a/numpy/core/numeric.py b/numpy/core/numeric.py
index bf22f6954..24d92f16f 100644
--- a/numpy/core/numeric.py
+++ b/numpy/core/numeric.py
@@ -900,6 +900,7 @@ def correlate(a, v, mode='valid', old_behavior=False):
# the old behavior should be made available under a different name, see thread
# http://thread.gmane.org/gmane.comp.python.numeric.general/12609/focus=12630
if old_behavior:
+ # 2009-07-18 Cannot remove without replacement function.
warnings.warn("""
The old behavior of correlate was deprecated for 1.4.0, and will be completely removed
for NumPy 2.0.
@@ -1114,6 +1115,7 @@ def alterdot():
restoredot : `restoredot` undoes the effects of `alterdot`.
"""
+ # 2014-08-13, 1.10
warnings.warn("alterdot no longer does anything.", DeprecationWarning)
@@ -1137,6 +1139,7 @@ def restoredot():
alterdot : `restoredot` undoes the effects of `alterdot`.
"""
+ # 2014-08-13, 1.10
warnings.warn("restoredot no longer does anything.", DeprecationWarning)
diff --git a/numpy/core/src/multiarray/arrayobject.c b/numpy/core/src/multiarray/arrayobject.c
index e7db43c06..42c83b625 100644
--- a/numpy/core/src/multiarray/arrayobject.c
+++ b/numpy/core/src/multiarray/arrayobject.c
@@ -738,6 +738,7 @@ array_might_be_written(PyArrayObject *obj)
"The quick fix is to make an explicit copy (e.g., do\n"
"arr.diagonal().copy() or arr[['f0','f1']].copy()).";
if (PyArray_FLAGS(obj) & NPY_ARRAY_WARN_ON_WRITE) {
+ /* 2012-07-17, 1.7 */
if (DEPRECATE_FUTUREWARNING(msg) < 0) {
return -1;
}
@@ -1345,6 +1346,7 @@ array_richcompare(PyArrayObject *self, PyObject *other, int cmp_op)
break;
case Py_EQ:
if (other == Py_None) {
+ /* 2013-07-25, 1.7 */
if (DEPRECATE_FUTUREWARNING("comparison to `None` will result in "
"an elementwise object comparison in the future.") < 0) {
return NULL;
@@ -1368,6 +1370,7 @@ array_richcompare(PyArrayObject *self, PyObject *other, int cmp_op)
* this way.
*/
if (array_other == NULL) {
+ /* 2015-05-07, 1.10 */
PyErr_Clear();
if (DEPRECATE(
"elementwise == comparison failed and returning scalar "
@@ -1382,6 +1385,7 @@ array_richcompare(PyArrayObject *self, PyObject *other, int cmp_op)
PyArray_DESCR(array_other),
NPY_EQUIV_CASTING);
if (_res == 0) {
+ /* 2015-05-07, 1.10 */
Py_DECREF(array_other);
if (DEPRECATE_FUTUREWARNING(
"elementwise == comparison failed and returning scalar "
@@ -1417,6 +1421,7 @@ array_richcompare(PyArrayObject *self, PyObject *other, int cmp_op)
* Comparisons should raise errors when element-wise comparison
* is not possible.
*/
+ /* 2015-05-14, 1.10 */
PyErr_Clear();
if (DEPRECATE("elementwise == comparison failed; "
"this will raise an error in the future.") < 0) {
@@ -1429,6 +1434,7 @@ array_richcompare(PyArrayObject *self, PyObject *other, int cmp_op)
break;
case Py_NE:
if (other == Py_None) {
+ /* 2013-07-25, 1.8 */
if (DEPRECATE_FUTUREWARNING("comparison to `None` will result in "
"an elementwise object comparison in the future.") < 0) {
return NULL;
@@ -1452,6 +1458,7 @@ array_richcompare(PyArrayObject *self, PyObject *other, int cmp_op)
* this way.
*/
if (array_other == NULL) {
+ /* 2015-05-07, 1.10 */
PyErr_Clear();
if (DEPRECATE(
"elementwise != comparison failed and returning scalar "
@@ -1466,6 +1473,7 @@ array_richcompare(PyArrayObject *self, PyObject *other, int cmp_op)
PyArray_DESCR(array_other),
NPY_EQUIV_CASTING);
if (_res == 0) {
+ /* 2015-05-07, 1.10 */
Py_DECREF(array_other);
if (DEPRECATE_FUTUREWARNING(
"elementwise != comparison failed and returning scalar "
@@ -1495,6 +1503,7 @@ array_richcompare(PyArrayObject *self, PyObject *other, int cmp_op)
* Comparisons should raise errors when element-wise comparison
* is not possible.
*/
+ /* 2015-05-14, 1.10 */
PyErr_Clear();
if (DEPRECATE("elementwise != comparison failed; "
"this will raise an error in the future.") < 0) {
diff --git a/numpy/core/src/multiarray/conversion_utils.c b/numpy/core/src/multiarray/conversion_utils.c
index 95241f36c..52338791f 100644
--- a/numpy/core/src/multiarray/conversion_utils.c
+++ b/numpy/core/src/multiarray/conversion_utils.c
@@ -784,6 +784,7 @@ PyArray_PyIntAsIntp_ErrMsg(PyObject *o, const char * msg)
/* Be a bit stricter and not allow bools, np.bool_ is handled later */
if (PyBool_Check(o)) {
+ /* 2013-04-13, 1.8 */
if (DEPRECATE("using a boolean instead of an integer"
" will result in an error in the future") < 0) {
return -1;
@@ -817,6 +818,7 @@ PyArray_PyIntAsIntp_ErrMsg(PyObject *o, const char * msg)
/* Disallow numpy.bool_. Boolean arrays do not currently support index. */
if (PyArray_IsScalar(o, Bool)) {
+ /* 2013-06-09, 1.8 */
if (DEPRECATE("using a boolean instead of an integer"
" will result in an error in the future") < 0) {
return -1;
@@ -884,6 +886,7 @@ PyArray_PyIntAsIntp_ErrMsg(PyObject *o, const char * msg)
}
/* Give a deprecation warning, unless there was already an error */
if (!error_converting(long_value)) {
+ /* 2013-04-13, 1.8 */
if (DEPRECATE("using a non-integer number instead of an integer"
" will result in an error in the future") < 0) {
return -1;
@@ -1139,6 +1142,7 @@ PyArray_TypestrConvert(int itemsize, int gentype)
if (itemsize == 4 || itemsize == 8) {
int ret = 0;
if (evil_global_disable_warn_O4O8_flag) {
+ /* 2012-02-04, 1.7, not sure when this can be removed */
ret = DEPRECATE("DType strings 'O4' and 'O8' are "
"deprecated because they are platform "
"specific. Use 'O' instead");
diff --git a/numpy/core/src/multiarray/ctors.c b/numpy/core/src/multiarray/ctors.c
index 70161bf74..1eca908f5 100644
--- a/numpy/core/src/multiarray/ctors.c
+++ b/numpy/core/src/multiarray/ctors.c
@@ -2452,6 +2452,7 @@ PyArray_FromDimsAndDataAndDescr(int nd, int *d,
char msg[] = "PyArray_FromDimsAndDataAndDescr: use PyArray_NewFromDescr.";
if (DEPRECATE(msg) < 0) {
+ /* 2009-04-30, 1.5 */
return NULL;
}
if (!PyArray_ISNBO(descr->byteorder))
@@ -2476,6 +2477,7 @@ PyArray_FromDims(int nd, int *d, int type)
char msg[] = "PyArray_FromDims: use PyArray_SimpleNew.";
if (DEPRECATE(msg) < 0) {
+ /* 2009-04-30, 1.5 */
return NULL;
}
ret = (PyArrayObject *)PyArray_FromDimsAndDataAndDescr(nd, d,
diff --git a/numpy/core/src/multiarray/descriptor.c b/numpy/core/src/multiarray/descriptor.c
index 13e172a0e..d02590185 100644
--- a/numpy/core/src/multiarray/descriptor.c
+++ b/numpy/core/src/multiarray/descriptor.c
@@ -1975,6 +1975,8 @@ arraydescr_names_set(PyArray_Descr *self, PyObject *val)
}
/*
+ * FIXME
+ *
* This deprecation has been temporarily removed for the NumPy 1.7
* release. It should be re-added after the 1.7 branch is done,
* and a convenience API to replace the typical use-cases for
diff --git a/numpy/core/src/multiarray/item_selection.c b/numpy/core/src/multiarray/item_selection.c
index 00639a19c..0e03b4371 100644
--- a/numpy/core/src/multiarray/item_selection.c
+++ b/numpy/core/src/multiarray/item_selection.c
@@ -1157,6 +1157,7 @@ partition_prep_kth_array(PyArrayObject * ktharray,
npy_intp nkth, i;
if (!PyArray_CanCastSafely(PyArray_TYPE(ktharray), NPY_INTP)) {
+ /* 2013-05-18, 1.8 */
if (DEPRECATE("Calling partition with a non integer index"
" will result in an error in the future") < 0) {
return NULL;
diff --git a/numpy/core/src/multiarray/mapping.c b/numpy/core/src/multiarray/mapping.c
index 30336a12b..f265e6b39 100644
--- a/numpy/core/src/multiarray/mapping.c
+++ b/numpy/core/src/multiarray/mapping.c
@@ -292,6 +292,7 @@ prepare_index(PyArrayObject *self, PyObject *index,
* replaced with a slice.
*/
if (index_type & HAS_ELLIPSIS) {
+ /* 2013-04-14, 1.8 */
if (DEPRECATE(
"an index can only have a single Ellipsis (`...`); "
"replace all but one with slices (`:`).") < 0) {
@@ -433,6 +434,7 @@ prepare_index(PyArrayObject *self, PyObject *index,
* later just like a normal array.
*/
if (PyArray_ISBOOL(tmp_arr)) {
+ /* 2013-04-14, 1.8 */
if (DEPRECATE_FUTUREWARNING(
"in the future, boolean array-likes will be "
"handled as a boolean array index") < 0) {
@@ -465,6 +467,7 @@ prepare_index(PyArrayObject *self, PyObject *index,
else if (!PyArray_ISINTEGER(tmp_arr)) {
if (PyArray_NDIM(tmp_arr) == 0) {
/* match integer deprecation warning */
+ /* 2013-09-25, 1.8 */
if (DEPRECATE(
"using a non-integer number instead of an "
"integer will result in an error in the "
@@ -480,6 +483,7 @@ prepare_index(PyArrayObject *self, PyObject *index,
}
}
else {
+ /* 2013-09-25, 1.8 */
if (DEPRECATE(
"non integer (and non boolean) array-likes "
"will not be accepted as indices in the "
@@ -1727,10 +1731,11 @@ attempt_1d_fallback(PyArrayObject *self, PyObject *ind, PyObject *op)
if (iter_ass_subscript(self_iter, ind, op) < 0) {
goto fail;
}
-
+
Py_XDECREF((PyObject *)self_iter);
Py_DECREF(err);
+ /* 2014-06-12, 1.9 */
if (DEPRECATE(
"assignment will raise an error in the future, most likely "
"because your index result shape does not match the value array "
@@ -1744,6 +1749,7 @@ attempt_1d_fallback(PyArrayObject *self, PyObject *ind, PyObject *op)
if (!PyErr_ExceptionMatches(err)) {
PyObject *err, *val, *tb;
PyErr_Fetch(&err, &val, &tb);
+ /* 2014-06-12, 1.9 */
DEPRECATE_FUTUREWARNING(
"assignment exception type will change in the future");
PyErr_Restore(err, val, tb);
diff --git a/numpy/core/src/multiarray/multiarraymodule.c b/numpy/core/src/multiarray/multiarraymodule.c
index e03fc7db1..73265c3b6 100644
--- a/numpy/core/src/multiarray/multiarraymodule.c
+++ b/numpy/core/src/multiarray/multiarraymodule.c
@@ -257,6 +257,7 @@ PyArray_As1D(PyObject **op, char **ptr, int *d1, int typecode)
PyArray_Descr *descr;
static const char msg[] = "PyArray_As1D: use PyArray_AsCArray.";
+ /* 2008-07-14, 1.5 */
if (DEPRECATE(msg) < 0) {
return -1;
}
@@ -278,6 +279,7 @@ PyArray_As2D(PyObject **op, char ***ptr, int *d1, int *d2, int typecode)
PyArray_Descr *descr;
static const char msg[] = "PyArray_As1D: use PyArray_AsCArray.";
+ /* 2008-07-14, 1.5 */
if (DEPRECATE(msg) < 0) {
return -1;
}
@@ -347,16 +349,6 @@ PyArray_ConcatenateArrays(int narrays, PyArrayObject **arrays, int axis)
axis += ndim;
}
- if (ndim == 1 && axis != 0) {
- static const char msg[] = "axis != 0 for ndim == 1; "
- "this will raise an error in "
- "future versions of numpy";
- if (DEPRECATE(msg) < 0) {
- return NULL;
- }
- axis = 0;
- }
-
if (axis < 0 || axis >= ndim) {
PyErr_Format(PyExc_IndexError,
"axis %d out of bounds [0, %d)", orig_axis, ndim);
diff --git a/numpy/core/src/multiarray/nditer_constr.c b/numpy/core/src/multiarray/nditer_constr.c
index 636dd6b96..9c5afedf6 100644
--- a/numpy/core/src/multiarray/nditer_constr.c
+++ b/numpy/core/src/multiarray/nditer_constr.c
@@ -168,6 +168,7 @@ NpyIter_AdvancedNew(int nop, PyArrayObject **op_in, npy_uint32 flags,
"deprecated. Use `oa_ndim == -1` or the MultiNew "
"iterator for NumPy <1.8 compatibility";
if (DEPRECATE(mesg) < 0) {
+ /* 2013-02-23, 1.8 */
return NULL;
}
oa_ndim = -1;
diff --git a/numpy/core/src/multiarray/number.c b/numpy/core/src/multiarray/number.c
index 3df7afb79..3e7521582 100644
--- a/numpy/core/src/multiarray/number.c
+++ b/numpy/core/src/multiarray/number.c
@@ -1022,6 +1022,7 @@ array_index(PyArrayObject *v)
return NULL;
}
if (PyArray_NDIM(v) != 0) {
+ /* 2013-04-20, 1.8 */
if (DEPRECATE("converting an array with ndim > 0 to an index"
" will result in an error in the future") < 0) {
return NULL;
diff --git a/numpy/core/src/umath/loops.c.src b/numpy/core/src/umath/loops.c.src
index e10482b06..d0fd0e43b 100644
--- a/numpy/core/src/umath/loops.c.src
+++ b/numpy/core/src/umath/loops.c.src
@@ -2574,6 +2574,7 @@ OBJECT_@kind@(char **args, npy_intp *dimensions, npy_intp *steps, void *NPY_UNUS
if (ret_obj == NULL) {
#if @identity@ != -1
if (in1 == in2) {
+ /* 2014-01-26, 1.9 */
PyErr_Clear();
if (DEPRECATE("numpy @kind@ will not check object identity "
"in the future. The comparison error will "
@@ -2591,6 +2592,7 @@ OBJECT_@kind@(char **args, npy_intp *dimensions, npy_intp *steps, void *NPY_UNUS
if (ret == -1) {
#if @identity@ != -1
if (in1 == in2) {
+ /* 2014-01-26, 1.9 */
PyErr_Clear();
if (DEPRECATE("numpy @kind@ will not check object identity "
"in the future. The error trying to get the "
@@ -2606,6 +2608,7 @@ OBJECT_@kind@(char **args, npy_intp *dimensions, npy_intp *steps, void *NPY_UNUS
}
#if @identity@ != -1
if ((in1 == in2) && ((npy_bool)ret != @identity@)) {
+ /* 2014-01-26, 1.9 */
if (DEPRECATE_FUTUREWARNING(
"numpy @kind@ will not check object identity "
"in the future. The comparison did not return the "
diff --git a/numpy/core/src/umath/ufunc_type_resolution.c b/numpy/core/src/umath/ufunc_type_resolution.c
index 601ffadbf..6f4f4123d 100644
--- a/numpy/core/src/umath/ufunc_type_resolution.c
+++ b/numpy/core/src/umath/ufunc_type_resolution.c
@@ -384,9 +384,10 @@ PyUFunc_NegativeTypeResolver(PyUFuncObject *ufunc,
/* The type resolver would have upcast already */
if (out_dtypes[0]->type_num == NPY_BOOL) {
- if (DEPRECATE("numpy boolean negative (the unary `-` operator) is "
- "deprecated, use the bitwise_xor (the `^` operator) "
- "or the logical_xor function instead.") < 0) {
+ /* 2013-12-05, 1.9 */
+ if (DEPRECATE("numpy boolean negative, the `-` operator, is "
+ "deprecated, use the `~` operator or the logical_not "
+ "function instead.") < 0) {
return -1;
}
}
@@ -799,8 +800,9 @@ PyUFunc_SubtractionTypeResolver(PyUFuncObject *ufunc,
/* The type resolver would have upcast already */
if (out_dtypes[0]->type_num == NPY_BOOL) {
- if (DEPRECATE("numpy boolean subtract (the binary `-` operator) is "
- "deprecated, use the bitwise_xor (the `^` operator) "
+ /* 2013-12-05, 1.9 */
+ if (DEPRECATE("numpy boolean subtract, the `-` operator, is "
+ "deprecated, use the bitwise_xor, the `^` operator, "
"or the logical_xor function instead.") < 0) {
return -1;
}
diff --git a/numpy/core/tests/test_deprecations.py b/numpy/core/tests/test_deprecations.py
index 9641d1f34..d0dbabebb 100644
--- a/numpy/core/tests/test_deprecations.py
+++ b/numpy/core/tests/test_deprecations.py
@@ -345,15 +345,32 @@ class TestMultipleEllipsisDeprecation(_DeprecationTestCase):
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])
@@ -363,9 +380,6 @@ class TestBooleanSubtractDeprecations(_DeprecationTestCase):
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):
diff --git a/numpy/core/tests/test_shape_base.py b/numpy/core/tests/test_shape_base.py
index c387bc616..52001ff37 100644
--- a/numpy/core/tests/test_shape_base.py
+++ b/numpy/core/tests/test_shape_base.py
@@ -173,90 +173,96 @@ class TestVstack(TestCase):
assert_array_equal(res, desired)
-def test_concatenate_axis_None():
- a = np.arange(4, dtype=np.float64).reshape((2, 2))
- b = list(range(3))
- c = ['x']
- r = np.concatenate((a, a), axis=None)
- assert_equal(r.dtype, a.dtype)
- assert_equal(r.ndim, 1)
- r = np.concatenate((a, b), axis=None)
- assert_equal(r.size, a.size + len(b))
- assert_equal(r.dtype, a.dtype)
- r = np.concatenate((a, b, c), axis=None)
- d = array(['0.0', '1.0', '2.0', '3.0',
- '0', '1', '2', 'x'])
- assert_array_equal(r, d)
-
-
-def test_large_concatenate_axis_None():
- # When no axis is given, concatenate uses flattened versions.
- # This also had a bug with many arrays (see gh-5979).
- x = np.arange(1, 100)
- r = np.concatenate(x, None)
- assert_array_equal(x, r)
-
- # This should probably be deprecated:
- r = np.concatenate(x, 100) # axis is >= MAXDIMS
- assert_array_equal(x, r)
-
-
-def test_concatenate():
- # Test concatenate function
- # No arrays raise ValueError
- assert_raises(ValueError, concatenate, ())
- # Scalars cannot be concatenated
- assert_raises(ValueError, concatenate, (0,))
- assert_raises(ValueError, concatenate, (array(0),))
- # One sequence returns unmodified (but as array)
- r4 = list(range(4))
- assert_array_equal(concatenate((r4,)), r4)
- # Any sequence
- assert_array_equal(concatenate((tuple(r4),)), r4)
- assert_array_equal(concatenate((array(r4),)), r4)
- # 1D default concatenation
- r3 = list(range(3))
- assert_array_equal(concatenate((r4, r3)), r4 + r3)
- # Mixed sequence types
- assert_array_equal(concatenate((tuple(r4), r3)), r4 + r3)
- assert_array_equal(concatenate((array(r4), r3)), r4 + r3)
- # Explicit axis specification
- assert_array_equal(concatenate((r4, r3), 0), r4 + r3)
- # Including negative
- assert_array_equal(concatenate((r4, r3), -1), r4 + r3)
- # 2D
- a23 = array([[10, 11, 12], [13, 14, 15]])
- a13 = array([[0, 1, 2]])
- res = array([[10, 11, 12], [13, 14, 15], [0, 1, 2]])
- assert_array_equal(concatenate((a23, a13)), res)
- assert_array_equal(concatenate((a23, a13), 0), res)
- assert_array_equal(concatenate((a23.T, a13.T), 1), res.T)
- assert_array_equal(concatenate((a23.T, a13.T), -1), res.T)
- # Arrays much match shape
- assert_raises(ValueError, concatenate, (a23.T, a13.T), 0)
- # 3D
- res = arange(2 * 3 * 7).reshape((2, 3, 7))
- a0 = res[..., :4]
- a1 = res[..., 4:6]
- a2 = res[..., 6:]
- assert_array_equal(concatenate((a0, a1, a2), 2), res)
- assert_array_equal(concatenate((a0, a1, a2), -1), res)
- assert_array_equal(concatenate((a0.T, a1.T, a2.T), 0), res.T)
-
-
-def test_concatenate_sloppy0():
- # Versions of numpy < 1.7.0 ignored axis argument value for 1D arrays. We
- # allow this for now, but in due course we will raise an error
- r4 = list(range(4))
- r3 = list(range(3))
- assert_array_equal(concatenate((r4, r3), 0), r4 + r3)
- with warnings.catch_warnings():
- warnings.simplefilter('ignore', DeprecationWarning)
- assert_array_equal(concatenate((r4, r3), -10), r4 + r3)
- assert_array_equal(concatenate((r4, r3), 10), r4 + r3)
- # Confirm DeprecationWarning raised
- warnings.simplefilter('error', DeprecationWarning)
- assert_raises(DeprecationWarning, concatenate, (r4, r3), 10)
+class TestConcatenate(TestCase):
+ def test_exceptions(self):
+ # test axis must be in bounds
+ for ndim in [1, 2, 3]:
+ a = np.ones((1,)*ndim)
+ np.concatenate((a, a), axis=0) # OK
+ assert_raises(IndexError, np.concatenate, (a, a), axis=ndim)
+ assert_raises(IndexError, np.concatenate, (a, a), axis=-(ndim + 1))
+
+ # Scalars cannot be concatenated
+ assert_raises(ValueError, concatenate, (0,))
+ assert_raises(ValueError, concatenate, (np.array(0),))
+
+ # test shapes must match except for concatenation axis
+ a = np.ones((1, 2, 3))
+ b = np.ones((2, 2, 3))
+ axis = list(range(3))
+ for i in range(3):
+ np.concatenate((a, b), axis=axis[0]) # OK
+ assert_raises(ValueError, np.concatenate, (a, b), axis=axis[1])
+ assert_raises(ValueError, np.concatenate, (a, b), axis=axis[2])
+ a = np.rollaxis(a, -1)
+ b = np.rollaxis(b, -1)
+ axis.append(axis.pop(0))
+
+ # No arrays to concatenate raises ValueError
+ assert_raises(ValueError, concatenate, ())
+
+ def test_concatenate_axis_None(self):
+ a = np.arange(4, dtype=np.float64).reshape((2, 2))
+ b = list(range(3))
+ c = ['x']
+ r = np.concatenate((a, a), axis=None)
+ assert_equal(r.dtype, a.dtype)
+ assert_equal(r.ndim, 1)
+ r = np.concatenate((a, b), axis=None)
+ assert_equal(r.size, a.size + len(b))
+ assert_equal(r.dtype, a.dtype)
+ r = np.concatenate((a, b, c), axis=None)
+ d = array(['0.0', '1.0', '2.0', '3.0',
+ '0', '1', '2', 'x'])
+ assert_array_equal(r, d)
+
+ def test_large_concatenate_axis_None(self):
+ # When no axis is given, concatenate uses flattened versions.
+ # This also had a bug with many arrays (see gh-5979).
+ x = np.arange(1, 100)
+ r = np.concatenate(x, None)
+ assert_array_equal(x, r)
+
+ # This should probably be deprecated:
+ r = np.concatenate(x, 100) # axis is >= MAXDIMS
+ assert_array_equal(x, r)
+
+ def test_concatenate(self):
+ # Test concatenate function
+ # One sequence returns unmodified (but as array)
+ r4 = list(range(4))
+ assert_array_equal(concatenate((r4,)), r4)
+ # Any sequence
+ assert_array_equal(concatenate((tuple(r4),)), r4)
+ assert_array_equal(concatenate((array(r4),)), r4)
+ # 1D default concatenation
+ r3 = list(range(3))
+ assert_array_equal(concatenate((r4, r3)), r4 + r3)
+ # Mixed sequence types
+ assert_array_equal(concatenate((tuple(r4), r3)), r4 + r3)
+ assert_array_equal(concatenate((array(r4), r3)), r4 + r3)
+ # Explicit axis specification
+ assert_array_equal(concatenate((r4, r3), 0), r4 + r3)
+ # Including negative
+ assert_array_equal(concatenate((r4, r3), -1), r4 + r3)
+ # 2D
+ a23 = array([[10, 11, 12], [13, 14, 15]])
+ a13 = array([[0, 1, 2]])
+ res = array([[10, 11, 12], [13, 14, 15], [0, 1, 2]])
+ assert_array_equal(concatenate((a23, a13)), res)
+ assert_array_equal(concatenate((a23, a13), 0), res)
+ assert_array_equal(concatenate((a23.T, a13.T), 1), res.T)
+ assert_array_equal(concatenate((a23.T, a13.T), -1), res.T)
+ # Arrays much match shape
+ assert_raises(ValueError, concatenate, (a23.T, a13.T), 0)
+ # 3D
+ res = arange(2 * 3 * 7).reshape((2, 3, 7))
+ a0 = res[..., :4]
+ a1 = res[..., 4:6]
+ a2 = res[..., 6:]
+ assert_array_equal(concatenate((a0, a1, a2), 2), res)
+ assert_array_equal(concatenate((a0, a1, a2), -1), res)
+ assert_array_equal(concatenate((a0.T, a1.T, a2.T), 0), res.T)
def test_stack():
View Lorry Controller Status