MNT Address reviewer's comments

Co-authored-by: Joren Hammudoglu <[email protected]>

Author: 2 people

benchmarks/benchmarks/bench_array_coercion.py

@@ -36,12 +36,18 @@ def time_asarray(self, array_like):
         np.asarray(array_like)
 
     def time_asarray_dtype(self, array_like):
+        np.asarray(array_like, dtype=self.int64)
+
+    def time_asarray_dtype_order(self, array_like):
         np.asarray(array_like, dtype=self.int64, order="F")
 
     def time_asanyarray(self, array_like):
         np.asanyarray(array_like)
 
     def time_asanyarray_dtype(self, array_like):
+        np.asanyarray(array_like, dtype=self.int64)
+
+    def time_asanyarray_dtype_order(self, array_like):
         np.asanyarray(array_like, dtype=self.int64, order="F")
 
     def time_ascontiguousarray(self, array_like):

numpy/__init__.pyi

@@ -1,4 +1,4 @@
-# ruff: noqa: I001, F401
+# ruff: noqa: I001
 import builtins
 import sys
 import mmap

numpy/_core/arrayprint.py

@@ -37,7 +37,7 @@
                          datetime_as_string, datetime_data, ndarray)
 from .fromnumeric import any
 from .numeric import concatenate, asarray, errstate
-from .numerictypes import (int_, float64, complex128, flexible)
+from .numerictypes import int_, float64, complex128, flexible
 from .overrides import array_function_dispatch, set_module
 from .printoptions import format_options
 import operator

numpy/_core/multiarray.py

@@ -13,10 +13,10 @@
 # These imports are needed for backward compatibility,
 # do not change them. issue gh-15518
 # _get_ndarray_c_version is semi-public, on purpose not added to __all__
-from ._multiarray_umath import (
-    _flagdict, from_dlpack, _place, _reconstruct,  # noqa: F401
-    _vec_string, _ARRAY_API, _monotonicity, _get_ndarray_c_version,  # noqa: F401
-    _get_madvise_hugepage, _set_madvise_hugepage,  # noqa: F401
+from ._multiarray_umath import (  # noqa: F401
+    _flagdict, from_dlpack, _place, _reconstruct,
+    _vec_string, _ARRAY_API, _monotonicity, _get_ndarray_c_version,
+    _get_madvise_hugepage, _set_madvise_hugepage,
     )
 
 __all__ = [

numpy/_core/numeric.py

@@ -1,4 +1,3 @@
-# ruff: noqa: F401
 import functools
 import itertools
 import operator
@@ -11,7 +10,7 @@
 import numpy as np
 from . import multiarray
 from . import numerictypes as nt
-from .multiarray import (
+from .multiarray import (  # noqa: F401
     ALLOW_THREADS, BUFSIZE, CLIP, MAXDIMS, MAY_SHARE_BOUNDS, MAY_SHARE_EXACT,
     RAISE, WRAP, arange, array, asarray, asanyarray, ascontiguousarray,
     asfortranarray, broadcast, can_cast, concatenate, copyto, dot, dtype,

numpy/_core/tests/test_ufunc.py

@@ -484,9 +484,20 @@ def test_signature_dtype_type(self):
         np.add(3, 4, signature=(float_dtype, float_dtype, None))
 
     @pytest.mark.parametrize("get_kwarg", [
-            param(lambda x: {"dtype": x}, id="dtype"),
-            param(lambda x: {"signature": (x, None, None)}, id="signature")])
+            param(lambda dt: {"dtype": dt}, id="dtype"),
+            param(lambda dt: {"signature": (dt, None, None)}, id="signature")])
     def test_signature_dtype_instances_allowed(self, get_kwarg):
+        # We allow certain dtype instances when there is a clear singleton
+        # and the given one is equivalent; mainly for backcompat.
+        int64 = np.dtype("int64")
+        int64_2 = pickle.loads(pickle.dumps(int64))
+        # Relies on pickling behavior, if assert fails just remove test...
+        assert int64 is not int64_2
+
+        assert np.add(1, 2, **get_kwarg(int64_2)).dtype == int64
+        td = np.timedelta(2, "s")
+        assert np.add(td, td, **get_kwarg("m8")).dtype == "m8[s]"
+
         msg = "The `dtype` and `signature` arguments to ufuncs"
 
         with pytest.raises(TypeError, match=msg):

numpy/_core/umath.py

@@ -6,10 +6,9 @@
 
 """
 
-# ruff: noqa: F401
 import numpy
 from . import _multiarray_umath
-from ._multiarray_umath import *  # noqa: F403
+from ._multiarray_umath import *
 # These imports are needed for backward compatibility,
 # do not change them. issue gh-11862
 # _ones_like is semi-public, on purpose not added to __all__

numpy/_pyinstaller/hook-numpy.py

@@ -5,9 +5,8 @@
 https://pyinstaller.readthedocs.io/en/stable/hooks.html
 
 """
-# ruff: noqa: F401
-from PyInstaller.compat import is_conda, is_pure_conda
-from PyInstaller.utils.hooks import collect_dynamic_libs, is_module_satisfies
+from PyInstaller.compat import is_pure_conda
+from PyInstaller.utils.hooks import collect_dynamic_libs
 
 # Collect all DLLs inside numpy's installation folder, dump them into built
 # app's root.

numpy/core/__init__.py

@@ -3,7 +3,6 @@
 purposes. The original `core` was renamed to `_core` and made private.
 `numpy.core` will be removed in the future.
 """
-# ruff: noqa: F822
 from numpy import _core
 from ._utils import _raise_warning
 
@@ -22,7 +21,7 @@ def _ufunc_reconstruct(module, name):
 
 # force lazy-loading of submodules to ensure a warning is printed
 
-__all__ = ["arrayprint", "defchararray", "_dtype_ctypes", "_dtype",
+__all__ = ["arrayprint", "defchararray", "_dtype_ctypes", "_dtype",  # noqa: F822
            "einsumfunc", "fromnumeric", "function_base", "getlimits",
            "_internal", "multiarray", "_multiarray_umath", "numeric",
            "numerictypes", "overrides", "records", "shape_base", "umath"]

numpy/ctypeslib/__init__.pyi

@@ -1,4 +1,3 @@
-# ruff: noqa: F401
 import ctypes
 from ctypes import c_int64 as _c_intp