Merge branch 'main' into release

Author: jhale

.github/workflows/build-wheels.yml

@@ -40,40 +40,34 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout FFCx
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         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@v2
+      - uses: actions/upload-artifact@v4
         with:
           path: dist/*
-
   upload_pypi:
     name: Upload to PyPI (optional)
     needs: [build]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: artifact
           path: dist
-
       - name: Publish to PyPI
-        uses: pypa/gh-action-pypi-publish@v1.5.1
+        uses: pypa/gh-action-pypi-publish@release/v1
         if: ${{ github.event.inputs.pypi_publish == 'true' }}
         with:
           user: __token__
           password: ${{ secrets.PYPI_TOKEN }}
           repository_url: https://upload.pypi.org/legacy/
-
       - name: Publish to Test PyPI
-        uses: pypa/gh-action-pypi-publish@v1.5.1
+        uses: pypa/gh-action-pypi-publish@release/v1
         if: ${{ github.event.inputs.test_pypi_publish == 'true' }}
         with:
           user: __token__

.github/workflows/dolfin-tests.yml renamed to .github/workflows/dolfinx-tests.yml

@@ -25,24 +25,13 @@ jobs:
   build:
     name: Run DOLFINx tests
     runs-on: ubuntu-latest
-    container: fenicsproject/test-env:nightly-openmpi
-
+    container: ghcr.io/fenics/test-env:current-openmpi
     env:
-      PETSC_ARCH: linux-gnu-complex-32
+      PETSC_ARCH: linux-gnu-complex64-32
       OMPI_ALLOW_RUN_AS_ROOT: 1
       OMPI_ALLOW_RUN_AS_ROOT_CONFIRM: 1
-      OMPI_MCA_rmaps_base_oversubscribe: 1
-      OMPI_MCA_plm: isolated
-      OMPI_MCA_btl_vader_single_copy_mechanism: none
-      OMPI_MCA_mpi_yield_when_idle: 1
-      OMPI_MCA_hwloc_base_binding_policy: none
-
     steps:
-      - uses: actions/checkout@v3
-      - name: Install dependencies (Python)
-        run: |
-          python3 -m pip install --upgrade pip
-
+      - uses: actions/checkout@v4
       - name: Install UFL and Basix (default branches/tags)
         if: github.event_name != 'workflow_dispatch'
         run: |
@@ -53,33 +42,30 @@ jobs:
         run: |
           python3 -m pip install git+https://github.com/FEniCS/ufl.git@${{ github.event.inputs.ufl_ref }}
           python3 -m pip install git+https://github.com/FEniCS/basix.git@${{ github.event.inputs.basix_ref }}
-
       - name: Install FFCx
         run: |
           pip3 install .
-
       - name: Get DOLFINx source (default branch/tag)
         if: github.event_name != 'workflow_dispatch'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: ./dolfinx
           repository: FEniCS/dolfinx
           ref: main
       - name: Get DOLFINx source (specified branch/tag)
         if: github.event_name == 'workflow_dispatch'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: ./dolfinx
           repository: FEniCS/dolfinx
           ref: ${{ github.event.inputs.dolfinx_ref }}
-
-      - name: Install DOLFINx
+      - name: Install DOLFINx (C++)
         run: |
           cmake -G Ninja -DCMAKE_BUILD_TYPE=Developer -B build -S dolfinx/cpp/
           cmake --build build
           cmake --install build
-          pip3 -v install --global-option build --global-option --debug dolfinx/python/
-
+      - name: Install DOLFINx (Python)
+        run: python3 -m pip -v install --check-build-dependencies --no-build-isolation dolfinx/python/
       - name: Build DOLFINx C++ unit tests
         run: |
           cmake -G Ninja -DCMAKE_BUILD_TYPE=Developer -B build/test/ -S dolfinx/cpp/test/
@@ -88,7 +74,6 @@ jobs:
         run: |
           cd build/test
           ctest -V --output-on-failure -R unittests
-
       - name: Run DOLFINx Python unit tests
         run: python3 -m pytest -n auto dolfinx/python/test/unit
       - name: Run DOLFINx Python demos

.github/workflows/pythonapp.yml

@@ -13,7 +13,6 @@ on:
   pull_request:
     branches:
       - main
-
   workflow_dispatch:
 
 jobs:
@@ -22,107 +21,68 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        python-version: ['3.8', '3.9', '3.10', "3.11"]
-
-    env:
-      CC: gcc-10
-      CXX: g++-10
-
+        python-version: ['3.9', '3.10', '3.11', '3.12']
     steps:
       - name: Checkout FFCx
-        uses: actions/checkout@v3
-
+        uses: actions/checkout@v4
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
           python-version: ${{ matrix.python-version }}
-
       - name: Install dependencies (non-Python, Linux)
         if: runner.os == 'Linux'
         run: |
           sudo apt-get install -y graphviz libgraphviz-dev ninja-build pkg-config
-
       - name: Install dependencies (non-Python, macOS)
         if: runner.os == 'macOS'
         run: brew install graphviz ninja pkg-config
-
       - name: Install FEniCS dependencies (Python)
         run: |
-          python -m pip install git+https://github.com/FEniCS/ufl.git@release
-          python -m pip install git+https://github.com/FEniCS/basix.git@release
-
+          pip install git+https://github.com/FEniCS/ufl.git
+          pip install git+https://github.com/FEniCS/basix.git
       - name: Install FFCx
-        run: |
-          python -m pip install .[ci]
-
-      - name: Lint with flake8
-        run: |
-          python -m flake8 --statistics ffcx/ test/
-
+        run: pip install .[ci]
       - name: Static check with mypy
+        run: mypy ffcx/
+        if: matrix.python-version != '3.12'
+      - name: ruff checks
         run: |
-          python -m mypy ffcx/
-        if: matrix.python-version != '3.11'
-
-      - name: isort checks (non-blocking)
-        continue-on-error: true
-        run: |
-          python3 -m isort --check .
-
-      - name: Check documentation style
-        run: |
-          python -m pydocstyle .
-
+          ruff check .
+          ruff format --check .
       - name: Run units tests
-        run: |
-          python -m pytest -n auto --cov=ffcx/ --junitxml=junit/test-results-${{ matrix.os }}-${{ matrix.python-version }}.xml test/
-
+        run: python -m pytest -n auto --cov=ffcx/ --junitxml=junit/test-results-${{ matrix.os }}-${{ matrix.python-version }}.xml test/
       - name: Upload to Coveralls
         if: ${{ github.repository == 'FEniCS/ffcx' && github.head_ref == '' && matrix.os == 'ubuntu-latest' && matrix.python-version == '3.8' }}
         env:
           COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
-        run: |
-          python -m coveralls
+        run: coveralls
         continue-on-error: true
-
       - name: Upload pytest results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: pytest-results-${{ matrix.os }}-${{ matrix.python-version }}
           path: junit/test-results-${{ matrix.os }}-${{ matrix.python-version }}.xml
         # Use always() to always run this step to publish test results
         # when there are test failures
         if: always()
-
-      - name: Get UFL
-        uses: actions/checkout@v3
-        with:
-          path: ./ufl
-          repository: FEniCS/ufl
-          ref: main
-
-      - name: Run FFCx and UFL demos
+      - name: Run FFCx demos
         run: |
-          mv ufl/demo/* demo/
           pytest demo/test_demos.py
           rm -Rf ufl/
-
       - name: Build documentation
         run: |
           cd doc
           make html
-
       - name: Upload documentation artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: doc-${{ matrix.os }}-${{ matrix.python-version }}
           path: doc/build/html/
           retention-days: 2
           if-no-files-found: error
-
       - 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.8 }}
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           repository: "FEniCS/docs"
           path: "docs"

.github/workflows/spack.yml

@@ -0,0 +1,67 @@
+name: Spack install
+
+on:
+  # Uncomment the below 'push' to trigger on push
+  # push:
+  #  branches:
+  #    - "**"
+  schedule:
+    # '*' is a special character in YAML, so string must be quoted
+    - cron: "0 2 * * SUN"
+  workflow_dispatch:
+    inputs:
+      spack_repo:
+        description: "Spack repository to test"
+        default: "spack/spack"
+        type: string
+      spack_ref:
+        description: "Spack repository branch/tag to test"
+        default: "develop"
+        type: string
+      ffcx_version:
+        description: "Spack build tag"
+        default: "main"
+        type: string
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container: ubuntu:latest
+    steps:
+      - name: Install Spack requirements
+        run: |
+          apt-get -y update
+          apt-get install -y bzip2 curl file git gzip make patch python3-minimal tar xz-utils
+          apt-get install -y g++ gfortran  # compilers
+
+      - name: Get Spack
+        if: github.event_name != 'workflow_dispatch'
+        uses: actions/checkout@v4
+        with:
+          path: ./spack
+          repository: spack/spack
+      - name: Get Spack
+        if: github.event_name == 'workflow_dispatch'
+        uses: actions/checkout@v4
+        with:
+          path: ./spack
+          repository: ${{ github.event.inputs.spack_repo }}
+          ref: ${{ github.event.inputs.spack_ref }}
+
+      - name: Install FFCx and run tests
+        if: github.event_name != 'workflow_dispatch'
+        run: |
+          . ./spack/share/spack/setup-env.sh
+          spack env create ffcx-main
+          spack env activate ffcx-main
+          spack add py-fenics-ffcx@main
+          spack install --test=root
+
+      - name: Install FFCx and run tests
+        if: github.event_name == 'workflow_dispatch'
+        run: |
+          . ./spack/share/spack/setup-env.sh
+          spack env create ffcx-testing
+          spack env activate ffcx-testing
+          spack add py-fenics-ffcx@${{ github.event.inputs.ffcx_version }}
+          spack install --test=root

.isort.cfg

@@ -60,6 +60,9 @@ Contributors:
     Ivan Yashchuk
     email: [email protected]
 
+    Matthew Scroggs
+    email: [email protected]
+    www:   https://mscroggs.co.uk
 
 Credits for UFC
 ===============

AUTHORS

@@ -1,4 +1,5 @@
-The header file ufcx.h is released into the public domain.
+The header file ufcx.h is released using the UNLICENSE. See UNLICENSE for the
+license text.
 
 ------------------------------------------------------------------------------
 

LICENSE

@@ -1,6 +1,7 @@
 # FFCx: The FEniCSx Form Compiler
 
 [![FFCx CI](https://github.com/FEniCS/ffcx/actions/workflows/pythonapp.yml/badge.svg)](https://github.com/FEniCS/ffcx/actions/workflows/pythonapp.yml)
+[![Spack install](https://github.com/FEniCS/ffcx/actions/workflows/spack.yml/badge.svg)](https://github.com/FEniCS/ffcx/actions/workflows/spack.yml)
 [![Coverage Status](https://coveralls.io/repos/github/FEniCS/ffcx/badge.svg?branch=main)](https://coveralls.io/github/FEniCS/ffcx?branch=main)
 
 FFCx is a new version of the FEniCS Form Compiler. It is being actively

README.md

@@ -0,0 +1,22 @@
+The software in the file ufcx.h is free and unencumbered software released into
+the public domain.
+
+Anyone is free to copy, modify, publish, use, compile, sell, or distribute this
+software, either in source code form or as a compiled binary, for any purpose,
+commercial or non-commercial, and by any means.
+
+In jurisdictions that recognize copyright laws, the author or authors of this
+software dedicate any and all copyright interest in the software to the public
+domain. We make this dedication for the benefit of the public at large and to
+the detriment of our heirs and successors. We intend this dedication to be an
+overt act of relinquishment in perpetuity of all present and future rights to
+this software under copyright law.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+For more information, please refer to <https://unlicense.org>