From 6a6ab73afa59f5187235fe11d3f2936fcb6bd45e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Schartum=20Dokken?= <dokken92@gmail.com>
Date: Tue, 15 Oct 2024 12:29:31 +0200
Subject: [PATCH] Move release into main (#133)

* Include algorithm

* systematically add from future import annotations (#87)

for Python 3.8 annotation compatibility

* Sort imports for safe MPI initialization

* Add scalar constraint to inelastic condition (#99)
Bump dolfinx versions

* Use numpy.floating instead of explicit types

* Fix docker images

* Another lib fix

* Fix floating type

* Fix typo in version

* Check docker image build on CI (#116)

* Make post release fix

* Update build instructions

* Fix max normal component in contact slip

* Pin nanobind version in build requirements and bump version

* Revert branches

---------

Co-authored-by: Min RK <benjaminrk@gmail.com>
---
 .github/workflows/build_docs.yml |  8 ++++----
 .github/workflows/docker.yml     | 12 ++++++++++++
 .github/workflows/sonarcloud.yml |  2 +-
 .github/workflows/test_mpc.yml   | 10 +++++-----
 Changelog.md                     |  4 ++++
 docker/Dockerfile                |  3 ++-
 python/pyproject.toml            |  4 ----
 7 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build_docs.yml b/.github/workflows/build_docs.yml
index e3358977..205556aa 100644
--- a/.github/workflows/build_docs.yml
+++ b/.github/workflows/build_docs.yml
@@ -22,10 +22,10 @@ jobs:
       - name: Install DOLFINx
         uses: jorgensd/actions/install-dolfinx@v0.3
         with:
-          dolfinx: main
-          ufl: main
-          ffcx: main
-          basix: main
+          dolfinx: v0.9.0
+          ufl: 2024.2.0
+          ffcx: v0.9.0
+          basix: v0.9.0
           petsc_arch: ${PETSC_ARCH}
 
       - name: Install DOLFINx-MPC (C++)
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index ffcd2354..faf0fa84 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -57,6 +57,18 @@ jobs:
       - name: Build and push Docker image
         uses: docker/build-push-action@v6
         if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
+        with:
+          context: .
+          load: true
+          push: false
+          file: docker/Dockerfile
+          platforms: linux/amd64
+          tags: ${{ steps.meta.outputs.tags }}
+          labels: ${{ steps.meta.outputs.labels }}
+
+      - name: Build and push Docker image
+        uses: docker/build-push-action@v5
+        if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
         with:
           context: .
           push: true
diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
index 1937364a..93a55787 100644
--- a/.github/workflows/sonarcloud.yml
+++ b/.github/workflows/sonarcloud.yml
@@ -74,7 +74,7 @@ jobs:
           basix: main
           ufl: main
           ffcx: main
-  
+
       - name: Run build-wrapper
         run: |
           cmake -S ./cpp -B build-mpc
diff --git a/.github/workflows/test_mpc.yml b/.github/workflows/test_mpc.yml
index a733a031..2259db1d 100644
--- a/.github/workflows/test_mpc.yml
+++ b/.github/workflows/test_mpc.yml
@@ -14,7 +14,7 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
-    container: ghcr.io/fenics/dolfinx/dolfinx:nightly
+    container: ghcr.io/fenics/dolfinx/dolfinx:stable
 
     strategy:
       matrix:
@@ -37,10 +37,10 @@ jobs:
         #   - CC: clang
         #     CXX: c++
     env:
-      DOLFINX_BRANCH: main
-      BASIX_BRANCH: main
-      UFL_BRANCH: main
-      FFCX_BRANCH: main
+      DOLFINX_BRANCH: v0.9.0
+      BASIX_BRANCH: v0.9.0
+      UFL_BRANCH: 2024.2.0
+      FFCX_BRANCH: v0.9.0
 
       CC: ${{ matrix.CC }}
       CXX: ${{ matrix.CXX }}
diff --git a/Changelog.md b/Changelog.md
index a2ec6983..425cec4f 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,10 @@
 
 - No changes
 
+## v0.9.0
+
+- No major API changes, only following DOLFINx API changes
+
 ## v0.8.0
 
 - **API**
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 0fcef728..cac97c0b 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -1,4 +1,4 @@
-FROM ghcr.io/fenics/dolfinx/dolfinx:nightly
+FROM ghcr.io/fenics/dolfinx/dolfinx:stable
 
 WORKDIR /tmp
 
@@ -17,6 +17,7 @@ RUN python3 -m pip install  meshio
 
 # Copy DOLFINX_MPC source dir
 COPY . dolfinx_mpc
+RUN python3 -m pip install -U pip setuptools
 
 # Install real mode
 RUN . /usr/local/bin/dolfinx-real-mode && \
diff --git a/python/pyproject.toml b/python/pyproject.toml
index 8bc80de6..44e2a09b 100644
--- a/python/pyproject.toml
+++ b/python/pyproject.toml
@@ -1,7 +1,3 @@
-# The DOLFINx Python interface must be built without build isolation (PEP517)
-# due to its runtime and build time dependency on system built petsc4py and
-# mpi4py.
-# pip install -r build-requirements.txt
 [build-system]
 requires = [
       "scikit-build-core[pyproject]",