Merge pull request numpy#30068 from Abhi210/numpygh-11521-core-deprecations

mattip · web-flow · commit 4dab17d1eb7b · 2025-11-02T10:10:56.000+02:00
MAINT: remove deprecated `style` argument and deprecations in `fromnumeric`
diff --git a/doc/release/upcoming_changes/30068.expired.rst b/doc/release/upcoming_changes/30068.expired.rst
@@ -0,0 +1,11 @@
+``numpy.array2string`` and ``numpy.sum`` deprecations finalized
+---------------------------------------------------------------
+
+The following long-deprecated APIs have been removed or converted to errors:
+
+* The ``style`` parameter has been removed from ``numpy.array2string``.
+  This argument had no effect since Numpy 1.14.0.
+
+* Calling ``np.sum(generator)`` directly on a generator object now raises a `TypeError`.
+  This behavior was deprecated in NumPy 1.15.0. Use ``np.sum(np.fromiter(generator))``
+  or the python ``sum`` builtin instead.
diff --git a/numpy/_core/arrayprint.py b/numpy/_core/arrayprint.py
@@ -619,7 +619,7 @@ def _array2string(a, options, separator=' ', prefix=""):
 def _array2string_dispatcher(
         a, max_line_width=None, precision=None,
         suppress_small=None, separator=None, prefix=None,
-        style=None, formatter=None, threshold=None,
+        formatter=None, threshold=None,
         edgeitems=None, sign=None, floatmode=None, suffix=None,
         *, legacy=None):
     return (a,)
@@ -628,7 +628,7 @@ def _array2string_dispatcher(
 @array_function_dispatch(_array2string_dispatcher, module='numpy')
 def array2string(a, max_line_width=None, precision=None,
                  suppress_small=None, separator=' ', prefix="",
-                 style=np._NoValue, formatter=None, threshold=None,
+                 formatter=None, threshold=None,
                  edgeitems=None, sign=None, floatmode=None, suffix="",
                  *, legacy=None):
     """
@@ -663,10 +663,6 @@ def array2string(a, max_line_width=None, precision=None,
         wrapping is forced at the column ``max_line_width - len(suffix)``.
         It should be noted that the content of prefix and suffix strings are
         not included in the output.
-    style : _NoValue, optional
-        Has no effect, do not use.
-
-        .. deprecated:: 1.14.0
     formatter : dict of callables, optional
         If not None, the keys should indicate the type(s) that the respective
         formatting function applies to.  Callables should return a string.
@@ -786,16 +782,8 @@ def array2string(a, max_line_width=None, precision=None,
     options.update(overrides)
 
     if options['legacy'] <= 113:
-        if style is np._NoValue:
-            style = repr
-
         if a.shape == () and a.dtype.names is None:
-            return style(a.item())
-    elif style is not np._NoValue:
-        # Deprecation 11-9-2017  v1.14
-        warnings.warn("'style' argument is deprecated and no longer functional"
-                      " except in 1.13 'legacy' mode",
-                      DeprecationWarning, stacklevel=2)
+            return repr(a.item())
 
     if options['legacy'] > 113:
         options['linewidth'] -= len(suffix)
diff --git a/numpy/_core/arrayprint.pyi b/numpy/_core/arrayprint.pyi
@@ -10,13 +10,10 @@ from typing import (
     SupportsIndex,
     TypeAlias,
     TypedDict,
-    overload,
     type_check_only,
 )
-from typing_extensions import deprecated
 
 import numpy as np
-from numpy._globals import _NoValueType
 from numpy._typing import NDArray, _CharLike_co, _FloatLike_co
 
 __all__ = [
@@ -94,15 +91,13 @@ def set_printoptions(
 def get_printoptions() -> _FormatOptions: ...
 
 # public numpy export
-@overload  # no style
 def array2string(
     a: NDArray[Any],
     max_line_width: int | None = None,
     precision: SupportsIndex | None = None,
     suppress_small: bool | None = None,
     separator: str = " ",
     prefix: str = "",
-    style: _NoValueType = ...,
     formatter: _FormatDict | None = None,
     threshold: int | None = None,
     edgeitems: int | None = None,
@@ -112,80 +107,6 @@ def array2string(
     *,
     legacy: _Legacy | None = None,
 ) -> str: ...
-@overload  # style=<given> (positional), legacy="1.13"
-def array2string(
-    a: NDArray[Any],
-    max_line_width: int | None,
-    precision: SupportsIndex | None,
-    suppress_small: bool | None,
-    separator: str,
-    prefix: str,
-    style: _ReprFunc,
-    formatter: _FormatDict | None = None,
-    threshold: int | None = None,
-    edgeitems: int | None = None,
-    sign: _Sign | None = None,
-    floatmode: _FloatMode | None = None,
-    suffix: str = "",
-    *,
-    legacy: Literal["1.13"],
-) -> str: ...
-@overload  # style=<given> (keyword), legacy="1.13"
-def array2string(
-    a: NDArray[Any],
-    max_line_width: int | None = None,
-    precision: SupportsIndex | None = None,
-    suppress_small: bool | None = None,
-    separator: str = " ",
-    prefix: str = "",
-    *,
-    style: _ReprFunc,
-    formatter: _FormatDict | None = None,
-    threshold: int | None = None,
-    edgeitems: int | None = None,
-    sign: _Sign | None = None,
-    floatmode: _FloatMode | None = None,
-    suffix: str = "",
-    legacy: Literal["1.13"],
-) -> str: ...
-@overload  # style=<given> (positional), legacy!="1.13"
-@deprecated("'style' argument is deprecated and no longer functional except in 1.13 'legacy' mode")
-def array2string(
-    a: NDArray[Any],
-    max_line_width: int | None,
-    precision: SupportsIndex | None,
-    suppress_small: bool | None,
-    separator: str,
-    prefix: str,
-    style: _ReprFunc,
-    formatter: _FormatDict | None = None,
-    threshold: int | None = None,
-    edgeitems: int | None = None,
-    sign: _Sign | None = None,
-    floatmode: _FloatMode | None = None,
-    suffix: str = "",
-    *,
-    legacy: _LegacyNoStyle | None = None,
-) -> str: ...
-@overload  # style=<given> (keyword), legacy="1.13"
-@deprecated("'style' argument is deprecated and no longer functional except in 1.13 'legacy' mode")
-def array2string(
-    a: NDArray[Any],
-    max_line_width: int | None = None,
-    precision: SupportsIndex | None = None,
-    suppress_small: bool | None = None,
-    separator: str = " ",
-    prefix: str = "",
-    *,
-    style: _ReprFunc,
-    formatter: _FormatDict | None = None,
-    threshold: int | None = None,
-    edgeitems: int | None = None,
-    sign: _Sign | None = None,
-    floatmode: _FloatMode | None = None,
-    suffix: str = "",
-    legacy: _LegacyNoStyle | None = None,
-) -> str: ...
 
 def format_float_scientific(
     x: _FloatLike_co,
diff --git a/numpy/_core/fromnumeric.py b/numpy/_core/fromnumeric.py
@@ -4,7 +4,6 @@
 import functools
 import math
 import types
-import warnings
 
 import numpy as np
 from numpy._utils import set_module
@@ -755,8 +754,6 @@ def partition(a, kth, axis=-1, kind='introselect', order=None):
         provided with a sequence of k-th it will partition all elements
         indexed by k-th  of them into their sorted position at once.
 
-        .. deprecated:: 1.22.0
-            Passing booleans as index is deprecated.
     axis : int or None, optional
         Axis along which to sort. If None, the array is flattened before
         sorting. The default is -1, which sorts along the last axis.
@@ -868,8 +865,6 @@ def argpartition(a, kth, axis=-1, kind='introselect', order=None):
         sequence of k-th it will partition all of them into their sorted
         position at once.
 
-        .. deprecated:: 1.22.0
-            Passing booleans as index is deprecated.
     axis : int or None, optional
         Axis along which to sort. The default is -1 (the last axis). If
         None, the flattened array is used.
@@ -2008,15 +2003,6 @@ def nonzero(a):
     To group the indices by element, rather than dimension, use `argwhere`,
     which returns a row for each non-zero element.
 
-    .. note::
-
-       When called on a zero-d array or scalar, ``nonzero(a)`` is treated
-       as ``nonzero(atleast_1d(a))``.
-
-       .. deprecated:: 1.17.0
-
-          Use `atleast_1d` explicitly if this behavior is deliberate.
-
     Parameters
     ----------
     a : array_like
@@ -2430,19 +2416,12 @@ def sum(a, axis=None, dtype=None, out=None, keepdims=np._NoValue,
     """
     if isinstance(a, _gentype):
         # 2018-02-25, 1.15.0
-        warnings.warn(
-            "Calling np.sum(generator) is deprecated, and in the future will "
-            "give a different result. Use np.sum(np.fromiter(generator)) or "
+        raise TypeError(
+            "Calling np.sum(generator) is deprecated."
+            "Use np.sum(np.fromiter(generator)) or "
             "the python sum builtin instead.",
-            DeprecationWarning, stacklevel=2
         )
 
-        res = _sum_(a)
-        if out is not None:
-            out[...] = res
-            return out
-        return res
-
     return _wrapreduction(
         a, np.add, 'sum', axis, dtype, out,
         keepdims=keepdims, initial=initial, where=where
diff --git a/numpy/_core/tests/test_arrayprint.py b/numpy/_core/tests/test_arrayprint.py
@@ -735,12 +735,7 @@ def test_0d_arrays(self):
         # str is unaffected
         assert_equal(str(x), "1")
 
-        # check `style` arg raises
-        pytest.warns(DeprecationWarning, np.array2string,
-                                         np.array(1.), style=repr)
-        # but not in legacy mode
-        np.array2string(np.array(1.), style=repr, legacy='1.13')
-        # gh-10934 style was broken in legacy mode, check it works
+        # check it works
         np.array2string(np.array(1.), legacy='1.13')
 
     def test_float_spacing(self):
diff --git a/numpy/_core/tests/test_deprecations.py b/numpy/_core/tests/test_deprecations.py
@@ -145,12 +145,6 @@ def test_bincount_bad_list(self, badlist):
         self.assert_deprecated(lambda: np.bincount(badlist))
 
 
-class TestGeneratorSum(_DeprecationTestCase):
-    # 2018-02-25, 1.15.0
-    def test_generator_sum(self):
-        self.assert_deprecated(np.sum, args=((i for i in range(5)),))
-
-
 class BuiltInRoundComplexDType(_DeprecationTestCase):
     # 2020-03-31 1.19.0
     deprecated_types = [np.csingle, np.cdouble, np.clongdouble]
diff --git a/numpy/typing/tests/data/fail/arrayprint.pyi b/numpy/typing/tests/data/fail/arrayprint.pyi
@@ -8,9 +8,8 @@ AR: npt.NDArray[np.float64]
 func1: Callable[[Any], str]
 func2: Callable[[np.integer], str]
 
-np.array2string(AR, style=None)  # type: ignore[call-overload]
-np.array2string(AR, legacy="1.14")  # type: ignore[call-overload]
-np.array2string(AR, sign="*")  # type: ignore[call-overload]
-np.array2string(AR, floatmode="default")  # type: ignore[call-overload]
-np.array2string(AR, formatter={"A": func1})  # type: ignore[call-overload]
-np.array2string(AR, formatter={"float": func2})  # type: ignore[call-overload]
+np.array2string(AR, legacy="1.14")  # type: ignore[arg-type]
+np.array2string(AR, sign="*")  # type: ignore[arg-type]
+np.array2string(AR, floatmode="default")  # type: ignore[arg-type]
+np.array2string(AR, formatter={"A": func1})  # type: ignore[arg-type]
+np.array2string(AR, formatter={"float": func2})  # type: ignore[arg-type]
