Switch to ruff, fix issues

.github/workflows/ci.yml

@@ -8,20 +8,15 @@ on:
         - cron:  '17 3 * * 0'
 
 jobs:
-    flake8:
-        name: Flake8
+    ruff:
+        name: Ruff
         runs-on: ubuntu-latest
         steps:
         -   uses: actions/checkout@v4
-        -
-            uses: actions/setup-python@v5
-            with:
-                # matches compat target in setup.py
-                python-version: '3.8'
         -   name: "Main Script"
             run: |
-                curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/prepare-and-run-flake8.sh
-                . ./prepare-and-run-flake8.sh "$(basename $GITHUB_REPOSITORY)" examples test
+                pipx install ruff
+                ruff check
 
     pylint:
         name: Pylint

.gitlab-ci.yml

@@ -106,10 +106,10 @@ Documentation:
 
 Flake8:
   script:
-  - curl -L -O https://gitlab.tiker.net/inducer/ci-support/raw/main/prepare-and-run-flake8.sh
-  - . ./prepare-and-run-flake8.sh "$CI_PROJECT_NAME" examples test
+  - pipx install ruff
+  - ruff check
   tags:
-  - python3
+  - docker-runner
   except:
   - tags
 

doc/conf.py

@@ -1,5 +1,6 @@
 from urllib.request import urlopen
 
+
 _conf_url = \
         "https://raw.githubusercontent.com/inducer/sphinxconfig/main/sphinxconfig.py"
 with urlopen(_conf_url) as _inf:
@@ -40,5 +41,7 @@ def get_version():
 
 # index-page demo uses pyopencl via plot_directive
 import os
+
+
 # switch to "port:cpu" once we're firmly migrated to pocl 4.0
 os.environ["PYOPENCL_TEST"] = "port:0"

examples/advection/surface.py

@@ -25,24 +25,23 @@
 THE SOFTWARE.
 """
 
+import logging
 import os
 
 import numpy as np
+
 import pyopencl as cl
 import pyopencl.tools as cl_tools
-
-from grudge.array_context import PyOpenCLArrayContext
-
-from meshmode.dof_array import flatten
 from meshmode.discretization.connection import FACE_RESTR_INTERIOR
-
+from meshmode.dof_array import flatten
 from pytools.obj_array import make_obj_array
 
 import grudge.dof_desc as dof_desc
-import grudge.op as op
 import grudge.geometry as geo
+import grudge.op as op
+from grudge.array_context import PyOpenCLArrayContext
+
 
-import logging
 logger = logging.getLogger(__name__)
 
 
@@ -129,7 +128,7 @@ def main(ctx_factory, dim=2, order=4, use_quad=False, visualize=False):
     # {{{ discretization
 
     if dim == 2:
-        from meshmode.mesh.generation import make_curve_mesh, ellipse
+        from meshmode.mesh.generation import ellipse, make_curve_mesh
         mesh = make_curve_mesh(
                 lambda t: radius * ellipse(1.0, t),
                 np.linspace(0.0, 1.0, resolution + 1),
@@ -147,9 +146,10 @@ def main(ctx_factory, dim=2, order=4, use_quad=False, visualize=False):
     else:
         qtag = None
 
-    from meshmode.discretization.poly_element import \
-            default_simplex_group_factory, \
-            QuadratureSimplexGroupFactory
+    from meshmode.discretization.poly_element import (
+        QuadratureSimplexGroupFactory,
+        default_simplex_group_factory,
+    )
 
     discr_tag_to_group_factory[dof_desc.DISCR_TAG_BASE] = \
         default_simplex_group_factory(base_dim=dim-1, order=order)

examples/advection/var-velocity.py

@@ -23,23 +23,22 @@
 THE SOFTWARE.
 """
 
+import logging
 import os
+
 import numpy as np
 
 import pyopencl as cl
 import pyopencl.tools as cl_tools
-
-from grudge.array_context import PyOpenCLArrayContext
-
 from meshmode.dof_array import flatten
 from meshmode.mesh import BTAG_ALL
-
 from pytools.obj_array import flat_obj_array
 
 import grudge.dof_desc as dof_desc
 import grudge.op as op
+from grudge.array_context import PyOpenCLArrayContext
+
 
-import logging
 logger = logging.getLogger(__name__)
 
 
@@ -131,8 +130,7 @@ def main(ctx_factory, dim=2, order=4, use_quad=False, visualize=False,
             npoints_per_axis=(npoints,)*dim,
             order=order)
 
-    from meshmode.discretization.poly_element import \
-            QuadratureSimplexGroupFactory
+    from meshmode.discretization.poly_element import QuadratureSimplexGroupFactory
 
     if use_quad:
         discr_tag_to_group_factory = {

examples/advection/weak.py

@@ -23,22 +23,22 @@
 THE SOFTWARE.
 """
 
+import logging
 import os
+
 import numpy as np
 import numpy.linalg as la
 
 import pyopencl as cl
 import pyopencl.tools as cl_tools
-
-from grudge.array_context import PyOpenCLArrayContext
-
 from meshmode.dof_array import flatten
 from meshmode.mesh import BTAG_ALL
 
 import grudge.dof_desc as dof_desc
 import grudge.op as op
+from grudge.array_context import PyOpenCLArrayContext
+
 
-import logging
 logger = logging.getLogger(__name__)
 
 

examples/euler/acoustic_pulse.py

@@ -23,29 +23,21 @@
 """
 
 
+import logging
+
 import numpy as np
 
 import pyopencl as cl
 import pyopencl.tools as cl_tools
-
-from grudge.array_context import (
-    PyOpenCLArrayContext,
-    PytatoPyOpenCLArrayContext
-)
-from grudge.models.euler import (
-    ConservedEulerField,
-    EulerOperator,
-    InviscidWallBC
-)
-from grudge.shortcuts import rk4_step
-
 from meshmode.mesh import BTAG_ALL
-
 from pytools.obj_array import make_obj_array
 
 import grudge.op as op
+from grudge.array_context import PyOpenCLArrayContext, PytatoPyOpenCLArrayContext
+from grudge.models.euler import ConservedEulerField, EulerOperator, InviscidWallBC
+from grudge.shortcuts import rk4_step
+
 
-import logging
 logger = logging.getLogger(__name__)
 
 
@@ -129,11 +121,13 @@ def run_acoustic_pulse(actx,
         b=(box_ur,)*dim,
         nelements_per_axis=(resolution,)*dim)
 
+    from meshmode.discretization.poly_element import (
+        QuadratureSimplexGroupFactory,
+        default_simplex_group_factory,
+    )
+
     from grudge import DiscretizationCollection
     from grudge.dof_desc import DISCR_TAG_BASE, DISCR_TAG_QUAD
-    from meshmode.discretization.poly_element import \
-        (default_simplex_group_factory,
-         QuadratureSimplexGroupFactory)
 
     exp_name = f"fld-acoustic-pulse-N{order}-K{resolution}"
     if overintegration:

examples/euler/vortex.py

@@ -23,19 +23,17 @@
 """
 
 
+import logging
+
 import pyopencl as cl
 import pyopencl.tools as cl_tools
 
-from grudge.array_context import PytatoPyOpenCLArrayContext, PyOpenCLArrayContext
-from grudge.models.euler import (
-    vortex_initial_condition,
-    EulerOperator
-)
+import grudge.op as op
+from grudge.array_context import PyOpenCLArrayContext, PytatoPyOpenCLArrayContext
+from grudge.models.euler import EulerOperator, vortex_initial_condition
 from grudge.shortcuts import rk4_step
 
-import grudge.op as op
 
-import logging
 logger = logging.getLogger(__name__)
 
 
@@ -71,10 +69,13 @@ def run_vortex(actx, order=3, resolution=8, final_time=5,
         nelements_per_axis=(2*resolution, resolution),
         periodic=(True, True))
 
+    from meshmode.discretization.poly_element import (
+        QuadratureSimplexGroupFactory,
+        default_simplex_group_factory,
+    )
+
     from grudge import DiscretizationCollection
     from grudge.dof_desc import DISCR_TAG_BASE, DISCR_TAG_QUAD
-    from meshmode.discretization.poly_element import \
-        default_simplex_group_factory, QuadratureSimplexGroupFactory
 
     exp_name = f"fld-vortex-N{order}-K{resolution}-{flux_type}"
 

examples/hello-grudge.py

@@ -9,14 +9,15 @@
 
 # BEGINEXAMPLE
 import numpy as np
+
 import pyopencl as cl
-from grudge.discretization import make_discretization_collection
-import grudge.op as op
-import grudge.geometry as geo
-from grudge.dof_desc import as_dofdesc
-from meshmode.mesh.generation import generate_box_mesh
 from meshmode.array_context import PyOpenCLArrayContext
-from grudge.dof_desc import BoundaryDomainTag, FACE_RESTR_INTERIOR
+from meshmode.mesh.generation import generate_box_mesh
+
+import grudge.geometry as geo
+import grudge.op as op
+from grudge.discretization import make_discretization_collection
+from grudge.dof_desc import FACE_RESTR_INTERIOR, BoundaryDomainTag, as_dofdesc
 
 
 ctx = cl.create_some_context()
@@ -114,6 +115,8 @@ def u_exact(x, t):
                uh - u_exact(x_vol, t_final),
                p=2) <= 0.1
 import matplotlib.pyplot as plt
+
+
 plt.plot(actx.to_numpy(actx.np.ravel(x_vol[0][0])),
          actx.to_numpy(actx.np.ravel(uh[0])), label="Numerical")
 plt.plot(actx.to_numpy(actx.np.ravel(x_vol[0][0])),

examples/maxwell/cavities.py

@@ -24,20 +24,20 @@
 """
 
 
+import logging
+
 import numpy as np
+
 import pyopencl as cl
 import pyopencl.tools as cl_tools
 
-from grudge.array_context import PyOpenCLArrayContext
-
-from grudge.shortcuts import set_up_rk4
+import grudge.op as op
 from grudge import DiscretizationCollection
-
+from grudge.array_context import PyOpenCLArrayContext
 from grudge.models.em import get_rectangular_cavity_mode
+from grudge.shortcuts import set_up_rk4
 
-import grudge.op as op
 
-import logging
 logger = logging.getLogger(__name__)
 
 

examples/wave/var-propagation-speed.py

@@ -24,20 +24,20 @@
 """
 
 
+import logging
+
 import numpy as np
+
 import pyopencl as cl
 import pyopencl.tools as cl_tools
+from pytools.obj_array import flat_obj_array
 
+import grudge.op as op
+from grudge import DiscretizationCollection
 from grudge.array_context import PyOpenCLArrayContext
-
 from grudge.shortcuts import set_up_rk4
-from grudge import DiscretizationCollection
 
-from pytools.obj_array import flat_obj_array
-
-import grudge.op as op
 
-import logging
 logger = logging.getLogger(__name__)
 
 
@@ -78,9 +78,10 @@ def source_f(actx, dcoll, t=0):
     ones = dcoll.zeros(actx) + 1
     c = actx.np.where(np.dot(x, x) < 0.15, 0.1 * ones, 0.2 * ones)
 
-    from grudge.models.wave import VariableCoefficientWeakWaveOperator
     from meshmode.mesh import BTAG_ALL, BTAG_NONE
 
+    from grudge.models.wave import VariableCoefficientWeakWaveOperator
+
     wave_op = VariableCoefficientWeakWaveOperator(
         dcoll,
         actx.freeze(c),