Merge pull request numpy#28970 from DimitriPapadopoulos/PERF

MNT: Enforce ruff/Perflint rules (PERF)

Author: mattip

benchmarks/benchmarks/bench_ufunc.py

@@ -53,7 +53,7 @@ def setup(self, ufuncname):
         except AttributeError:
             raise NotImplementedError
         self.args = []
-        for _, aarg in get_squares_().items():
+        for aarg in get_squares_().values():
             arg = (aarg,) * 1  # no nin
             try:
                 self.afdn(*arg)
@@ -100,7 +100,7 @@ def setup(self, ufuncname):
         except AttributeError:
             raise NotImplementedError
         self.args = []
-        for _, aarg in get_squares_().items():
+        for aarg in get_squares_().values():
             arg = (aarg,) * self.ufn.nin
             try:
                 self.ufn(*arg)

numpy/_core/code_generators/genapi.py

@@ -466,8 +466,7 @@ def _key(x):
 def merge_api_dicts(dicts):
     ret = {}
     for d in dicts:
-        for k, v in d.items():
-            ret[k] = v
+        ret.update(d)
 
     return ret
 

numpy/f2py/func2subr.py

@@ -77,7 +77,7 @@ def var2fixfortran(vars, a, fa=None, f90mode=None):
 
 def useiso_c_binding(rout):
     useisoc = False
-    for key, value in rout['vars'].items():
+    for value in rout['vars'].values():
         kind_value = value.get('kindselector', {}).get('kind')
         if kind_value in isoc_kindmap:
             return True

numpy/lib/introspect.py

@@ -86,7 +86,7 @@ def opt_func_info(func_name=None, signature=None):
                     sig_pattern.search(c) or sig_pattern.search(dtype(c).name)
                     for c in chars
                 ):
-                    matching_chars[chars] = targets
+                    matching_chars[chars] = targets  # noqa: PERF403
             if matching_chars:
                 matching_sigs[k] = matching_chars
     else:

numpy/ma/testutils.py

@@ -121,7 +121,7 @@ def assert_equal(actual, desired, err_msg=''):
         if not isinstance(actual, dict):
             raise AssertionError(repr(type(actual)))
         assert_equal(len(actual), len(desired), err_msg)
-        for k, i in desired.items():
+        for k in desired:
             if k not in actual:
                 raise AssertionError(f"{k} not in {actual}")
             assert_equal(actual[k], desired[k], f'key={k!r}\n{err_msg}')
@@ -159,7 +159,7 @@ def fail_if_equal(actual, desired, err_msg='',):
         if not isinstance(actual, dict):
             raise AssertionError(repr(type(actual)))
         fail_if_equal(len(actual), len(desired), err_msg)
-        for k, i in desired.items():
+        for k in desired:
             if k not in actual:
                 raise AssertionError(repr(k))
             fail_if_equal(actual[k], desired[k], f'key={k!r}\n{err_msg}')

numpy/testing/_private/utils.py

@@ -364,7 +364,7 @@ def assert_equal(actual, desired, err_msg='', verbose=True, *, strict=False):
         if not isinstance(actual, dict):
             raise AssertionError(repr(type(actual)))
         assert_equal(len(actual), len(desired), err_msg, verbose)
-        for k, i in desired.items():
+        for k in desired:
             if k not in actual:
                 raise AssertionError(repr(k))
             assert_equal(actual[k], desired[k], f'key={k!r}\n{err_msg}',

ruff.toml

@@ -32,39 +32,41 @@ extend-select = [
     "FLY",
     "I",
     "PD",
+    "PERF",
     "E",
     "W",
     "PGH",
     "PLE",
     "UP",
 ]
 ignore = [
-    "B006",   # Do not use mutable data structures for argument defaults
-    "B007",   # Loop control variable not used within loop body
-    "B011",   # Do not `assert False` (`python -O` removes these calls), raise `AssertionError()`
-    "B023",   # Function definition does not bind loop variable
-    "B028",   # No explicit `stacklevel` keyword argument found
-    "B904",   # Within an `except` clause distinguish raised exceptions from errors in exception handling
-    "B905",   #`zip()` without an explicit `strict=` parameter
-    "C408",   # Unnecessary `dict()` call (rewrite as a literal)
-    "ISC002", # Implicitly concatenated string literals over multiple lines
-    "PIE790", # Unnecessary `pass` statement
-    "PD901",  # Avoid using the generic variable name `df` for DataFrames
-    "E241",   # Multiple spaces after comma
-    "E265",   # Block comment should start with `# `
-    "E266",   # Too many leading `#` before block comment
-    "E302",   # TODO: Expected 2 blank lines, found 1
-    "E402",   # Module level import not at top of file
-    "E712",   # Avoid equality comparisons to `True` or `False`
-    "E721",   # TODO: Use `is` and `is not` for type comparisons, or `isinstance()` for isinstance check
-    "E731",   # Do not assign a `lambda` expression, use a `def`
-    "E741",   # Ambiguous variable name
-    "F403",   # `from ... import *` used; unable to detect undefined names
-    "F405",   # may be undefined, or defined from star imports
-    "F821",   # Undefined name
-    "F841",   # Local variable is assigned to but never used
-    "UP015",  # Unnecessary mode argument
-    "UP031",  # TODO: Use format specifiers instead of percent format
+    "B006",    # Do not use mutable data structures for argument defaults
+    "B007",    # Loop control variable not used within loop body
+    "B011",    # Do not `assert False` (`python -O` removes these calls), raise `AssertionError()`
+    "B023",    # Function definition does not bind loop variable
+    "B028",    # No explicit `stacklevel` keyword argument found
+    "B904",    # Within an `except` clause distinguish raised exceptions from errors in exception handling
+    "B905",    #`zip()` without an explicit `strict=` parameter
+    "C408",    # Unnecessary `dict()` call (rewrite as a literal)
+    "ISC002",  # Implicitly concatenated string literals over multiple lines
+    "PIE790",  # Unnecessary `pass` statement
+    "PD901",   # Avoid using the generic variable name `df` for DataFrames
+    "PERF401", # Use a list comprehension to create a transformed list
+    "E241",    # Multiple spaces after comma
+    "E265",    # Block comment should start with `# `
+    "E266",    # Too many leading `#` before block comment
+    "E302",    # TODO: Expected 2 blank lines, found 1
+    "E402",    # Module level import not at top of file
+    "E712",    # Avoid equality comparisons to `True` or `False`
+    "E721",    # TODO: Use `is` and `is not` for type comparisons, or `isinstance()` for isinstance check
+    "E731",    # Do not assign a `lambda` expression, use a `def`
+    "E741",    # Ambiguous variable name
+    "F403",    # `from ... import *` used; unable to detect undefined names
+    "F405",    # may be undefined, or defined from star imports
+    "F821",    # Undefined name
+    "F841",    # Local variable is assigned to but never used
+    "UP015" ,  # Unnecessary mode argument
+    "UP031",   # TODO: Use format specifiers instead of percent format
 ]
 
 [lint.per-file-ignores]