add and fix more ruff rules

pymbolic/algorithm.py

@@ -155,7 +155,7 @@ def fft(x, sign=1,
                 "instead. wrap_intermediate will stop working in 2023.",
                 DeprecationWarning, stacklevel=2)
 
-        def wrap_intermediate_with_level(level, x):  # pylint: disable=function-redefined  # noqa: E501
+        def wrap_intermediate_with_level(level, x):  # pylint: disable=function-redefined
             return wrap_intermediate(x)
 
     if wrap_intermediate_with_level is None:
@@ -272,7 +272,7 @@ def csr_matrix_multiply(S, x):  # noqa
     result = numpy.empty_like(x)
 
     for i in range(h):
-        result[i] = sum(S.data[idx]*x[S.indices[idx]]  # noqa pylint:disable=unsupported-assignment-operation
+        result[i] = sum(S.data[idx]*x[S.indices[idx]]  # pylint:disable=unsupported-assignment-operation
                 for idx in range(S.indptr[i], S.indptr[i+1]))
 
     return result
@@ -326,7 +326,7 @@ def gaussian_elimination(mat, rhs):
     for i in range(m):
         g = gcd_many(*(
             [a for a in mat[i] if a]
-            +  # noqa: W504
+            +
             [a for a in rhs[i] if a]))
 
         mat[i] //= g

pymbolic/geometric_algebra/mapper.py

@@ -23,6 +23,7 @@
 # This is experimental, undocumented, and could go away any second.
 # Consider yourself warned.
 
+from typing import ClassVar, Dict
 
 from pymbolic.geometric_algebra import MultiVector
 import pymbolic.geometric_algebra.primitives as prim
@@ -104,7 +105,7 @@ def map_derivative_source(self, expr):
 
 
 class StringifyMapper(StringifyMapperBase):
-    AXES = {0: "x", 1: "y", 2: "z"}
+    AXES: ClassVar[Dict[int, str]] = {0: "x", 1: "y", 2: "z"}
 
     def map_nabla(self, expr, enclosing_prec):
         return f"∇[{expr.nabla_id}]"

pymbolic/geometric_algebra/primitives.py

@@ -23,6 +23,8 @@
 # This is experimental, undocumented, and could go away any second.
 # Consider yourself warned.
 
+from typing import ClassVar, List
+
 from pymbolic.primitives import Expression, Variable
 
 
@@ -84,7 +86,7 @@ class Derivative:
     .. automethod:: dnabla
     .. automethod:: resolve
     """
-    _next_id = [0]
+    _next_id: ClassVar[List[int]] = [0]
 
     def __init__(self):
         self.my_id = f"id{self._next_id[0]}"

pymbolic/interop/ast.py

@@ -24,8 +24,9 @@
 """
 
 import ast
+from typing import Any, ClassVar, Dict, List, Tuple, Type
+
 import pymbolic.primitives as p
-from typing import Tuple, List, Any
 from pymbolic.typing import ExpressionT, ScalarT
 from pymbolic.mapper import CachedMapper
 
@@ -112,7 +113,7 @@ def _neg(x):
 
 class ASTToPymbolic(ASTMapper):
 
-    bin_op_map = {
+    bin_op_map: ClassVar[Dict[Type[ast.operator], Any]] = {
             ast.Add: _add,
             ast.Sub: _sub,
             ast.Mult: _mult,
@@ -138,7 +139,7 @@ def map_BinOp(self, expr):  # noqa
 
         return op_constructor(self.rec(expr.left), self.rec(expr.right))
 
-    unary_op_map = {
+    unary_op_map: ClassVar[Dict[Type[ast.unaryop], Any]] = {
             ast.Invert: _neg,
             ast.Not: p.LogicalNot,
             # ast.UAdd:
@@ -159,7 +160,7 @@ def map_IfExp(self, expr):  # noqa
         # (expr test, expr body, expr orelse)
         return p.If(self.rec(expr.test), self.rec(expr.body), self.rec(expr.orelse))
 
-    comparison_op_map = {
+    comparison_op_map: ClassVar[Dict[Type[ast.compop], str]] = {
             ast.Eq: "==",
             ast.NotEq: "!=",
             ast.Lt: "<",
@@ -279,15 +280,10 @@ def map_product(self, expr: p.Product) -> ast.expr:
         return self._map_multi_children_op(expr.children, ast.Mult())
 
     def map_constant(self, expr: ScalarT) -> ast.expr:
-        import sys
         if isinstance(expr, bool):
             return ast.NameConstant(expr)
         else:
-            # needed because of https://bugs.python.org/issue36280
-            if sys.version_info < (3, 8):
-                return ast.Num(expr)
-            else:
-                return ast.Constant(expr, None)
+            return ast.Constant(expr, None)
 
     def map_call(self, expr: p.Call) -> ast.expr:
         return ast.Call(

pymbolic/interop/common.py

@@ -109,7 +109,7 @@ def map_Derivative(self, expr):  # noqa
     def map_UnevaluatedExpr(self, expr):  # noqa
         return self.rec(expr.args[0])
 
-    def not_supported(self, expr):  # noqa
+    def not_supported(self, expr):
         if isinstance(expr, int):
             return expr
         elif getattr(expr, "is_Function", False):

pymbolic/interop/maxima.py

@@ -35,10 +35,13 @@
 # http://trac.sagemath.org/sage_trac/browser/sage/interfaces/maxima.py
 
 import re
-import pytools
+from sys import intern
+from typing import ClassVar, List, Tuple
+
 import numpy as np
 
-from sys import intern
+import pytools
+
 from pymbolic.mapper.stringifier import StringifyMapper
 from pymbolic.parser import Parser as ParserBase, FinalizedTuple
 
@@ -92,11 +95,12 @@ class MaximaParser(ParserBase):
     imag_unit = intern("imag_unit")
     euler_number = intern("euler_number")
 
-    lex_table = [
+    lex_table: ClassVar[List[Tuple[str, str]]] = [
             (power_sym, pytools.lex.RE(r"\^")),
             (imag_unit, pytools.lex.RE(r"%i")),
             (euler_number, pytools.lex.RE(r"%e")),
-            ] + ParserBase.lex_table
+            *ParserBase.lex_table
+            ]
 
     def parse_prefix(self, pstate):
         pstate.expect_not_end()
@@ -212,7 +216,7 @@ def parse_postfix(self, pstate, min_precedence, left_exp):
                 new_el = self.parse_expression(pstate, p._PREC_COMMA)
                 if isinstance(left_exp, tuple) \
                         and not isinstance(left_exp, FinalizedTuple):
-                    left_exp = left_exp + (new_el,)
+                    left_exp = (*left_exp, new_el)
                 else:
                     left_exp = (left_exp, new_el)
 

pymbolic/interop/symengine.py

@@ -81,7 +81,7 @@ def function_name(self, expr):
             # For builtin functions
             return type(expr).__name__
 
-    def not_supported(self, expr):  # noqa
+    def not_supported(self, expr):
         from symengine.lib.symengine_wrapper import \
                 PyFunction                               # pylint: disable=E0611
         if isinstance(expr, PyFunction) and \

pymbolic/interop/sympy.py

@@ -98,7 +98,7 @@ class PymbolicToSympyMapper(PymbolicToSympyLikeMapper):
     sym = sympy
 
     def raise_conversion_error(self, expr):
-        raise RuntimeError("do not know how to translate '{expr}' to sympy")
+        raise RuntimeError(f"do not know how to translate '{expr}' to sympy")
 
     def map_subscript(self, expr):
         return self.sym.Indexed(

pymbolic/mapper/__init__.py

@@ -22,9 +22,12 @@
 
 from abc import ABC, abstractmethod
 from typing import Any, Dict
-import pymbolic.primitives as primitives
+
 from immutabledict import immutabledict
 
+import pymbolic.primitives as primitives
+
+
 __doc__ = """
 Basic dispatch
 --------------
@@ -305,23 +308,18 @@ def combine(self, values):
         raise NotImplementedError
 
     def map_call(self, expr, *args, **kwargs):
-        return self.combine(
-                (self.rec(expr.function, *args, **kwargs),)
-                + tuple([
-                    self.rec(child, *args, **kwargs) for child in expr.parameters
-                    ])
-                )
+        return self.combine((
+            self.rec(expr.function, *args, **kwargs),
+            *[self.rec(child, *args, **kwargs) for child in expr.parameters]
+            ))
 
     def map_call_with_kwargs(self, expr, *args, **kwargs):
-        return self.combine(
-                (self.rec(expr.function, *args, **kwargs),)
-                + tuple([
-                    self.rec(child, *args, **kwargs)
-                    for child in expr.parameters])
-                + tuple([
-                    self.rec(child, *args, **kwargs)
-                    for child in expr.kw_parameters.values()])
-                )
+        return self.combine((
+            self.rec(expr.function, *args, **kwargs),
+            *[self.rec(child, *args, **kwargs) for child in expr.parameters],
+            *[self.rec(child, *args, **kwargs)
+              for child in expr.kw_parameters.values()]
+            ))
 
     def map_subscript(self, expr, *args, **kwargs):
         return self.combine(
@@ -351,12 +349,10 @@ def map_power(self, expr, *args, **kwargs):
                 self.rec(expr.exponent, *args, **kwargs)))
 
     def map_polynomial(self, expr, *args, **kwargs):
-        return self.combine(
-                (self.rec(expr.base, *args, **kwargs),)
-                + tuple([
-                    self.rec(coeff, *args, **kwargs) for exp, coeff in expr.data
-                    ])
-                )
+        return self.combine((
+            self.rec(expr.base, *args, **kwargs),
+            *[self.rec(coeff, *args, **kwargs) for exp, coeff in expr.data]
+            ))
 
     def map_left_shift(self, expr, *args, **kwargs):
         return self.combine((

pymbolic/mapper/constant_folder.py

@@ -67,7 +67,7 @@ def fold(self, expr, klass, op, constructor):
         if constants:
             from functools import reduce
             constant = reduce(op, constants)
-            return constructor(tuple([constant]+nonconstants))
+            return constructor((constant, *nonconstants))
         else:
             return constructor(tuple(nonconstants))
 

pymbolic/mapper/optimize.py

@@ -46,7 +46,7 @@ def _get_def_from_ast_container(container, name, node_type):
 
 @lru_cache
 def _get_ast_for_file(filename):
-    with open(filename, "r") as inf:
+    with open(filename) as inf:
         return ast.parse(inf.read(), filename)
 
 

pymbolic/mapper/stringifier.py

@@ -20,8 +20,11 @@
 THE SOFTWARE.
 """
 
-from pymbolic.mapper import Mapper, CachedMapper
+from typing import ClassVar, Dict
+
 import pymbolic.primitives as p
+from pymbolic.mapper import Mapper, CachedMapper
+
 
 __doc__ = """
 .. _prec-constants:
@@ -161,7 +164,7 @@ def map_call_with_kwargs(self, expr, enclosing_prec, *args, **kwargs):
                     self.rec(ch, PREC_NONE, *args, **kwargs)
                     for ch in expr.parameters
                     ])
-                +  # noqa: W504
+                +
                 tuple([
                     "{}={}".format(name, self.rec(ch, PREC_NONE, *args, **kwargs))
                     for name, ch in expr.kw_parameters.items()
@@ -623,7 +626,7 @@ def map_product(self, expr, enclosing_prec, *args, **kwargs):
 
 class LaTeXMapper(StringifyMapper):
 
-    COMPARISON_OP_TO_LATEX = {
+    COMPARISON_OP_TO_LATEX: ClassVar[Dict[str, str]] = {
         "==": r"=",
         "!=": r"\ne",
         "<=": r"\le",

pymbolic/mapper/unifier.py

@@ -391,7 +391,7 @@ def partitions(s, k):
                     return
                 for subset in map(set, subsets(s, len(s) - k + 1)):
                     for partition in partitions(s - subset, k - 1):
-                        yield [subset] + partition
+                        yield [subset, *partition]
 
             for partition in partitions(
                     other_leftovers, len(plain_var_candidates)):
@@ -410,9 +410,10 @@ def partitions(s, k):
                     # urecs was not merged in, do it here.
                     yield from unify_many(urecs, result)
 
-        for urec in match_children(
-                UnificationRecord([]), 0, set(range(len(other.children)))):
-            yield urec
+        yield from match_children(
+            UnificationRecord([]),
+            0,
+            set(range(len(other.children))))
 
     def map_sum(self, expr, other, unis):
         from pymbolic.primitives import flattened_sum