Merge pull request numpy#27289 from DimitriPapadopoulos/RUF

MAINT: Start applying ruff rules (RUF)

Author: mhvk

benchmarks/benchmarks/__init__.py

@@ -42,7 +42,7 @@ def dirty_lock(lock_name, lock_on_count=1):
                 count = 0
             f.seek(0)
             f.truncate()
-            f.write(f"{str(count)} {str(ppid)}")
+            f.write(f"{count} {ppid}")
     except OSError:
         pass
     return False

numpy/__init__.py

@@ -477,7 +477,9 @@ def _mac_os_check():
                 for _wn in w:
                     if _wn.category is exceptions.RankWarning:
                         # Ignore other warnings, they may not be relevant (see gh-25433).
-                        error_message = f"{_wn.category.__name__}: {str(_wn.message)}"
+                        error_message = (
+                            f"{_wn.category.__name__}: {_wn.message}"
+                        )
                         msg = (
                             "Polyfit sanity test emitted a warning, most likely due "
                             "to using a buggy Accelerate backend."

numpy/__init__.pyi

@@ -3387,13 +3387,13 @@ class ufunc:
     # raise a ValueError ufuncs with that don't accept two input
     # arguments and return one output argument. Because of that we
     # can't type them very precisely.
-    def reduce(self, /, *args: Any, **kwargs: Any) -> NoReturn | Any: ...
-    def accumulate(self, /, *args: Any, **kwargs: Any) -> NoReturn | NDArray[Any]: ...
-    def reduceat(self, /, *args: Any, **kwargs: Any) -> NoReturn | NDArray[Any]: ...
-    def outer(self, *args: Any, **kwargs: Any) -> NoReturn | Any: ...
+    def reduce(self, /, *args: Any, **kwargs: Any) -> Any: ...
+    def accumulate(self, /, *args: Any, **kwargs: Any) -> NDArray[Any]: ...
+    def reduceat(self, /, *args: Any, **kwargs: Any) -> NDArray[Any]: ...
+    def outer(self, *args: Any, **kwargs: Any) -> Any: ...
     # Similarly at won't be defined for ufuncs that return multiple
     # outputs, so we can't type it very precisely.
-    def at(self, /, *args: Any, **kwargs: Any) -> NoReturn | None: ...
+    def at(self, /, *args: Any, **kwargs: Any) -> None: ...
 
 # Parameters: `__name__`, `ntypes` and `identity`
 absolute: _UFunc_Nin1_Nout1[L['absolute'], L[20], None]

numpy/_core/numerictypes.py

@@ -452,7 +452,7 @@ def isdtype(dtype, kind):
         elif isinstance(kind, str):
             raise ValueError(
                 "kind argument is a string, but"
-                f" {repr(kind)} is not a known kind name."
+                f" {kind!r} is not a known kind name."
             )
         else:
             try:

numpy/_core/tests/test_stringdtype.py

@@ -116,13 +116,13 @@ def test_dtype_repr(dtype):
     if not hasattr(dtype, "na_object") and dtype.coerce:
         assert repr(dtype) == "StringDType()"
     elif dtype.coerce:
-        assert repr(dtype) == f"StringDType(na_object={repr(dtype.na_object)})"
+        assert repr(dtype) == f"StringDType(na_object={dtype.na_object!r})"
     elif not hasattr(dtype, "na_object"):
         assert repr(dtype) == "StringDType(coerce=False)"
     else:
         assert (
             repr(dtype)
-            == f"StringDType(na_object={repr(dtype.na_object)}, coerce=False)"
+            == f"StringDType(na_object={dtype.na_object!r}, coerce=False)"
         )
 
 

numpy/core/_utils.py

@@ -1,7 +1,7 @@
 import warnings
 
 
-def _raise_warning(attr: str, submodule: str = None) -> None:
+def _raise_warning(attr: str, submodule: str | None = None) -> None:
     new_module = "numpy._core"
     old_module = "numpy.core"
     if submodule is not None:

numpy/ctypeslib.py

@@ -282,11 +282,11 @@ def ndpointer(dtype=None, ndim=None, shape=None, flags=None):
 
     """
 
-    # normalize dtype to an Optional[dtype]
+    # normalize dtype to dtype | None
     if dtype is not None:
         dtype = _dtype(dtype)
 
-    # normalize flags to an Optional[int]
+    # normalize flags to int | None
     num = None
     if flags is not None:
         if isinstance(flags, str):
@@ -304,7 +304,7 @@ def ndpointer(dtype=None, ndim=None, shape=None, flags=None):
                 raise TypeError("invalid flags specification") from e
             num = _num_fromflags(flags)
 
-    # normalize shape to an Optional[tuple]
+    # normalize shape to tuple | None
     if shape is not None:
         try:
             shape = tuple(shape)

numpy/f2py/_backends/_distutils.py

@@ -42,7 +42,7 @@ def compile(self):
                 i = get_info(n)
                 if not i:
                     print(
-                        f"No {repr(n)} resources found"
+                        f"No {n!r} resources found"
                         "in system (try `f2py --help-link`)"
                     )
                 dict_append(ext_args, **i)

numpy/f2py/capi_maps.py

@@ -627,7 +627,7 @@ def routsign2map(rout):
                                 ln = k
                                 break
                     lcb_map[ln] = un[1]
-    elif 'externals' in rout and rout['externals']:
+    elif rout.get('externals'):
         errmess('routsign2map: Confused: function %s has externals %s but no "use" statement.\n' % (
             ret['name'], repr(rout['externals'])))
     ret['callprotoargument'] = getcallprotoargument(rout, lcb_map) or ''

numpy/f2py/crackfortran.py

@@ -2079,7 +2079,7 @@ def postcrack(block, args=None, tab=''):
     block = analyzecommon(block)
     block['vars'] = analyzevars(block)
     block['sortvars'] = sortvarnames(block['vars'])
-    if 'args' in block and block['args']:
+    if block.get('args'):
         args = block['args']
     block['body'] = analyzebody(block, args, tab=tab)
 
@@ -2095,7 +2095,7 @@ def postcrack(block, args=None, tab=''):
     if 'name' in block:
         name = block['name']
     # and not userisdefined: # Build a __user__ module
-    if 'externals' in block and block['externals']:
+    if block.get('externals'):
         interfaced = []
         if 'interfaced' in block:
             interfaced = block['interfaced']