Fix mypy error code 'var-annotated'

pyproject.toml

@@ -95,5 +95,4 @@ disable_error_code = [
     "misc",
     "operator",
     "type-var",
-    "var-annotated",
 ]

ufl/algorithms/formsplitter.py

@@ -8,6 +8,7 @@
 #
 # Modified by Cecile Daversin-Catty, 2018
 
+import typing
 from typing import Optional
 
 import numpy as np
@@ -127,7 +128,7 @@ def extract_blocks(form, i: Optional[int] = None, j: Optional[None] = None):
             num_sub_elements = arguments[0].ufl_element().num_sub_elements
             forms = []
             for pi in range(num_sub_elements):
-                form_i = []
+                form_i: typing.List[typing.Optional[object]] = []
                 for pj in range(num_sub_elements):
                     f = fs.split(form, pi, pj)
                     if f.empty():

ufl/algorithms/signature.py

@@ -6,6 +6,7 @@
 # SPDX-License-Identifier:    LGPL-3.0-or-later
 
 import hashlib
+import typing
 
 from ufl.algorithms.domain_analysis import canonicalize_metadata
 from ufl.classes import (
@@ -20,6 +21,7 @@
     Label,
     MultiIndex,
 )
+from ufl.core.ufl_type import UFLObject
 from ufl.corealg.traversal import traverse_unique_terminals, unique_post_traversal
 
 
@@ -94,7 +96,7 @@ def compute_terminal_hashdata(expressions, renumbering):
 
 def compute_expression_hashdata(expression, terminal_hashdata) -> bytes:
     """Compute expression hashdata."""
-    cache = {}
+    cache: typing.Dict[UFLObject, bytes] = {}
 
     for expr in unique_post_traversal(expression):
         # Uniquely traverse tree and hash each node

ufl/algorithms/transformer.py

@@ -14,6 +14,7 @@
 # Modified by Anders Logg, 2009-2010
 
 import inspect
+import typing
 
 from ufl.algorithms.map_integrands import map_integrands
 from ufl.classes import Variable, all_ufl_classes
@@ -35,7 +36,7 @@ class Transformer(object):
     transform expression trees from one representation to another.
     """
 
-    _handlers_cache = {}
+    _handlers_cache: typing.Dict[type, typing.Tuple[str, bool]] = {}
 
     def __init__(self, variable_cache=None):
         """Initialise."""

ufl/constantvalue.py

@@ -10,6 +10,7 @@
 # Modified by Massimiliano Leoni, 2016.
 
 import numbers
+import typing
 from math import atan2
 
 import ufl
@@ -65,7 +66,7 @@ class Zero(ConstantValue):
 
     __slots__ = ("ufl_free_indices", "ufl_index_dimensions", "ufl_shape")
 
-    _cache = {}
+    _cache: typing.Dict[typing.Tuple[int], typing.Self] = {}
 
     def __getnewargs__(self):
         """Get new args."""
@@ -362,7 +363,7 @@ class IntValue(RealValue):
 
     __slots__ = ()
 
-    _cache = {}
+    _cache: typing.Dict[int, typing.Self] = {}
 
     def __getnewargs__(self):
         """Get new args."""

ufl/core/expr.py

@@ -16,9 +16,10 @@
 # Modified by Anders Logg, 2008
 # Modified by Massimiliano Leoni, 2016
 
+import typing
 import warnings
 
-from ufl.core.ufl_type import UFLType, update_ufl_type_attributes
+from ufl.core.ufl_type import UFLObject, UFLType, update_ufl_type_attributes
 
 
 class Expr(object, metaclass=UFLType):
@@ -204,10 +205,10 @@ def __init__(self):
 
     # A global dict mapping language_operator_name to the type it
     # produces
-    _ufl_language_operators_ = {}
+    _ufl_language_operators_: typing.Dict[str, object] = {}
 
     # List of all terminal modifier types
-    _ufl_terminal_modifiers_ = []
+    _ufl_terminal_modifiers_: typing.List[UFLObject] = []
 
     # --- Mechanism for profiling object creation and deletion ---
 

ufl/core/multiindex.py

@@ -8,6 +8,8 @@
 #
 # Modified by Massimiliano Leoni, 2016.
 
+import typing
+
 from ufl.core.terminal import Terminal
 from ufl.core.ufl_type import ufl_type
 from ufl.utils.counted import Counted
@@ -30,7 +32,7 @@ class FixedIndex(IndexBase):
 
     __slots__ = ("_hash", "_value")
 
-    _cache = {}
+    _cache: typing.Dict[int, typing.Self] = {}
 
     def __getnewargs__(self):
         """Get new args."""
@@ -116,7 +118,7 @@ class MultiIndex(Terminal):
 
     __slots__ = ("_indices",)
 
-    _cache = {}
+    _cache: typing.Dict[typing.Tuple[int], typing.Self] = {}
 
     def __getnewargs__(self):
         """Get new args."""

ufl/core/ufl_type.py

@@ -416,18 +416,18 @@ class UFLType(type):
     _ufl_handler_name_ = "ufl_type"
 
     # A global array of all Expr and BaseForm subclasses, indexed by typecode
-    _ufl_all_classes_ = []
+    _ufl_all_classes_: typing.List[UFLObject] = []
 
     # A global set of all handler names added
-    _ufl_all_handler_names_ = set()
+    _ufl_all_handler_names_: typing.Set[str] = set()
 
     # A global array of the number of initialized objects for each
     # typecode
-    _ufl_obj_init_counts_ = []
+    _ufl_obj_init_counts_: typing.List[int] = []
 
     # A global array of the number of deleted objects for each
     # typecode
-    _ufl_obj_del_counts_ = []
+    _ufl_obj_del_counts_: typing.List[int] = []
 
     # Type trait: If the type is abstract.  An abstract class cannot
     # be instantiated and does not need all properties specified.

ufl/corealg/multifunction.py

@@ -7,6 +7,7 @@
 #
 # Modified by Massimiliano Leoni, 2016
 
+import typing
 from inspect import signature
 
 from ufl.core.expr import Expr
@@ -46,7 +47,7 @@ class MultiFunction(object):
     algorithm object. Of course Python's function call overhead still applies.
     """
 
-    _handlers_cache = {}
+    _handlers_cache: typing.Dict[type, typing.Tuple[typing.List[str], bool]] = {}
 
     def __init__(self):
         """Initialise."""