diff --git a/.github/workflows/book_stable.yml b/.github/workflows/book_stable.yml index 840f7b83..b33b0a8d 100644 --- a/.github/workflows/book_stable.yml +++ b/.github/workflows/book_stable.yml @@ -15,7 +15,7 @@ env: jobs: build-book: runs-on: ubuntu-latest - container: ghcr.io/fenics/dolfinx/lab:v0.7.0 + container: ghcr.io/fenics/dolfinx/lab:v0.7.1 env: PYVISTA_TRAME_SERVER_PROXY_PREFIX: "/proxy/" diff --git a/.github/workflows/test_nightly.yml b/.github/workflows/test_nightly.yml index 07ce1ee8..484fe202 100644 --- a/.github/workflows/test_nightly.yml +++ b/.github/workflows/test_nightly.yml @@ -17,7 +17,7 @@ jobs: test-nightly: # The type of runner that the job will run on runs-on: ubuntu-latest - container: ghcr.io/fenics/dolfinx/lab:nightly + container: ghcr.io/fenics/dolfinx/lab:v0.7.1 env: HDF5_MPI: "ON" diff --git a/.github/workflows/test_stable.yml b/.github/workflows/test_stable.yml index 280eadab..6b9bc42e 100644 --- a/.github/workflows/test_stable.yml +++ b/.github/workflows/test_stable.yml @@ -20,7 +20,7 @@ jobs: test: # The type of runner that the job will run on runs-on: ubuntu-latest - container: ghcr.io/fenics/dolfinx/lab:v0.7.0 + container: ghcr.io/fenics/dolfinx/lab:v0.7.1 env: PYVISTA_OFF_SCREEN: true diff --git a/Changelog.md b/Changelog.md index 18b5cf6e..685ff8c6 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,5 +1,9 @@ # Changelog +## v0.7.1 + - No API changes, release due to various bug-fixes from the 0.7.0 release, see: + https://github.com/FEniCS/dolfinx/releases/tag/v0.7.1 for more information + ## v0.7.0 - Renamed `dolfinx.graph.create_adjacencylist` to `dolfinx.graph.adjacencylist` diff --git a/Dockerfile b/Dockerfile index f88a8b37..59e0ad18 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM ghcr.io/jorgensd/dolfinx-tutorial:v0.7.0 +FROM ghcr.io/jorgensd/dolfinx-tutorial:v0.7.1 # create user with a home directory ARG NB_USER=jovyan diff --git a/_config.yml b/_config.yml index 2dd11584..11695961 100644 --- a/_config.yml +++ b/_config.yml @@ -8,7 +8,7 @@ logo: fenics_logo.png # Force re-execution of notebooks on each build. # See https://jupyterbook.org/content/execute.html execute: - execute_notebooks: force + execute_notebooks: cache # Set timeout for any example to 20 minutes timeout: 1800 @@ -35,6 +35,11 @@ sphinx: config: html_last_updated_fmt: "%b %d, %Y" suppress_warnings: ["mystnb.unknown_mime_type"] + + # To avoid warning about default changing due to + # https://github.com/pydata/pydata-sphinx-theme/issues/1492 + html_theme_options: + navigation_with_keys: false parse: myst_enable_extensions: - "amsmath" diff --git a/docker/Dockerfile b/docker/Dockerfile index f9b6f8a8..6987ffec 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,6 +1,6 @@ # Execute from root of repo as: docker buildx build --platform=linux/arm64,linux/amd64 -f docker/Dockerfile ./docker/ --progress=plain -FROM ghcr.io/fenics/dolfinx/lab:v0.7.0 +FROM ghcr.io/fenics/dolfinx/lab:v0.7.1 ARG TARGETPLATFORM diff --git a/docker/LocalDockerfile b/docker/LocalDockerfile deleted file mode 100644 index 3b6dc201..00000000 --- a/docker/LocalDockerfile +++ /dev/null @@ -1,61 +0,0 @@ -FROM dolfinx/dev-env:nightly - - -WORKDIR /tmp/ - -ADD requirements.txt /tmp/requirements.txt - -ARG UFL_BRANCH=main -ARG FFCX_BRANCH=main -ARG BASIX_BRANCH=main -ARG DOLFINX_BRANCH=main -ARG BUILD_TYPE=Release -ARG PETSC_ARCH=linux-gnu-real64-32 -ARG HDF5_DIR="/usr/local" -ARG HDF5_MPI="ON" -# Can be set to "notebook" -ARG JUPYTER_TYPE="lab" - - -# Install python dependencies -RUN pip3 install --upgrade pip -RUN HDF5_MPI=${HDF5_MPI} CC=mpicc HDF5_DIR=${HDF5_DIR} pip3 install --no-cache-dir -r requirements.txt - -# pyvista dependencies from apt -RUN apt-get -qq update && \ - apt-get -y install libgl1-mesa-dev xvfb && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* /var/tmp/* - -# Install components from dolfinx/lab -RUN pip3 install pyvista matplotlib pythreejs ipygany && \ - pip3 cache purge && \ - jupyter nbextension enable --py --sys-prefix ipygany - -# Install basix, ffcx, ufl -RUN git clone https://github.com/FEniCS/basix.git && \ - cd basix && \ - git checkout ${BASIX_BRANCH} && \ - cd .. && \ - cmake -G Ninja -B build-basix -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -S ./basix/cpp/ && \ - cmake --build build-basix --parallel 3 && \ - cmake --install build-basix && \ - BUILD_TYPE=${BUILD_TYPE} pip3 install ./basix/python && \ - python3 -m pip install git+https://github.com/FEniCS/ufl.git@${UFL_BRANCH} && \ - python3 -m pip install git+https://github.com/FEniCS/ffcx.git@${FFCX_BRANCH} - -# Install DOLFINX -RUN git clone https://github.com/FEniCS/dolfinx.git && \ - cd dolfinx && \ - git checkout ${DOLFINX_BRANCH} && \ - cd .. && \ - PETSC_ARCH=${PETSC_ARCH} cmake -G Ninja -DCMAKE_BUILD_TYPE=${DOLFINX_BUILD_TYPE} -B build-dolfinx -S ./dolfinx/cpp/ && \ - cmake --build build-dolfinx && \ - cmake --install build-dolfinx && \ - . /usr/local/lib/dolfinx/dolfinx.conf && \ - PETSC_ARCH=${PETSC_ARCH} BUILD_TYPE=${BUILD_TYPE} python3 -m pip -v install ./dolfinx/python/ - -EXPOSE 8888/tcp - -ENV SHELL /bin/bash -ENTRYPOINT ["jupyter", ${JUPYTER_TYPE}, "--ip", "0.0.0.0", "--no-browser", "--allow-root"] diff --git a/docker/requirements.txt b/docker/requirements.txt index d9bec96e..768e58b6 100644 --- a/docker/requirements.txt +++ b/docker/requirements.txt @@ -19,4 +19,4 @@ pandas tqdm # Pyvista -pyvista[all] \ No newline at end of file +pyvista[all] diff --git a/fem.md b/fem.md index e2ae3387..3c5e3feb 100644 --- a/fem.md +++ b/fem.md @@ -40,13 +40,13 @@ The tutorial uses several dependencies for meshing, plotting and timings. A comp To use the notebooks in this tutorial with DOLFINx on your own computer, you should use the docker image using the following command: ```bash - docker run --init -p 8888:8888 -v "$(pwd)":/root/shared ghcr.io/jorgensd/dolfinx-tutorial:v0.7.0 + docker run --init -p 8888:8888 -v "$(pwd)":/root/shared ghcr.io/jorgensd/dolfinx-tutorial:v0.7.1 ``` This image can also be used as a normal docker container by adding: ```bash - docker run --ti -v "$(pwd)":/root/shared --entrypoint="/bin/bash" ghcr.io/jorgensd/dolfinx-tutorial:v0.7.0 + docker run --ti -v "$(pwd)":/root/shared --entrypoint="/bin/bash" ghcr.io/jorgensd/dolfinx-tutorial:v0.7.1 ``` The tutorials can also be exported as a notebook or PDF by clicking the ![Download](save.png)-symbol in the top right corner of the relevant tutorial. The notebook can in turn be used with a Python kernel which has DOLFINx. @@ -58,7 +58,7 @@ The [Dockerfile](https://github.com/FEniCS/dolfinx/blob/main/docker/Dockerfile) provides a definitive build recipe. As the DOLFINx docker images are hosted at Docker-hub, one can directly access the image: ``` -docker run dolfinx/dolfinx:v0.7.0 +docker run dolfinx/dolfinx:v0.7.1 ``` There are several ways of customizing a docker container, such as mounting volumes/sharing folder, setting a working directory, sharing graphical interfaces etc. See `docker run --help` for an extensive list.