Updates

Author: garth-wells

ffcx/analysis.py

@@ -156,7 +156,7 @@ def _analyze_form(form: ufl.form.Form, options: typing.Dict) -> ufl.algorithms.f
         raise RuntimeError(f"Form ({form}) contains unsupported custom integrals.")
 
     # Set default spacing for coordinate elements to be equispaced
-    for n, i in enumerate(form._integrals):
+    for i in form._integrals:
         element = i._ufl_domain._ufl_coordinate_element
         assert isinstance(element, basix.ufl._ElementBase)
 

ffcx/codegeneration/expression_generator.py

@@ -212,7 +212,7 @@ def generate_block_parts(self, blockmap, blockdata):
 
         # Check if DOFs in dofrange are equally spaced.
         expand_loop = False
-        for i, bm in enumerate(blockmap):
+        for bm in blockmap:
             for a, b in zip(bm[1:-1], bm[2:]):
                 if b - a != bm[1] - bm[0]:
                     expand_loop = True
@@ -317,7 +317,7 @@ def generate_partition(self, symbol, F, mode):
         definitions = []
         intermediates = []
 
-        for i, attr in F.nodes.items():
+        for _, attr in F.nodes.items():
             if attr["status"] != mode:
                 continue
             v = attr["expression"]

ffcx/codegeneration/jit.py

@@ -108,8 +108,8 @@ def get_cached_module(module_name, object_names, cache_dir, timeout):
             logger.info(f"Waiting for {ready_name} to appear.")
             time.sleep(1)
         raise TimeoutError(
-            f"""JIT compilation timed out, probably due to a failed previous compile.
-        Try cleaning cache (e.g. remove {c_filename}) or increase timeout option."""
+            "JIT compilation timed out, probably due to a failed previous compile. "
+            f"Try cleaning cache (e.g. remove {c_filename}) or increase timeout option."
         )
 
 

ffcx/ir/elementtables.py

@@ -236,40 +236,40 @@ def get_modified_terminal_element(mt) -> typing.Optional[ModifiedTerminalElement
 
 
 def permute_quadrature_interval(points, reflections=0):
-    """Permuteq quadrature points for an interval."""
+    """Permute quadrature points for an interval."""
     output = points.copy()
     for p in output:
         assert len(p) < 2 or np.isclose(p[1], 0)
         assert len(p) < 3 or np.isclose(p[2], 0)
-    for i in range(reflections):
+    for _ in range(reflections):
         for n, p in enumerate(output):
             output[n] = [1 - p[0]]
     return output
 
 
 def permute_quadrature_triangle(points, reflections=0, rotations=0):
-    """Permuteq quadrature points for a triangle."""
+    """Permute quadrature points for a triangle."""
     output = points.copy()
     for p in output:
         assert len(p) < 3 or np.isclose(p[2], 0)
-    for i in range(rotations):
+    for _ in range(rotations):
         for n, p in enumerate(output):
             output[n] = [p[1], 1 - p[0] - p[1]]
-    for i in range(reflections):
+    for _ in range(reflections):
         for n, p in enumerate(output):
             output[n] = [p[1], p[0]]
     return output
 
 
 def permute_quadrature_quadrilateral(points, reflections=0, rotations=0):
-    """Permuteq quadrature points for a quadrilateral."""
+    """Permute quadrature points for a quadrilateral."""
     output = points.copy()
     for p in output:
         assert len(p) < 3 or np.isclose(p[2], 0)
-    for i in range(rotations):
+    for _ in range(rotations):
         for n, p in enumerate(output):
             output[n] = [p[1], 1 - p[0]]
-    for i in range(reflections):
+    for _ in range(reflections):
         for n, p in enumerate(output):
             output[n] = [p[1], p[0]]
     return output

ffcx/ir/integral.py

@@ -302,7 +302,7 @@ def analyse_dependencies(F, mt_unique_table_reference):
     """
     # Set targets, and dependencies to 'active'
     targets = [i for i, v in F.nodes.items() if v.get("target")]
-    for i, v in F.nodes.items():
+    for _, v in F.nodes.items():
         v["status"] = "inactive"
 
     while targets:
@@ -343,7 +343,7 @@ def analyse_dependencies(F, mt_unique_table_reference):
                 varying_indices.append(j)
 
     # Any remaining active nodes must be 'piecewise'
-    for i, v in F.nodes.items():
+    for _, v in F.nodes.items():
         if v["status"] == "active":
             v["status"] = "piecewise"
 

pyproject.toml

@@ -8,15 +8,15 @@ version = "0.8.0.dev0"
 description = "The FEniCSx Form Compiler"
 readme = "README.md"
 requires-python = ">=3.8.0"
-license = {file = "LICENSE"}
+license = { file = "LICENSE" }
 authors = [
     { email = "fenics-steering-council@googlegroups.com" },
     { name = "FEniCS Steering Council" },
 ]
 dependencies = [
     "numpy>=1.21",
     "cffi",
-    "setuptools; python_version >= '3.12'",  # cffi with compilation support requires setuptools
+    "setuptools; python_version >= '3.12'",   # cffi with compilation support requires setuptools
     "fenics-basix >= 0.8.0.dev0, <0.9.0",
     "fenics-ufl >= 2023.3.0.dev0, <2023.4.0",
 ]
@@ -59,13 +59,8 @@ packages = [
 [tool.pytest.ini_options]
 minversion = "6.0"
 addopts = "-ra"
-testpaths = [
-    "test"
-]
-norecursedirs = [
-    "libs",
-    "docs"
-]
+testpaths = ["test"]
+norecursedirs = ["libs", "docs"]
 log_cli = true
 
 [tool.mypy]
@@ -80,13 +75,7 @@ warn_unused_ignores = false
 show_error_codes = true
 
 [[tool.mypy.overrides]]
-module = [
-    'basix',
-    'cffi',
-    'numba.*',
-    'pygraphviz',
-    'ufl.*'
-]
+module = ['basix', 'cffi', 'numba.*', 'pygraphviz', 'ufl.*']
 ignore_missing_imports = true
 
 [tool.ruff]
@@ -114,7 +103,7 @@ select = [
     "FLY", # use f-string not static joins
     "LOG", # https://docs.astral.sh/ruff/rules/#flake8-logging-log
     # "ISC", # https://docs.astral.sh/ruff/rules/#flake8-implicit-str-concat-isc
-    # "B", https://docs.astral.sh/ruff/rules/#flake8-bugbear-b
+    # "B", # https://docs.astral.sh/ruff/rules/#flake8-bugbear-b
     # "A", # https://docs.astral.sh/ruff/rules/#flake8-builtins-a
 ]
 ignore = ["RUF005", "RUF012", "RUF015"]
@@ -127,4 +116,3 @@ ignore = ["RUF005", "RUF012", "RUF015"]
 
 [tool.ruff.lint.pydocstyle]
 convention = "google"
-

test/test_jit_forms.py

@@ -551,7 +551,7 @@ def test_curl_curl(compile_args):
     )
 
 
-def lagrange_triangle_symbolic(order, corners=[(1, 0), (2, 0), (0, 1)], fun=lambda i: i):
+def lagrange_triangle_symbolic(order, corners=((1, 0), (2, 0), (0, 1)), fun=lambda i: i):
     from sympy import S
 
     poly_basis = [x**i * y**j for i in range(order + 1) for j in range(order + 1 - i)]
@@ -648,7 +648,7 @@ def test_lagrange_triangle(compile_args, order, dtype, sym_fun, ufl_fun):
 
 
 def lagrange_tetrahedron_symbolic(
-    order, corners=[(1, 0, 0), (2, 0, 0), (0, 1, 0), (0, 0, 1)], fun=lambda i: i
+    order, corners=((1, 0, 0), (2, 0, 0), (0, 1, 0), (0, 0, 1)), fun=lambda i: i
 ):
     from sympy import S