Skip to content

Commit 6a6ab73

Browse files
jorgensdminrk
andauthored
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>
1 parent 4546f6a commit 6a6ab73

File tree

7 files changed

+28
-15
lines changed

7 files changed

+28
-15
lines changed

.github/workflows/build_docs.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ jobs:
2222
- name: Install DOLFINx
2323
uses: jorgensd/actions/install-dolfinx@v0.3
2424
with:
25-
dolfinx: main
26-
ufl: main
27-
ffcx: main
28-
basix: main
25+
dolfinx: v0.9.0
26+
ufl: 2024.2.0
27+
ffcx: v0.9.0
28+
basix: v0.9.0
2929
petsc_arch: ${PETSC_ARCH}
3030

3131
- name: Install DOLFINx-MPC (C++)

.github/workflows/docker.yml

+12
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,18 @@ jobs:
5757
- name: Build and push Docker image
5858
uses: docker/build-push-action@v6
5959
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
60+
with:
61+
context: .
62+
load: true
63+
push: false
64+
file: docker/Dockerfile
65+
platforms: linux/amd64
66+
tags: ${{ steps.meta.outputs.tags }}
67+
labels: ${{ steps.meta.outputs.labels }}
68+
69+
- name: Build and push Docker image
70+
uses: docker/build-push-action@v5
71+
if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v')
6072
with:
6173
context: .
6274
push: true

.github/workflows/sonarcloud.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ jobs:
7474
basix: main
7575
ufl: main
7676
ffcx: main
77-
77+
7878
- name: Run build-wrapper
7979
run: |
8080
cmake -S ./cpp -B build-mpc

.github/workflows/test_mpc.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ on:
1414
jobs:
1515
build:
1616
runs-on: ubuntu-latest
17-
container: ghcr.io/fenics/dolfinx/dolfinx:nightly
17+
container: ghcr.io/fenics/dolfinx/dolfinx:stable
1818

1919
strategy:
2020
matrix:
@@ -37,10 +37,10 @@ jobs:
3737
# - CC: clang
3838
# CXX: c++
3939
env:
40-
DOLFINX_BRANCH: main
41-
BASIX_BRANCH: main
42-
UFL_BRANCH: main
43-
FFCX_BRANCH: main
40+
DOLFINX_BRANCH: v0.9.0
41+
BASIX_BRANCH: v0.9.0
42+
UFL_BRANCH: 2024.2.0
43+
FFCX_BRANCH: v0.9.0
4444

4545
CC: ${{ matrix.CC }}
4646
CXX: ${{ matrix.CXX }}

Changelog.md

+4
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@
44

55
- No changes
66

7+
## v0.9.0
8+
9+
- No major API changes, only following DOLFINx API changes
10+
711
## v0.8.0
812

913
- **API**

docker/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM ghcr.io/fenics/dolfinx/dolfinx:nightly
1+
FROM ghcr.io/fenics/dolfinx/dolfinx:stable
22

33
WORKDIR /tmp
44

@@ -17,6 +17,7 @@ RUN python3 -m pip install meshio
1717

1818
# Copy DOLFINX_MPC source dir
1919
COPY . dolfinx_mpc
20+
RUN python3 -m pip install -U pip setuptools
2021

2122
# Install real mode
2223
RUN . /usr/local/bin/dolfinx-real-mode && \

python/pyproject.toml

-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,3 @@
1-
# The DOLFINx Python interface must be built without build isolation (PEP517)
2-
# due to its runtime and build time dependency on system built petsc4py and
3-
# mpi4py.
4-
# pip install -r build-requirements.txt
51
[build-system]
62
requires = [
73
"scikit-build-core[pyproject]",

0 commit comments

Comments
 (0)