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

Author: jhale

.github/workflows/build-wheels.yml

@@ -40,14 +40,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout FFCx
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           ref: ${{ github.event.inputs.ffcx_ref }}
       - name: Upgrade pip and setuptools
         run: python -m pip install setuptools pip build --upgrade
       - name: Build sdist and wheel
         run: python -m build .
-      - uses: actions/upload-artifact@v4
+      - uses: actions/upload-artifact@v7
         with:
           path: dist/* 
 
@@ -63,7 +63,7 @@ jobs:
       id-token: write
 
     steps:
-      - uses: actions/download-artifact@v5
+      - uses: actions/download-artifact@v8
         with:
           name: artifact
           path: dist
@@ -85,7 +85,7 @@ jobs:
       id-token: write
 
     steps:
-      - uses: actions/download-artifact@v5
+      - uses: actions/download-artifact@v8
         with:
           name: artifact
           path: dist

.github/workflows/dolfinx-tests.yml

@@ -34,8 +34,10 @@ jobs:
       PETSC_ARCH: linux-gnu-complex64-32
       OMPI_ALLOW_RUN_AS_ROOT: 1
       OMPI_ALLOW_RUN_AS_ROOT_CONFIRM: 1
+      PRTE_MCA_rmaps_default_mapping_policy: :oversubscribe   # Newer OpenMPI
+      OMPI_MCA_rmaps_base_oversubscribe: true                 # Older OpenMPI
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v6
       - name: Install UFL and Basix (default branches/tags)
         if: github.event_name != 'workflow_dispatch'
         run: |
@@ -51,14 +53,14 @@ jobs:
           pip3 install --break-system-packages .
       - name: Get DOLFINx source (default branch/tag)
         if: github.event_name != 'workflow_dispatch'
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: ./dolfinx
           repository: FEniCS/dolfinx
           ref: main
       - name: Get DOLFINx source (specified branch/tag)
         if: github.event_name == 'workflow_dispatch'
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: ./dolfinx
           repository: FEniCS/dolfinx

.github/workflows/pythonapp.yml

@@ -25,17 +25,12 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest]
-        python-version: ["3.10", "3.11", "3.12", "3.13"]
-        include:
-          - os: windows-2022
-            python-version: "3.11"
-          - os: macos-latest
-            python-version: "3.12"
+        os: ["windows-2022", "ubuntu-latest", "macos-latest"]
+        python-version: ["3.11", "3.12", "3.13", "3.14"]
 
     steps:
       - name: Checkout FFCx
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
 
       - name: Set up Python
         uses: actions/setup-python@v6
@@ -44,7 +39,7 @@ jobs:
 
       - name: Export GitHub Actions cache environment variables (Windows)
         if: runner.os == 'Windows'
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
         with:
           script: |
             core.exportVariable('ACTIONS_CACHE_URL', process.env.ACTIONS_CACHE_URL || '');
@@ -85,14 +80,14 @@ jobs:
         if: runner.os != 'Linux'
         run: pip install .[ci]
 
-      - name: Static check with mypy
-        run: mypy -p ffcx
-
       - name: ruff checks
         run: |
           ruff check .
           ruff format --check .
 
+      - name: Static check with mypy
+        run: mypy -p ffcx
+
       - name: Run unit tests
         run: >
           python -m pytest test/
@@ -109,7 +104,7 @@ jobs:
         continue-on-error: true
 
       - name: Upload pytest results
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: pytest-results-${{ matrix.os }}-${{ matrix.python-version }}
           path: junit/test-results-${{ matrix.os }}-${{ matrix.python-version }}.xml
@@ -122,15 +117,17 @@ jobs:
         uses: ilammy/msvc-dev-cmd@v1
 
       - name: Run FFCx demos
-        run: |
+        run: >
           pytest demo/test_demos.py
+          -W error
+          # -n auto
 
       - name: Build documentation
         run: |
           cd doc
-          make html
+          python -m sphinx -W -b html source/ build/html/
       - name: Upload documentation artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: doc-${{ matrix.os }}-${{ matrix.python-version }}
           path: doc/build/html/
@@ -139,7 +136,7 @@ jobs:
 
       - name: Checkout FEniCS/docs
         if: ${{ github.repository == 'FEniCS/ffcx' && ( github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/tags/') ) && runner.os == 'Linux' && matrix.python-version == 3.12 }}
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           repository: "FEniCS/docs"
           path: "docs"

.github/workflows/spack.yml

@@ -35,7 +35,7 @@ jobs:
           apt-get install -y g++ gfortran  # compilers
 
       - name: Get Spack
-        uses: actions/checkout@v5
+        uses: actions/checkout@v6
         with:
           path: ./spack
           repository: spack/spack

.mailmap

@@ -1,6 +1,8 @@
 cmake_minimum_required(VERSION 3.19)
 
-project(ufcx VERSION 0.10.0 DESCRIPTION "UFCx interface header for finite element kernels"
+# Development version: x.x.x.0
+# Release version: x.x.x
+project(ufcx VERSION 0.11.0.0 DESCRIPTION "UFCx interface header for finite element kernels"
   LANGUAGES C
   HOMEPAGE_URL https://github.com/fenics/ffcx)
 include(GNUInstallDirs)

INSTALL

@@ -27,7 +27,7 @@
 mesh = Mesh(coords)
 dx = dx(mesh)
 
-element = basix.ufl.element("P", mesh.ufl_cell().cellname(), 2)
+element = basix.ufl.element("P", mesh.ufl_cell().cellname, 2)
 space = FunctionSpace(mesh, element)
 
 u = TrialFunction(space)

cmake/CMakeLists.txt

@@ -2,12 +2,12 @@
 #
 # This file is part of FFCx.
 #
-# FFC is free software: you can redistribute it and/or modify
+# FFCx is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Lesser General Public License as published by
 # the Free Software Foundation, either version 3 of the License, or
 # (at your option) any later version.
 #
-# FFC is distributed in the hope that it will be useful,
+# FFCx is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU Lesser General Public License for more details.

demo/ComplexPoisson.py

@@ -33,12 +33,12 @@
 d = 3
 
 # Elements
-u_element = basix.ufl.element("P", cell.cellname(), 2, shape=(3,))
-p_element = basix.ufl.element("P", cell.cellname(), 1)
-A_element = basix.ufl.element("P", cell.cellname(), 1, shape=(3, 3))
+u_element = basix.ufl.element("P", cell.cellname, 2, shape=(3,))
+p_element = basix.ufl.element("P", cell.cellname, 1)
+A_element = basix.ufl.element("P", cell.cellname, 1, shape=(3, 3))
 
 # Spaces
-domain = Mesh(basix.ufl.element("Lagrange", cell.cellname(), 1, shape=(3,)))
+domain = Mesh(basix.ufl.element("Lagrange", cell.cellname, 1, shape=(3,)))
 u_space = FunctionSpace(domain, u_element)
 p_space = FunctionSpace(domain, p_element)
 A_space = FunctionSpace(domain, A_element)