diff options
| -rw-r--r-- | doc/release/upcoming_changes/22638.deprecation.rst | 2 | ||||
| -rw-r--r-- | doc/release/upcoming_changes/22638.expired.rst | 1 | ||||
| -rw-r--r-- | numpy/core/__init__.py | 9 | ||||
| -rw-r--r-- | numpy/core/_machar.py | 1 | ||||
| -rw-r--r-- | numpy/core/getlimits.py | 23 | ||||
| -rw-r--r-- | numpy/core/tests/test_deprecations.py | 8 |
6 files changed, 12 insertions, 32 deletions
diff --git a/doc/release/upcoming_changes/22638.deprecation.rst b/doc/release/upcoming_changes/22638.deprecation.rst new file mode 100644 index 000000000..2db186106 --- /dev/null +++ b/doc/release/upcoming_changes/22638.deprecation.rst @@ -0,0 +1,2 @@ +* ``np.core.MachAr`` is deprecated. It is private API. In names + defined in ``np.core`` should generally be considered private. diff --git a/doc/release/upcoming_changes/22638.expired.rst b/doc/release/upcoming_changes/22638.expired.rst new file mode 100644 index 000000000..01e87fa9f --- /dev/null +++ b/doc/release/upcoming_changes/22638.expired.rst @@ -0,0 +1 @@ +* ``np.core.machar`` and ``np.finfo.machar`` have been removed. diff --git a/numpy/core/__init__.py b/numpy/core/__init__.py index 748705e33..4375aa9c5 100644 --- a/numpy/core/__init__.py +++ b/numpy/core/__init__.py @@ -84,7 +84,6 @@ from .defchararray import chararray from . import function_base from .function_base import * from . import _machar -from ._machar import * from . import getlimits from .getlimits import * from . import shape_base @@ -153,13 +152,13 @@ def _DType_reduce(DType): def __getattr__(name): - # Deprecated 2021-10-20, NumPy 1.22 - if name == "machar": + # Deprecated 2022-11-22, NumPy 1.25. + if name == "MachAr": warnings.warn( - "The `np.core.machar` module is deprecated (NumPy 1.22)", + "The `np.core.MachAr` is considered private API (NumPy 1.24)", DeprecationWarning, stacklevel=2, ) - return _machar + return _machar.MachAr raise AttributeError(f"Module {__name__!r} has no attribute {name!r}") diff --git a/numpy/core/_machar.py b/numpy/core/_machar.py index 3cc7db278..3f1bec493 100644 --- a/numpy/core/_machar.py +++ b/numpy/core/_machar.py @@ -14,7 +14,6 @@ from numpy.core.overrides import set_module # Need to speed this up...especially for longfloat # Deprecated 2021-10-20, NumPy 1.22 -@set_module('numpy') class MachAr: """ Diagnosing machine parameters. diff --git a/numpy/core/getlimits.py b/numpy/core/getlimits.py index 2c0f462cc..45818b326 100644 --- a/numpy/core/getlimits.py +++ b/numpy/core/getlimits.py @@ -352,6 +352,9 @@ def _get_machar(ftype): def _discovered_machar(ftype): """ Create MachAr instance with found information on float types + + TODO: MachAr should be retired completely ideally. We currently only + ever use it system with broken longdouble (valgrind, WSL). """ params = _MACHAR_PARAMS[ftype] return MachAr(lambda v: array([v], ftype), @@ -387,11 +390,6 @@ class finfo: iexp : int The number of bits in the exponent portion of the floating point representation. - machar : MachAr - The object which calculated these parameters and holds more - detailed information. - - .. deprecated:: 1.22 machep : int The exponent that yields `eps`. max : floating point number of the appropriate type @@ -432,7 +430,6 @@ class finfo: See Also -------- - MachAr : The implementation of the tests that produce this information. iinfo : The equivalent for integer data types. spacing : The distance between a value and the nearest adjacent number nextafter : The next floating point value after x1 towards x2 @@ -595,20 +592,6 @@ class finfo: """ return self.smallest_normal - @property - def machar(self): - """The object which calculated these parameters and holds more - detailed information. - - .. deprecated:: 1.22 - """ - # Deprecated 2021-10-27, NumPy 1.22 - warnings.warn( - "`finfo.machar` is deprecated (NumPy 1.22)", - DeprecationWarning, stacklevel=2, - ) - return self._machar - @set_module('numpy') class iinfo: diff --git a/numpy/core/tests/test_deprecations.py b/numpy/core/tests/test_deprecations.py index dba301418..3a8db40df 100644 --- a/numpy/core/tests/test_deprecations.py +++ b/numpy/core/tests/test_deprecations.py @@ -1024,15 +1024,11 @@ class TestPartitionBoolIndex(_DeprecationTestCase): class TestMachAr(_DeprecationTestCase): - # Deprecated 2021-10-19, NumPy 1.22 + # Deprecated 2022-11-22, NumPy 1.25 warning_cls = DeprecationWarning def test_deprecated_module(self): - self.assert_deprecated(lambda: getattr(np.core, "machar")) - - def test_deprecated_attr(self): - finfo = np.finfo(float) - self.assert_deprecated(lambda: getattr(finfo, "machar")) + self.assert_deprecated(lambda: getattr(np.core, "MachAr")) class TestQuantileInterpolationDeprecation(_DeprecationTestCase): |