fix ruff errors

Author: alexfikl

pytential/symbolic/elasticity.py

@@ -544,7 +544,7 @@ class ElasticityDoubleLayerWrapperYoshida(ElasticityDoubleLayerWrapperBase):
         International Journal for Numerical Methods in Engineering, Vol. 50, pp.
         525--547, 2001,
         `DOI <https://doi.org/10.1002/1097-0207(20010130)50:3%3C525::aid-nme34%3E3.0.co;2-4>`__.
-    """  # noqa: E501
+    """
 
     def __post_init__(self):
         if not self.dim == 3:

pytential/symbolic/pde/system_utils.py

@@ -23,7 +23,7 @@
 import logging
 import warnings
 from dataclasses import dataclass
-from typing import Any, List, Mapping, Optional, Sequence, Text, Tuple, Union
+from typing import Any, List, Mapping, Optional, Sequence, Tuple, Union
 
 import numpy as np
 import pymbolic
@@ -131,7 +131,7 @@ def map_int_g(self, expr):
 
 
 def _get_sympy_kernel_expression(expr: ExpressionT,
-        kernel_arguments: Mapping[Text, Any]) -> sym.Basic:
+        kernel_arguments: Mapping[str, Any]) -> sym.Basic:
     """Convert a :mod:`pymbolic` expression to :mod:`sympy` expression
     after substituting kernel arguments.
 
@@ -399,7 +399,7 @@ class DerivRelation:
 
 def get_deriv_relation(kernels: Sequence[ExpressionKernel],
         base_kernel: ExpressionKernel,
-        kernel_arguments: Mapping[Text, Any],
+        kernel_arguments: Mapping[str, Any],
         tol: float = 1e-10,
         order: Optional[int] = None) \
         -> List[DerivRelation]:
@@ -436,7 +436,7 @@ def get_deriv_relation(kernels: Sequence[ExpressionKernel],
 @memoize_on_first_arg
 def get_deriv_relation_kernel(kernel: ExpressionKernel,
         base_kernel: ExpressionKernel,
-        hashable_kernel_arguments: Tuple[Tuple[Text, Any], ...],
+        hashable_kernel_arguments: Tuple[Tuple[str, Any], ...],
         tol: float = 1e-10,
         order: Optional[int] = None) \
         -> DerivRelation:
@@ -495,7 +495,7 @@ class LUFactorization:
 
 @memoize_on_first_arg
 def _get_base_kernel_matrix_lu_factorization(base_kernel: ExpressionKernel,
-        hashable_kernel_arguments: Tuple[Tuple[Text, Any], ...],
+        hashable_kernel_arguments: Tuple[Tuple[str, Any], ...],
         order: Optional[int] = None, retries: int = 3) \
         -> Tuple[LUFactorization, np.ndarray, List[Tuple[int, ...]]]:
     """
@@ -525,11 +525,11 @@ def _get_base_kernel_matrix_lu_factorization(base_kernel: ExpressionKernel,
     if order == pde.order:
         pde_mis = [ident.mi for eq in pde.eqs for ident in eq.keys()]
         pde_mis = [mi for mi in pde_mis if sum(mi) == order]
-        logger.debug(f"Removing {pde_mis[-1]} to avoid linear dependent mis")
+        logger.debug("Removing %s to avoid linear dependent mis", pde_mis[-1])
         mis.remove(pde_mis[-1])
 
-    rand = np.random.randint(1, 10**15, (dim, len(mis)))
-    rand = rand.astype(object)
+    rng = np.random.default_rng()
+    rand: np.ndarray = rng.integers(1, 10**15, size=(dim, len(mis))).astype(object)
     for i in range(rand.shape[0]):
         for j in range(rand.shape[1]):
             rand[i, j] = sym.sympify(rand[i, j])/10**15

pytential/symbolic/stokes.py

@@ -91,7 +91,7 @@ def apply_pressure(self, density_vec_sym, qbx_forced_limit, extra_deriv_dirs=())
 
         sym_expr = 0
         for i in range(self.dim):
-            deriv_dirs = tuple(extra_deriv_dirs) + (i,)
+            deriv_dirs = (*extra_deriv_dirs, i)
             knl = lknl
             for deriv_dir in deriv_dirs:
                 knl = AxisTargetDerivative(deriv_dir, knl)
@@ -156,7 +156,7 @@ def apply_pressure(self, density_vec_sym, dir_vec_sym, qbx_forced_limit,
         sym_expr = 0
 
         for i, j in itertools.product(range(self.dim), range(self.dim)):
-            deriv_dirs = tuple(extra_deriv_dirs) + (i, j)
+            deriv_dirs = (*extra_deriv_dirs, i, j)
             knl = lknl
             for deriv_dir in deriv_dirs:
                 knl = AxisTargetDerivative(deriv_dir, knl)

test/test_stokes.py

@@ -246,7 +246,7 @@ def run_exterior_stokes(actx_factory, *,
             timing_data=fmm_timing_data)
 
     def print_timing_data(timings, name):
-        result = {k: 0 for k in list(timings.values())[0].keys()}
+        result = dict.fromkeys(next(timings.values()), value=0)
         total = 0
         for k, timing in timings.items():
             for k, v in timing.items():
@@ -612,11 +612,12 @@ def run_stokes_pde(actx_factory, case, identity, resolution, visualize=False):
             identity.apply_pde_using_pytential())(actx))
 
     m = np.max([np.linalg.norm(p, ord=np.inf) for p in potential_host])
-    error = [np.linalg.norm(x, ord=np.inf)/m for x in result]
+    error = [0.0] * places.ambient_dim
+    error[:places.ambient_dim] = [np.linalg.norm(x, ord=np.inf)/m for x in result]
 
     error += [np.linalg.norm(x, ord=np.inf)/m for x in result_pytential]
-    logger.info("resolution %4d h_min %.5e h_max %.5e error "
-            + ("%.5e " * places.ambient_dim),
+    logger.info(
+            "resolution %4d h_min %.5e h_max %.5e error %.5e %.5e %.5e",
             resolution, h_min, h_max, *error)
 
     return h_max, error