Merge remote-tracking branch 'origin/main' into release

Author: jhale

.github/workflows/all.yml

@@ -20,7 +20,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        python-version: ["3.10", "3.11", "3.12", "3.13", "3.14"]
+        python-version: ["3.11", "3.12", "3.13", "3.14"]
         include:
           - os: windows-latest
             python-version: "3.13"

.github/workflows/fenicsx-tests.yml

@@ -6,12 +6,9 @@ on:
   pull_request:
     branches:
       - main
-
   push:
     branches:
       - release
-    tags: "**"
-
   # Weekly build on Mondays at 8 am
   schedule:
     - cron: "0 8 * * 1"
@@ -89,7 +86,7 @@ jobs:
           ref: main
       - name: Install DOLFINx
         run: |
-          cmake -G Ninja -DCMAKE_BUILD_TYPE=Developer -DDOLFINX_ENABLE_ADIOS2=true -B build -S dolfinx/cpp/
+          cmake -G Ninja -DCMAKE_BUILD_TYPE=Developer -B build -S dolfinx/cpp/
           cmake --build build
           cmake --install build
           python3 -m pip install scikit-build-core

pyproject.toml

@@ -17,7 +17,7 @@ description = "Unified Form Language"
 readme = "README.md"
 license = "LGPL-3.0-or-later"
 license-files = ["COPYING*"]
-requires-python = ">=3.10.0"
+requires-python = ">=3.11"
 dependencies = ["numpy"]
 
 [project.urls]

test/test_classcoverage.py

@@ -5,8 +5,8 @@
 from utils import LagrangeElement, MixedElement
 
 import ufl
-from ufl import *  # noqa: F403
 from ufl import (
+    H1,  # noqa: F401
     And,
     Argument,
     CellDiameter,
@@ -116,8 +116,8 @@
     all_ufl_classes,
 )
 
-has_repr = set()
-has_dict = set()
+has_repr: set[str] = set()
+has_dict: set[str] = set()
 
 
 def _test_object(a, shape, free_indices):

ufl/measure.py

@@ -287,6 +287,7 @@ def __call__(
         subdomain_data=None,
         degree=None,
         scheme=None,
+        intersect_measures=None,
     ):
         """Reconfigure measure with new domain specification or metadata."""
         # Let syntax dx() mean integral over everywhere
@@ -324,6 +325,7 @@ def __call__(
             domain=domain,
             metadata=metadata,
             subdomain_data=subdomain_data,
+            intersect_measures=intersect_measures,
         )
 
     def __str__(self):