python/dune/codegen/generation/cache.py

@@ -15,7 +15,7 @@ def _freeze(data):
     """ A function that deterministically generates an
     immutable item from the given data. Used for cache key generation.
     """
-    from collections import Hashable, Iterable, MutableMapping
+    from collections.abc import Hashable, Iterable, MutableMapping
 
     # Strings are iterable and hashable, but they do not pose any problems.
     if isinstance(data, str):
@@ -260,7 +260,7 @@ def retrieve_cache_items(condition=True, make_generable=False):
         counted_ones.extend(_filter_cache_items(gen, condition).values())
 
     for item in sorted(counted_ones, key=lambda i: i.count):
-        from collections import Iterable
+        from collections.abc import Iterable
         if isinstance(item.value, Iterable) and not isinstance(item.value, str):
             for l in item.value:
                 yield as_generable(l)

python/dune/codegen/ufl/preprocess.py

@@ -45,6 +45,7 @@ def preprocess_form(form):
                                                           uc.JacobianInverse,
                                                           ),
                                  do_estimate_degrees=not get_form_option("quadrature_order"),
+                                 do_append_everywhere_integrals=False,
                                  )
 
     formdata.preprocessed_form = apply_default_transformations(formdata.preprocessed_form)

python/test/dune/codegen/generation/test_cache.py

-from collections import Counter
+from collections.abc import Counter
 
 from dune.codegen.generation import (
     delete_cache_items,