diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml index 87ee07e0..de428cb9 100644 --- a/.github/workflows/sonarcloud.yml +++ b/.github/workflows/sonarcloud.yml @@ -67,8 +67,11 @@ jobs: uses: jorgensd/actions/install-dolfinx@v0.2.0 with: petsc_arch: ${PETSC_ARCH} - dolfinx: main - + dolfinx: v0.8.0 + basix: v0.8.0 + ufl: 2024.1.0.post0 + ffcx: v0.8.0 + - name: Run build-wrapper run: | cmake -S ./cpp -B build-mpc diff --git a/docker/Dockerfile b/docker/Dockerfile index 0555bbd1..054f434f 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -9,6 +9,8 @@ ARG PYTHON_VERSION=3.10 ENV HDF5_MPI="ON" \ HDF5_DIR="/usr/local" +RUN python3 -m pip install -U pip setuptools + # Install h5py https://github.com/h5py/h5py/issues/2222 RUN python3 -m pip install --no-cache-dir --no-binary=h5py git+https://github.com/h5py/h5py.git RUN python3 -m pip install meshio @@ -21,7 +23,7 @@ RUN . /usr/local/bin/dolfinx-real-mode && \ . /usr/local/dolfinx-real/lib/dolfinx/dolfinx.conf && \ cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/usr/local/dolfinx-real -DCMAKE_BUILD_TYPE=Developer -B build-dir-real dolfinx_mpc/cpp/ && \ ninja install -j4 -C build-dir-real && \ - python3 -m pip install -v --target /usr/local/dolfinx-real/lib/python${PYTHON_VERSION}/dist-packages --no-dependencies --no-cache-dir dolfinx_mpc/python + python3 -m pip install -v --no-build-isolation --check-build-dependencies --no-dependencies --target /usr/local/dolfinx-real/lib/python${PYTHON_VERSION}/dist-packages --config-settings=cmake.build-type=Developer -e dolfinx_mpc/python/[test] # Clean repo to remove build dir from pip RUN rm -rf dolfinx_mpc/python/build @@ -31,6 +33,6 @@ RUN . /usr/local/bin/dolfinx-complex-mode && \ . /usr/local/dolfinx-complex/lib/dolfinx/dolfinx.conf && \ cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/usr/local/dolfinx-complex -DCMAKE_BUILD_TYPE=Developer -B build-dir-complex dolfinx_mpc/cpp/ && \ ninja install -j4 -C build-dir-complex && \ - python3 -m pip install -v --target /usr/local/dolfinx-complex/lib/python${PYTHON_VERSION}/dist-packages --no-dependencies --no-cache-dir dolfinx_mpc/python + python3 -m pip install -v --no-build-isolation --check-build-dependencies --no-dependencies --target /usr/local/dolfinx-complex/lib/python${PYTHON_VERSION}/dist-packages --config-settings=cmake.build-type=Developer -e dolfinx_mpc/python/[test] WORKDIR /root