From e1218cc68ddab6b806628877de19394616df04f7 Mon Sep 17 00:00:00 2001 From: Mark Wiebe Date: Sat, 4 Feb 2012 16:28:28 -0800 Subject: [PATCH] DEP: Update all the '#define NPY_NO_DEPRECATED_API' instances to be versioned --- numpy/core/src/dummymodule.c | 2 +- numpy/core/src/multiarray/array_assign.c | 2 +- numpy/core/src/multiarray/array_assign_array.c | 2 +- numpy/core/src/multiarray/array_assign_scalar.c | 2 +- numpy/core/src/multiarray/arrayobject.c | 2 +- numpy/core/src/multiarray/arraytypes.c.src | 2 +- numpy/core/src/multiarray/boolean_ops.c.src | 2 +- numpy/core/src/multiarray/buffer.c | 2 +- numpy/core/src/multiarray/calculation.c | 2 +- numpy/core/src/multiarray/common.c | 2 +- numpy/core/src/multiarray/conversion_utils.c | 2 +- numpy/core/src/multiarray/convert.c | 2 +- numpy/core/src/multiarray/convert_datatype.c | 2 +- numpy/core/src/multiarray/ctors.c | 2 +- numpy/core/src/multiarray/datetime.c | 2 +- numpy/core/src/multiarray/datetime_busday.c | 2 +- numpy/core/src/multiarray/datetime_busdaycal.c | 2 +- numpy/core/src/multiarray/datetime_strings.c | 2 +- numpy/core/src/multiarray/descriptor.c | 2 +- numpy/core/src/multiarray/dtype_transfer.c | 2 +- numpy/core/src/multiarray/einsum.c.src | 2 +- numpy/core/src/multiarray/flagsobject.c | 2 +- numpy/core/src/multiarray/getset.c | 2 +- numpy/core/src/multiarray/hashdescr.c | 2 +- numpy/core/src/multiarray/item_selection.c | 2 +- numpy/core/src/multiarray/iterators.c | 2 +- numpy/core/src/multiarray/lowlevel_strided_loops.c.src | 2 +- numpy/core/src/multiarray/mapping.c | 2 +- numpy/core/src/multiarray/methods.c | 2 +- numpy/core/src/multiarray/multiarray_tests.c.src | 2 +- numpy/core/src/multiarray/multiarraymodule.c | 2 +- numpy/core/src/multiarray/na_mask.c | 2 +- numpy/core/src/multiarray/na_object.c | 2 +- numpy/core/src/multiarray/nditer_impl.h | 2 +- numpy/core/src/multiarray/nditer_pywrap.c | 2 +- numpy/core/src/multiarray/number.c | 2 +- numpy/core/src/multiarray/numpymemoryview.c | 2 +- numpy/core/src/multiarray/numpyos.c | 2 +- numpy/core/src/multiarray/reduction.c | 2 +- numpy/core/src/multiarray/refcount.c | 2 +- numpy/core/src/multiarray/scalarapi.c | 2 +- numpy/core/src/multiarray/scalartypes.c.src | 2 +- numpy/core/src/multiarray/sequence.c | 2 +- numpy/core/src/multiarray/shape.c | 2 +- numpy/core/src/multiarray/ucsnarrow.c | 2 +- numpy/core/src/multiarray/usertypes.c | 2 +- numpy/core/src/npymath/halffloat.c | 2 +- numpy/core/src/npysort/sort.c.src | 2 +- numpy/core/src/scalarmathmodule.c.src | 2 +- numpy/core/src/umath/loops.c.src | 2 +- numpy/core/src/umath/ufunc_object.c | 2 +- numpy/core/src/umath/ufunc_type_resolution.c | 2 +- numpy/core/src/umath/umathmodule.c | 2 +- numpy/lib/src/_compiled_base.c | 2 +- numpy/numarray/_capi.c | 2 +- 55 files changed, 55 insertions(+), 55 deletions(-) diff --git a/numpy/core/src/dummymodule.c b/numpy/core/src/dummymodule.c index 8aa4f2f511d9..eca6edb54dcf 100644 --- a/numpy/core/src/dummymodule.c +++ b/numpy/core/src/dummymodule.c @@ -6,7 +6,7 @@ * configuration files before the libraries are made. */ -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #include #include diff --git a/numpy/core/src/multiarray/array_assign.c b/numpy/core/src/multiarray/array_assign.c index 896f32ffd468..03f81f21c66f 100644 --- a/numpy/core/src/multiarray/array_assign.c +++ b/numpy/core/src/multiarray/array_assign.c @@ -11,7 +11,7 @@ #define PY_SSIZE_T_CLEAN #include -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #define _MULTIARRAYMODULE #include diff --git a/numpy/core/src/multiarray/array_assign_array.c b/numpy/core/src/multiarray/array_assign_array.c index 82a70c0a48fa..e85a1f596601 100644 --- a/numpy/core/src/multiarray/array_assign_array.c +++ b/numpy/core/src/multiarray/array_assign_array.c @@ -10,7 +10,7 @@ #define PY_SSIZE_T_CLEAN #include -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #define _MULTIARRAYMODULE #include diff --git a/numpy/core/src/multiarray/array_assign_scalar.c b/numpy/core/src/multiarray/array_assign_scalar.c index 2dbad89e47c1..bf0676c96d84 100644 --- a/numpy/core/src/multiarray/array_assign_scalar.c +++ b/numpy/core/src/multiarray/array_assign_scalar.c @@ -10,7 +10,7 @@ #define PY_SSIZE_T_CLEAN #include -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #define _MULTIARRAYMODULE #include diff --git a/numpy/core/src/multiarray/arrayobject.c b/numpy/core/src/multiarray/arrayobject.c index 160fd6d3dfb5..11b04989fd79 100644 --- a/numpy/core/src/multiarray/arrayobject.c +++ b/numpy/core/src/multiarray/arrayobject.c @@ -25,7 +25,7 @@ maintainer email: oliphant.travis@ieee.org #include "structmember.h" /*#include */ -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #define _MULTIARRAYMODULE #include "numpy/arrayobject.h" #include "numpy/arrayscalars.h" diff --git a/numpy/core/src/multiarray/arraytypes.c.src b/numpy/core/src/multiarray/arraytypes.c.src index 27bfd8cff6d7..0e73c9fe70b3 100644 --- a/numpy/core/src/multiarray/arraytypes.c.src +++ b/numpy/core/src/multiarray/arraytypes.c.src @@ -3,7 +3,7 @@ #include "Python.h" #include "structmember.h" -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #define _MULTIARRAYMODULE #include "numpy/arrayobject.h" #include "numpy/arrayscalars.h" diff --git a/numpy/core/src/multiarray/boolean_ops.c.src b/numpy/core/src/multiarray/boolean_ops.c.src index f3d87cc34c48..6e60aac2bb98 100644 --- a/numpy/core/src/multiarray/boolean_ops.c.src +++ b/numpy/core/src/multiarray/boolean_ops.c.src @@ -17,7 +17,7 @@ #define PY_SSIZE_T_CLEAN #include -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #define _MULTIARRAYMODULE #include diff --git a/numpy/core/src/multiarray/buffer.c b/numpy/core/src/multiarray/buffer.c index 7f526b380b97..694207197efb 100644 --- a/numpy/core/src/multiarray/buffer.c +++ b/numpy/core/src/multiarray/buffer.c @@ -2,7 +2,7 @@ #include #include "structmember.h" -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #define _MULTIARRAYMODULE #include "numpy/arrayobject.h" #include "numpy/arrayscalars.h" diff --git a/numpy/core/src/multiarray/calculation.c b/numpy/core/src/multiarray/calculation.c index 2b6697661913..623c70eea155 100644 --- a/numpy/core/src/multiarray/calculation.c +++ b/numpy/core/src/multiarray/calculation.c @@ -2,7 +2,7 @@ #include #include "structmember.h" -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #define _MULTIARRAYMODULE #include "numpy/arrayobject.h" diff --git a/numpy/core/src/multiarray/common.c b/numpy/core/src/multiarray/common.c index 0b608c2ce86c..fb4d411809ff 100644 --- a/numpy/core/src/multiarray/common.c +++ b/numpy/core/src/multiarray/common.c @@ -1,7 +1,7 @@ #define PY_SSIZE_T_CLEAN #include -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #define _MULTIARRAYMODULE #include "numpy/arrayobject.h" diff --git a/numpy/core/src/multiarray/conversion_utils.c b/numpy/core/src/multiarray/conversion_utils.c index 232dacbb4593..b883eefdcbea 100644 --- a/numpy/core/src/multiarray/conversion_utils.c +++ b/numpy/core/src/multiarray/conversion_utils.c @@ -2,7 +2,7 @@ #include #include "structmember.h" -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #define _MULTIARRAYMODULE #include "numpy/arrayobject.h" #include "numpy/arrayscalars.h" diff --git a/numpy/core/src/multiarray/convert.c b/numpy/core/src/multiarray/convert.c index 07b052653582..4b698f6e5208 100644 --- a/numpy/core/src/multiarray/convert.c +++ b/numpy/core/src/multiarray/convert.c @@ -2,7 +2,7 @@ #include #include "structmember.h" -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #define _MULTIARRAYMODULE #include "numpy/arrayobject.h" #include "numpy/arrayscalars.h" diff --git a/numpy/core/src/multiarray/convert_datatype.c b/numpy/core/src/multiarray/convert_datatype.c index 708814e5b072..aa834c4cf1ee 100644 --- a/numpy/core/src/multiarray/convert_datatype.c +++ b/numpy/core/src/multiarray/convert_datatype.c @@ -2,7 +2,7 @@ #include #include "structmember.h" -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #define _MULTIARRAYMODULE #include "numpy/arrayobject.h" #include "numpy/arrayscalars.h" diff --git a/numpy/core/src/multiarray/ctors.c b/numpy/core/src/multiarray/ctors.c index ebc916feb1d9..c8548f894054 100644 --- a/numpy/core/src/multiarray/ctors.c +++ b/numpy/core/src/multiarray/ctors.c @@ -2,7 +2,7 @@ #include #include "structmember.h" -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #define _MULTIARRAYMODULE #include "numpy/arrayobject.h" #include "numpy/arrayscalars.h" diff --git a/numpy/core/src/multiarray/datetime.c b/numpy/core/src/multiarray/datetime.c index 8f6403e348a8..08cbb9e04153 100644 --- a/numpy/core/src/multiarray/datetime.c +++ b/numpy/core/src/multiarray/datetime.c @@ -13,7 +13,7 @@ #include -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #define _MULTIARRAYMODULE #include diff --git a/numpy/core/src/multiarray/datetime_busday.c b/numpy/core/src/multiarray/datetime_busday.c index 5a0078b76d04..aa38594cb318 100644 --- a/numpy/core/src/multiarray/datetime_busday.c +++ b/numpy/core/src/multiarray/datetime_busday.c @@ -10,7 +10,7 @@ #define PY_SSIZE_T_CLEAN #include -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #define _MULTIARRAYMODULE #include diff --git a/numpy/core/src/multiarray/datetime_busdaycal.c b/numpy/core/src/multiarray/datetime_busdaycal.c index ec24b7f5dbb7..b5b74dd14c09 100644 --- a/numpy/core/src/multiarray/datetime_busdaycal.c +++ b/numpy/core/src/multiarray/datetime_busdaycal.c @@ -11,7 +11,7 @@ #define PY_SSIZE_T_CLEAN #include -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #define _MULTIARRAYMODULE #include diff --git a/numpy/core/src/multiarray/datetime_strings.c b/numpy/core/src/multiarray/datetime_strings.c index 00879aedeb06..414c01a397d0 100644 --- a/numpy/core/src/multiarray/datetime_strings.c +++ b/numpy/core/src/multiarray/datetime_strings.c @@ -12,7 +12,7 @@ #include -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #define _MULTIARRAYMODULE #include diff --git a/numpy/core/src/multiarray/descriptor.c b/numpy/core/src/multiarray/descriptor.c index 4e61d5b2652c..724c2eb07890 100644 --- a/numpy/core/src/multiarray/descriptor.c +++ b/numpy/core/src/multiarray/descriptor.c @@ -4,7 +4,7 @@ #include #include "structmember.h" -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #define _MULTIARRAYMODULE #include "numpy/arrayobject.h" #include "numpy/arrayscalars.h" diff --git a/numpy/core/src/multiarray/dtype_transfer.c b/numpy/core/src/multiarray/dtype_transfer.c index 46acd046fc4d..5bb24ad6b2dd 100644 --- a/numpy/core/src/multiarray/dtype_transfer.c +++ b/numpy/core/src/multiarray/dtype_transfer.c @@ -14,7 +14,7 @@ #include "Python.h" #include "structmember.h" -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #define _MULTIARRAYMODULE #include #include diff --git a/numpy/core/src/multiarray/einsum.c.src b/numpy/core/src/multiarray/einsum.c.src index f5c61022ccbb..9910205d483d 100644 --- a/numpy/core/src/multiarray/einsum.c.src +++ b/numpy/core/src/multiarray/einsum.c.src @@ -12,7 +12,7 @@ #include "Python.h" #include "structmember.h" -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #define _MULTIARRAYMODULE #include #include diff --git a/numpy/core/src/multiarray/flagsobject.c b/numpy/core/src/multiarray/flagsobject.c index a633a2ac2364..5bc41b81488b 100644 --- a/numpy/core/src/multiarray/flagsobject.c +++ b/numpy/core/src/multiarray/flagsobject.c @@ -4,7 +4,7 @@ #include #include "structmember.h" -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #define _MULTIARRAYMODULE #include "numpy/arrayobject.h" #include "numpy/arrayscalars.h" diff --git a/numpy/core/src/multiarray/getset.c b/numpy/core/src/multiarray/getset.c index db107ed61893..a414f1f3744b 100644 --- a/numpy/core/src/multiarray/getset.c +++ b/numpy/core/src/multiarray/getset.c @@ -4,7 +4,7 @@ #include #include "structmember.h" -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #define _MULTIARRAYMODULE #include "numpy/arrayobject.h" diff --git a/numpy/core/src/multiarray/hashdescr.c b/numpy/core/src/multiarray/hashdescr.c index 9dd065197416..71bc2adaca8c 100644 --- a/numpy/core/src/multiarray/hashdescr.c +++ b/numpy/core/src/multiarray/hashdescr.c @@ -1,6 +1,6 @@ #define PY_SSIZE_T_CLEAN #include -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #define _MULTIARRAYMODULE #include diff --git a/numpy/core/src/multiarray/item_selection.c b/numpy/core/src/multiarray/item_selection.c index f9b5ff66f708..241afe0b0473 100644 --- a/numpy/core/src/multiarray/item_selection.c +++ b/numpy/core/src/multiarray/item_selection.c @@ -2,7 +2,7 @@ #include #include "structmember.h" -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #define _MULTIARRAYMODULE #include "numpy/arrayobject.h" #include "numpy/arrayscalars.h" diff --git a/numpy/core/src/multiarray/iterators.c b/numpy/core/src/multiarray/iterators.c index 44163a0bdf82..262be6443843 100644 --- a/numpy/core/src/multiarray/iterators.c +++ b/numpy/core/src/multiarray/iterators.c @@ -2,7 +2,7 @@ #include #include "structmember.h" -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #define _MULTIARRAYMODULE #include "numpy/arrayobject.h" #include "numpy/arrayscalars.h" diff --git a/numpy/core/src/multiarray/lowlevel_strided_loops.c.src b/numpy/core/src/multiarray/lowlevel_strided_loops.c.src index 2ba5311165bc..c57e1ccc1d14 100644 --- a/numpy/core/src/multiarray/lowlevel_strided_loops.c.src +++ b/numpy/core/src/multiarray/lowlevel_strided_loops.c.src @@ -12,7 +12,7 @@ #include "Python.h" #include "structmember.h" -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #define _MULTIARRAYMODULE #include #include diff --git a/numpy/core/src/multiarray/mapping.c b/numpy/core/src/multiarray/mapping.c index b25d770fecfe..ec746481c9fc 100644 --- a/numpy/core/src/multiarray/mapping.c +++ b/numpy/core/src/multiarray/mapping.c @@ -3,7 +3,7 @@ #include "structmember.h" /*#include */ -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #define _MULTIARRAYMODULE #include "numpy/arrayobject.h" diff --git a/numpy/core/src/multiarray/methods.c b/numpy/core/src/multiarray/methods.c index ddb1cc052c5f..8129a7021f3a 100644 --- a/numpy/core/src/multiarray/methods.c +++ b/numpy/core/src/multiarray/methods.c @@ -3,7 +3,7 @@ #include #include "structmember.h" -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #define _MULTIARRAYMODULE #include "numpy/arrayobject.h" #include "numpy/arrayscalars.h" diff --git a/numpy/core/src/multiarray/multiarray_tests.c.src b/numpy/core/src/multiarray/multiarray_tests.c.src index 1868c9a07502..15d4c871e60d 100644 --- a/numpy/core/src/multiarray/multiarray_tests.c.src +++ b/numpy/core/src/multiarray/multiarray_tests.c.src @@ -1,4 +1,4 @@ -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #include #include "numpy/arrayobject.h" diff --git a/numpy/core/src/multiarray/multiarraymodule.c b/numpy/core/src/multiarray/multiarraymodule.c index 53a91dc8b93f..6cbdf2eb9b33 100644 --- a/numpy/core/src/multiarray/multiarraymodule.c +++ b/numpy/core/src/multiarray/multiarraymodule.c @@ -18,7 +18,7 @@ #include "Python.h" #include "structmember.h" -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #define _MULTIARRAYMODULE #include "numpy/arrayobject.h" #include "numpy/arrayscalars.h" diff --git a/numpy/core/src/multiarray/na_mask.c b/numpy/core/src/multiarray/na_mask.c index ce3fe3863993..0e0e285b6c71 100644 --- a/numpy/core/src/multiarray/na_mask.c +++ b/numpy/core/src/multiarray/na_mask.c @@ -10,7 +10,7 @@ #define PY_SSIZE_T_CLEAN #include -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #define _MULTIARRAYMODULE #include diff --git a/numpy/core/src/multiarray/na_object.c b/numpy/core/src/multiarray/na_object.c index 45e199fbe65a..01f944df97e7 100644 --- a/numpy/core/src/multiarray/na_object.c +++ b/numpy/core/src/multiarray/na_object.c @@ -10,7 +10,7 @@ #define PY_SSIZE_T_CLEAN #include -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #define _MULTIARRAYMODULE #include #include diff --git a/numpy/core/src/multiarray/nditer_impl.h b/numpy/core/src/multiarray/nditer_impl.h index dc749fc8c2bd..ea02d5cc4edc 100644 --- a/numpy/core/src/multiarray/nditer_impl.h +++ b/numpy/core/src/multiarray/nditer_impl.h @@ -14,7 +14,7 @@ #include "Python.h" #include "structmember.h" -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #define _MULTIARRAYMODULE #include #include diff --git a/numpy/core/src/multiarray/nditer_pywrap.c b/numpy/core/src/multiarray/nditer_pywrap.c index 42d83663300a..a10958965720 100644 --- a/numpy/core/src/multiarray/nditer_pywrap.c +++ b/numpy/core/src/multiarray/nditer_pywrap.c @@ -10,7 +10,7 @@ #include "Python.h" #include "structmember.h" -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #define _MULTIARRAYMODULE #include #include diff --git a/numpy/core/src/multiarray/number.c b/numpy/core/src/multiarray/number.c index 66bc1436849b..cea9e029ff86 100644 --- a/numpy/core/src/multiarray/number.c +++ b/numpy/core/src/multiarray/number.c @@ -3,7 +3,7 @@ #include "structmember.h" /*#include */ -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #define _MULTIARRAYMODULE #include "numpy/arrayobject.h" diff --git a/numpy/core/src/multiarray/numpymemoryview.c b/numpy/core/src/multiarray/numpymemoryview.c index 15934d062caf..eda28e1afc33 100644 --- a/numpy/core/src/multiarray/numpymemoryview.c +++ b/numpy/core/src/multiarray/numpymemoryview.c @@ -10,7 +10,7 @@ #include #include "structmember.h" -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #define _MULTIARRAYMODULE #include "numpy/arrayobject.h" #include "numpy/arrayscalars.h" diff --git a/numpy/core/src/multiarray/numpyos.c b/numpy/core/src/multiarray/numpyos.c index 1fa514757b40..9307a247310c 100644 --- a/numpy/core/src/multiarray/numpyos.c +++ b/numpy/core/src/multiarray/numpyos.c @@ -4,7 +4,7 @@ #include #include -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #define _MULTIARRAYMODULE #include "numpy/arrayobject.h" #include "numpy/npy_math.h" diff --git a/numpy/core/src/multiarray/reduction.c b/numpy/core/src/multiarray/reduction.c index b17e3ca6eef5..fc62c9e1f91f 100644 --- a/numpy/core/src/multiarray/reduction.c +++ b/numpy/core/src/multiarray/reduction.c @@ -10,7 +10,7 @@ #define PY_SSIZE_T_CLEAN #include -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #define _MULTIARRAYMODULE #include diff --git a/numpy/core/src/multiarray/refcount.c b/numpy/core/src/multiarray/refcount.c index 44911a5fc228..2ba907f594ad 100644 --- a/numpy/core/src/multiarray/refcount.c +++ b/numpy/core/src/multiarray/refcount.c @@ -7,7 +7,7 @@ #include #include "structmember.h" -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #define _MULTIARRAYMODULE #include "numpy/arrayobject.h" #include "numpy/arrayscalars.h" diff --git a/numpy/core/src/multiarray/scalarapi.c b/numpy/core/src/multiarray/scalarapi.c index 2bb7ff2aebf5..e43e0dbe8c8a 100644 --- a/numpy/core/src/multiarray/scalarapi.c +++ b/numpy/core/src/multiarray/scalarapi.c @@ -2,7 +2,7 @@ #include #include "structmember.h" -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #define _MULTIARRAYMODULE #include "numpy/arrayobject.h" #include "numpy/arrayscalars.h" diff --git a/numpy/core/src/multiarray/scalartypes.c.src b/numpy/core/src/multiarray/scalartypes.c.src index 7ecc663f49ad..52b7b400032e 100644 --- a/numpy/core/src/multiarray/scalartypes.c.src +++ b/numpy/core/src/multiarray/scalartypes.c.src @@ -3,7 +3,7 @@ #include "Python.h" #include "structmember.h" -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #ifndef _MULTIARRAYMODULE #define _MULTIARRAYMODULE #endif diff --git a/numpy/core/src/multiarray/sequence.c b/numpy/core/src/multiarray/sequence.c index 0491fe1adf73..004aa2d783d4 100644 --- a/numpy/core/src/multiarray/sequence.c +++ b/numpy/core/src/multiarray/sequence.c @@ -2,7 +2,7 @@ #include #include "structmember.h" -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #define _MULTIARRAYMODULE #include "numpy/arrayobject.h" #include "numpy/arrayscalars.h" diff --git a/numpy/core/src/multiarray/shape.c b/numpy/core/src/multiarray/shape.c index 2258d9f5049a..d8cb5b784853 100644 --- a/numpy/core/src/multiarray/shape.c +++ b/numpy/core/src/multiarray/shape.c @@ -2,7 +2,7 @@ #include #include "structmember.h" -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #define _MULTIARRAYMODULE #include "numpy/arrayobject.h" #include "numpy/arrayscalars.h" diff --git a/numpy/core/src/multiarray/ucsnarrow.c b/numpy/core/src/multiarray/ucsnarrow.c index dee7e3c0fd10..607ed834f660 100644 --- a/numpy/core/src/multiarray/ucsnarrow.c +++ b/numpy/core/src/multiarray/ucsnarrow.c @@ -4,7 +4,7 @@ #include #include -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #define _MULTIARRAYMODULE #include "numpy/arrayobject.h" #include "numpy/npy_math.h" diff --git a/numpy/core/src/multiarray/usertypes.c b/numpy/core/src/multiarray/usertypes.c index c11e83185138..92c8a1243faa 100644 --- a/numpy/core/src/multiarray/usertypes.c +++ b/numpy/core/src/multiarray/usertypes.c @@ -25,7 +25,7 @@ maintainer email: oliphant.travis@ieee.org #include "structmember.h" /*#include */ -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #define _MULTIARRAYMODULE #include "numpy/arrayobject.h" #include "numpy/arrayscalars.h" diff --git a/numpy/core/src/npymath/halffloat.c b/numpy/core/src/npymath/halffloat.c index d5ef57d7be92..3f4aa9782fcc 100644 --- a/numpy/core/src/npymath/halffloat.c +++ b/numpy/core/src/npymath/halffloat.c @@ -1,4 +1,4 @@ -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #include "numpy/halffloat.h" /* diff --git a/numpy/core/src/npysort/sort.c.src b/numpy/core/src/npysort/sort.c.src index 17f734e11f63..1e8f58cb9cf1 100644 --- a/numpy/core/src/npysort/sort.c.src +++ b/numpy/core/src/npysort/sort.c.src @@ -26,7 +26,7 @@ * The heap sort is included for completeness. */ -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #include #include "npy_sort.h" diff --git a/numpy/core/src/scalarmathmodule.c.src b/numpy/core/src/scalarmathmodule.c.src index 0bff8d171936..0f59ed234fe7 100644 --- a/numpy/core/src/scalarmathmodule.c.src +++ b/numpy/core/src/scalarmathmodule.c.src @@ -6,7 +6,7 @@ but still supports error-modes. */ -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #include "Python.h" #include "numpy/arrayobject.h" diff --git a/numpy/core/src/umath/loops.c.src b/numpy/core/src/umath/loops.c.src index cc8d3f535c91..7eede45d6815 100644 --- a/numpy/core/src/umath/loops.c.src +++ b/numpy/core/src/umath/loops.c.src @@ -1,7 +1,7 @@ /* -*- c -*- */ #define _UMATHMODULE -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #include "Python.h" diff --git a/numpy/core/src/umath/ufunc_object.c b/numpy/core/src/umath/ufunc_object.c index f9906823c29e..554ec6f5193d 100644 --- a/numpy/core/src/umath/ufunc_object.c +++ b/numpy/core/src/umath/ufunc_object.c @@ -24,7 +24,7 @@ * */ #define _UMATHMODULE -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #include "Python.h" diff --git a/numpy/core/src/umath/ufunc_type_resolution.c b/numpy/core/src/umath/ufunc_type_resolution.c index 2f3cd55824fc..83703328a44c 100644 --- a/numpy/core/src/umath/ufunc_type_resolution.c +++ b/numpy/core/src/umath/ufunc_type_resolution.c @@ -9,7 +9,7 @@ * See LICENSE.txt for the license. */ #define _UMATHMODULE -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #include "Python.h" diff --git a/numpy/core/src/umath/umathmodule.c b/numpy/core/src/umath/umathmodule.c index 7ac1ecaf8e2d..3cd193b23e9a 100644 --- a/numpy/core/src/umath/umathmodule.c +++ b/numpy/core/src/umath/umathmodule.c @@ -16,7 +16,7 @@ * __ufunc_api.c */ #define _UMATHMODULE -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #include "Python.h" diff --git a/numpy/lib/src/_compiled_base.c b/numpy/lib/src/_compiled_base.c index 61935a39b6d6..c31ee5cd8bd8 100644 --- a/numpy/lib/src/_compiled_base.c +++ b/numpy/lib/src/_compiled_base.c @@ -1,4 +1,4 @@ -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #include "Python.h" #include "structmember.h" #include "numpy/arrayobject.h" diff --git a/numpy/numarray/_capi.c b/numpy/numarray/_capi.c index 7b866a8bef5a..fee07d79d61a 100644 --- a/numpy/numarray/_capi.c +++ b/numpy/numarray/_capi.c @@ -1,6 +1,6 @@ #include -#define NPY_NO_DEPRECATED_API +#define NPY_NO_DEPRECATED_API NPY_API_VERSION #define _libnumarray_MODULE #include "include/numpy/libnumarray.h" #include "numpy/npy_3kcompat.h"