Activate 'warn_return_any' mypy check

Author: schnellerhase

ffcx/codegeneration/C/c_implementation.py

@@ -207,7 +207,7 @@ def format_section(self, section) -> str:
         body += "// ------------------------ \n"
         return comments + declarations + body
 
-    def format_comment(self, c) -> str:
+    def format_comment(self, c: L.Comment) -> str:
         """Format a comment."""
         return "// " + c.comment + "\n"
 

ffcx/codegeneration/lnodes.py

@@ -912,7 +912,7 @@ def __repr__(self):
 class Comment(Statement):
     """Line comment(s) used for annotating the generated code with human readable remarks."""
 
-    def __init__(self, comment):
+    def __init__(self, comment: str):
         """Initialise."""
         assert isinstance(comment, str)
         self.comment = comment

ffcx/ir/representation.py

@@ -20,6 +20,7 @@
 
 import itertools
 import logging
+import sys
 import typing
 import warnings
 
@@ -40,9 +41,46 @@
 
 def basix_cell_from_string(string: str) -> basix.CellType:
     """Convert a string to a Basix CellType."""
+    # Note: vertex -> point, rest identity
     if string == "vertex":
         return basix.CellType.point
-    return getattr(basix.CellType, string)
+    elif string == "interval":
+        return basix.CellType.interval
+    elif string == "triangle":
+        return basix.CellType.triangle
+    elif string == "tetrahedron":
+        return basix.CellType.tetrahedron
+    elif string == "quadrilateral":
+        return basix.CellType.quadrilateral
+    elif string == "hexahedron":
+        return basix.CellType.hexahedron
+    elif string == "prism":
+        return basix.CellType.prism
+    elif string == "pyramid":
+        return basix.CellType.pyramid
+    else:
+        raise KeyError(f"Can not map '{string}' to a basix type.")
+
+    # TODO: Replace on 31 Oct 2025 with (Python 3.9 does not support match):
+    # match string:
+    #     case "vertex":
+    #         return basix.CellType.point
+    #     case "interval":
+    #         return basix.CellType.interval
+    #     case "triangle":
+    #         return basix.CellType.triangle
+    #     case "tetrahedron":
+    #         return basix.CellType.tetrahedron
+    #     case "quadrilateral":
+    #         return basix.CellType.quadrilateral
+    #     case "hexahedron":
+    #         return basix.CellType.hexahedron
+    #     case "prism":
+    #         return basix.CellType.prism
+    #     case "pyramid":
+    #         return basix.CellType.pyramid
+    #     case _:
+    #         raise KeyError(f"Can not map '{string}' to a basix type.")
 
 
 class FormIR(typing.NamedTuple):

pyproject.toml

@@ -69,7 +69,7 @@ disallow_untyped_defs = false
 disallow_any_unimported = false
 no_implicit_optional = false
 check_untyped_defs = false
-warn_return_any = false
+warn_return_any = true
 warn_unused_ignores = true
 show_error_codes = true