Update to pass ruff 0.15.2

.basedpyright/baseline.json

@@ -900,18 +900,10 @@
                 }
             },
             {
-                "code": "reportUnknownVariableType",
-                "range": {
-                    "startColumn": 24,
-                    "endColumn": 37,
-                    "lineCount": 1
-                }
-            },
-            {
-                "code": "reportUnknownVariableType",
+                "code": "reportUnknownArgumentType",
                 "range": {
-                    "startColumn": 39,
-                    "endColumn": 43,
+                    "startColumn": 48,
+                    "endColumn": 53,
                     "lineCount": 1
                 }
             },
@@ -6695,6 +6687,14 @@
             }
         ],
         "./grudge/reductions.py": [
+            {
+                "code": "reportUnknownVariableType",
+                "range": {
+                    "startColumn": 4,
+                    "endColumn": 22,
+                    "lineCount": 1
+                }
+            },
             {
                 "code": "reportUnknownParameterType",
                 "range": {

examples/advection/surface.py

@@ -32,13 +32,12 @@
 
 import pyopencl as cl
 import pyopencl.tools as cl_tools
-import pytools.obj_array as obj_array
 from arraycontext import flatten
 from meshmode.discretization.connection import FACE_RESTR_INTERIOR
+from pytools import obj_array
 
-import grudge.dof_desc as dof_desc
 import grudge.geometry as geo
-import grudge.op as op
+from grudge import dof_desc, op
 from grudge.array_context import PyOpenCLArrayContext
 
 

examples/advection/var-velocity.py

@@ -30,12 +30,11 @@
 
 import pyopencl as cl
 import pyopencl.tools as cl_tools
-import pytools.obj_array as obj_array
 from arraycontext import flatten
 from meshmode.mesh import BTAG_ALL
+from pytools import obj_array
 
-import grudge.dof_desc as dof_desc
-import grudge.op as op
+from grudge import dof_desc, op
 from grudge.array_context import PyOpenCLArrayContext
 
 

examples/advection/weak.py

@@ -34,8 +34,7 @@
 from arraycontext import flatten
 from meshmode.mesh import BTAG_ALL
 
-import grudge.dof_desc as dof_desc
-import grudge.op as op
+from grudge import dof_desc, op
 from grudge.array_context import PyOpenCLArrayContext
 
 

examples/euler/acoustic_pulse.py

@@ -29,11 +29,11 @@
 
 import pyopencl as cl
 import pyopencl.tools as cl_tools
-import pytools.obj_array as obj_array
 from arraycontext import ArrayContext
 from meshmode.mesh import BTAG_ALL
+from pytools import obj_array
 
-import grudge.op as op
+from grudge import op
 from grudge.array_context import PyOpenCLArrayContext, PytatoPyOpenCLArrayContext
 from grudge.models.euler import ConservedEulerField, EulerOperator, InviscidWallBC
 from grudge.shortcuts import compiled_lsrk45_step

examples/euler/vortex.py

@@ -28,7 +28,7 @@
 import pyopencl as cl
 import pyopencl.tools as cl_tools
 
-import grudge.op as op
+from grudge import op
 from grudge.array_context import PyOpenCLArrayContext, PytatoPyOpenCLArrayContext
 from grudge.models.euler import EulerOperator, vortex_initial_condition
 from grudge.shortcuts import compiled_lsrk45_step

examples/hello-grudge.py

@@ -15,7 +15,7 @@
 from meshmode.mesh.generation import generate_box_mesh
 
 import grudge.geometry as geo
-import grudge.op as op
+from grudge import op
 from grudge.discretization import make_discretization_collection
 from grudge.dof_desc import FACE_RESTR_INTERIOR, BoundaryDomainTag, as_dofdesc
 

examples/maxwell/cavities.py

@@ -136,15 +136,14 @@ def norm(u):
                 norm_e0, norm_e1, norm_h0, norm_h1
             )
 
-            if step % 10 == 0:
-                if visualize:
-                    vis.write_vtk_file(
-                        f"fld-cavities-{step:04d}.vtu",
-                        [
-                            ("e", e),
-                            ("h", h),
-                        ]
-                    )
+            if visualize and step % 10 == 0:
+                vis.write_vtk_file(
+                    f"fld-cavities-{step:04d}.vtu",
+                    [
+                        ("e", e),
+                        ("h", h),
+                    ]
+                )
 
             # NOTE: These are here to ensure the solution is bounded for the
             # time interval specified

examples/wave/var-propagation-speed.py

@@ -30,7 +30,7 @@
 
 import pyopencl as cl
 import pyopencl.tools as cl_tools
-import pytools.obj_array as obj_array
+from pytools import obj_array
 
 from grudge import op
 from grudge.array_context import PyOpenCLArrayContext

examples/wave/wave-min-mpi.py

@@ -31,10 +31,9 @@
 
 import pyopencl as cl
 import pyopencl.tools as cl_tools
-import pytools.obj_array as obj_array
+from pytools import obj_array
 
-import grudge.op as op
-from grudge import make_discretization_collection
+from grudge import make_discretization_collection, op
 from grudge.array_context import MPIPyOpenCLArrayContext
 from grudge.shortcuts import set_up_rk4
 

examples/wave/wave-op-mpi.py

@@ -32,13 +32,13 @@
 
 import pyopencl as cl
 import pyopencl.tools as cl_tools
-import pytools.obj_array as obj_array
 from arraycontext import dataclass_array_container, with_container_arithmetic
 from meshmode.dof_array import DOFArray
 from meshmode.mesh import BTAG_ALL
+from pytools import obj_array
 
 import grudge.geometry as geo
-import grudge.op as op
+from grudge import op
 from grudge.discretization import make_discretization_collection
 from grudge.dof_desc import DISCR_TAG_BASE, DISCR_TAG_QUAD, as_dofdesc
 from grudge.shortcuts import compiled_lsrk45_step, make_visualizer

examples/wave/wave-op-var-velocity.py

@@ -31,11 +31,11 @@
 
 import pyopencl as cl
 import pyopencl.tools as cl_tools
-import pytools.obj_array as obj_array
 from meshmode.mesh import BTAG_ALL, BTAG_NONE  # noqa
+from pytools import obj_array
 
 import grudge.geometry as geo
-import grudge.op as op
+from grudge import op
 from grudge.array_context import PyOpenCLArrayContext
 from grudge.discretization import make_discretization_collection
 from grudge.dof_desc import DISCR_TAG_BASE, DISCR_TAG_QUAD, as_dofdesc

grudge/discretization.py

@@ -247,7 +247,8 @@ def __init__(self, array_context: ArrayContext,
         self._dist_boundary_connections = {
             vtag: self._set_up_distributed_communication(
                         vtag, mpi_communicator, array_context)
-            for vtag in self._volume_discrs.keys()}
+            for vtag in self._volume_discrs
+        }
 
     # }}}
 
@@ -304,8 +305,8 @@ def _set_up_distributed_communication(self,
                     conns = bdry_setup_helper.complete_some()
                     if not conns:
                         break
-                    for i_remote_part, conn in conns.items():
-                        boundary_connections[i_remote_part] = conn
+
+                    boundary_connections.update(conns)
 
         return boundary_connections
 
@@ -375,7 +376,7 @@ def discr_from_dd(self, dd: ToDOFDescConvertible) -> Discretization:
             else:
                 return self._boundary_connection(dd.domain_tag).to_discr
         else:
-            raise ValueError(f"DOF desc not understood: {dd}")
+            raise ValueError(f"DOF desc not understood: {dd}")  # noqa: TRY004
 
     # }}}
 
@@ -583,7 +584,7 @@ def connection_from_dds(self,
                         f"cannot get a connection from volume to: '{to_dd}'")
 
         else:
-            raise ValueError(f"cannot get a connection from: '{from_dd}'")
+            raise ValueError(f"cannot get a connection from: '{from_dd}'")  # noqa: TRY004
 
     # }}}
 

grudge/dof_desc.py

@@ -305,7 +305,8 @@ def trace(self, btag: BoundaryTag) -> DOFDesc:
         :class:`DOFDesc`.
         """
         if not isinstance(self.domain_tag, VolumeDomainTag):
-            raise ValueError(f"must originate on volume, got '{self.domain_tag}'")
+            raise TypeError(f"must originate on volume, got '{self.domain_tag}'")
+
         return replace(self,
                 domain_tag=BoundaryDomainTag(btag, volume_tag=self.domain_tag.tag))
 
@@ -317,7 +318,8 @@ def untrace(self) -> DOFDesc:
         :class:`DOFDesc`.
         """
         if not isinstance(self.domain_tag, BoundaryDomainTag):
-            raise ValueError(f"must originate on boundary, got '{self.domain_tag}'")
+            raise TypeError(f"must originate on boundary, got '{self.domain_tag}'")
+
         return replace(self,
                 domain_tag=VolumeDomainTag(self.domain_tag.volume_tag))
 
@@ -329,7 +331,8 @@ def with_boundary_tag(self, btag: BoundaryTag) -> DOFDesc:
         :class:`DOFDesc`.
         """
         if not isinstance(self.domain_tag, BoundaryDomainTag):
-            raise ValueError(f"must originate on boundary, got '{self.domain_tag}'")
+            raise TypeError(f"must originate on boundary, got '{self.domain_tag}'")
+
         return replace(self,
                 domain_tag=replace(self.domain_tag, tag=btag))
 
@@ -410,7 +413,7 @@ def _normalize_domain_and_discr_tag(
         domain = BoundaryDomainTag(FACE_RESTR_ALL, contextual_volume_tag)
     elif domain in [FACE_RESTR_INTERIOR, "int_faces"]:
         domain = BoundaryDomainTag(FACE_RESTR_INTERIOR, contextual_volume_tag)
-    elif isinstance(domain, BTAG_PARTITION):
+    elif isinstance(domain, BTAG_PARTITION):  # noqa: SIM114
         domain = BoundaryDomainTag(domain, contextual_volume_tag)
     elif domain in [BTAG_ALL, BTAG_REALLY_ALL, BTAG_NONE]:
         domain = BoundaryDomainTag(domain, contextual_volume_tag)

grudge/dt_utils.py

@@ -60,7 +60,7 @@
 )
 from pytools import memoize_in, memoize_on_first_arg
 
-import grudge.op as op
+from grudge import op
 from grudge.dof_desc import (
     DD_VOLUME_ALL,
     FACE_RESTR_ALL,

grudge/geometry/metrics.py

@@ -66,7 +66,6 @@
 
 import numpy as np
 
-import pytools.obj_array as obj_array
 from arraycontext import ArrayContext, register_multivector_as_array_container, tag_axes
 from arraycontext.metadata import NameHint
 from meshmode.discretization.connection import DirectDiscretizationConnection
@@ -76,10 +75,9 @@
     DiscretizationTopologicalDimAxisTag,
 )
 from pymbolic.geometric_algebra import MultiVector, get_euclidean_space
-from pytools import flatten, memoize_in, product
+from pytools import flatten, memoize_in, obj_array, product
 
-import grudge.dof_desc as dof_desc
-from grudge import DiscretizationCollection
+from grudge import DiscretizationCollection, dof_desc
 from grudge.dof_desc import DD_VOLUME_ALL, DISCR_TAG_BASE, DOFDesc, ToDOFDescConvertible
 
 
@@ -172,7 +170,7 @@ def forward_metric_nth_derivative(
         ref_axes = ((ref_axes, 1),)
 
     if not isinstance(ref_axes, tuple):
-        raise ValueError(f"'ref_axes' must be a tuple: {type(ref_axes)}")
+        raise ValueError(f"'ref_axes' must be a tuple: {type(ref_axes)}")  # noqa: TRY004
 
     if tuple(sorted(ref_axes)) != ref_axes:
         raise ValueError(f"'ref_axes' must be sorted: {ref_axes}")
@@ -471,10 +469,7 @@ def outprod_with_unit(i: int, at: int) -> MultiVector[DOFArray]:
         for rst_axis in range(dim)
     ).inv()
 
-    result = (outprod_with_unit(xyz_axis, rst_axis)
-              * volume_pseudoscalar_inv).as_scalar()
-
-    return result
+    return (outprod_with_unit(xyz_axis, rst_axis) * volume_pseudoscalar_inv).as_scalar()
 
 
 def inverse_surface_metric_derivative(

grudge/models/__init__.py

@@ -75,12 +75,12 @@ def estimate_rk4_timestep(
             max characteristic velocity of the operator. These are passed
             to :meth:`max_characteristic_velocity`.
         """
-        import grudge.op as op
         from grudge.dt_utils import characteristic_lengthscales
+        from grudge.op import nodal_min
 
         wavespeeds = self.max_characteristic_velocity(actx, **kwargs)
         local_timesteps = (
             characteristic_lengthscales(actx, dcoll) / wavespeeds
         )
 
-        return op.nodal_min(dcoll, "vol", local_timesteps)
+        return nodal_min(dcoll, "vol", local_timesteps)

grudge/models/advection.py

@@ -33,7 +33,7 @@
 import numpy as np
 
 import grudge.geometry as geo
-import grudge.op as op
+from grudge import op
 from grudge.models import HyperbolicOperator
 
 
@@ -72,7 +72,7 @@ def __init__(self, dcoll, v, inflow_u=None, flux_type="central"):
         if flux_type not in self.flux_types:
             raise ValueError(f"unknown flux type: '{flux_type}'")
 
-        if inflow_u is not None:
+        if inflow_u is not None:  # noqa: SIM102
             if not isinstance(inflow_u, types.LambdaType):
                 raise ValueError(
                     "A specified inflow_u must be a lambda function of time `t`"