Fix mypy error code 'return-value'

Author: schnellerhase

pyproject.toml

@@ -96,7 +96,6 @@ disable_error_code = [
     "misc",
     "operator",
     "override",
-    "return-value",
     "type-var",
     "var-annotated",
 ]

ufl/cell.py

@@ -358,7 +358,7 @@ def __init__(self, *cells: Cell):
         if not isinstance(self._tdim, numbers.Integral):
             raise ValueError("Expecting integer topological_dimension.")
 
-    def sub_cells(self) -> typing.List[AbstractCell]:
+    def sub_cells(self) -> typing.Tuple[AbstractCell, ...]:
         """Return list of cell factors."""
         return self._cells
 
@@ -398,21 +398,21 @@ def num_sub_entities(self, dim: int) -> int:
     def sub_entities(self, dim: int) -> typing.Tuple[AbstractCell, ...]:
         """Get the sub-entities of the given dimension."""
         if dim < 0 or dim > self._tdim:
-            return []
+            return ()
         if dim == 0:
-            return [Cell("vertex") for i in range(self.num_sub_entities(0))]
+            return tuple(Cell("vertex") for i in range(self.num_sub_entities(0)))
         if dim == self._tdim:
-            return [self]
+            return (self,)
         raise NotImplementedError(f"TensorProductCell.sub_entities({dim}) is not implemented.")
 
     def sub_entity_types(self, dim: int) -> typing.Tuple[AbstractCell, ...]:
         """Get the unique sub-entity types of the given dimension."""
         if dim < 0 or dim > self._tdim:
-            return []
+            return ()
         if dim == 0:
-            return [Cell("vertex")]
+            return (Cell("vertex"),)
         if dim == self._tdim:
-            return [self]
+            return (self,)
         raise NotImplementedError(f"TensorProductCell.sub_entities({dim}) is not implemented.")
 
     def _lt(self, other) -> bool:
@@ -434,7 +434,7 @@ def _ufl_hash_data_(self) -> typing.Hashable:
         """UFL hash data."""
         return tuple(c._ufl_hash_data_() for c in self._cells)
 
-    def reconstruct(self, **kwargs: typing.Any) -> Cell:
+    def reconstruct(self, **kwargs: typing.Any) -> Cell | TensorProductCell:
         """Reconstruct this cell, overwriting properties by those in kwargs."""
         for key, value in kwargs.items():
             raise TypeError(f"reconstruct() got unexpected keyword argument '{key}'")

ufl/functionspace.py

@@ -80,7 +80,7 @@ def components(self) -> typing.Dict[typing.Tuple[int, ...], int]:
         if len(self._ufl_element.sub_elements) == 0:
             return {(): 0}
 
-        components = {}
+        components: dict[tuple[int, ...], int] = {}
         offset = 0
         c_offset = 0
         for s in self.ufl_sub_spaces():

ufl/objects.py

@@ -20,7 +20,7 @@
     globals()[measure_name] = Measure(integral_type)
 
 # TODO: Firedrake hack, remove later
-ds_tb = ds_b + ds_t # type: ignore # noqa: F821
+ds_tb = ds_b + ds_t  # type: ignore # noqa: F821
 
 # Default measure dX including both uncut and cut cells
 dX = dx + dC  # type: ignore # noqa: F821