Skip to content

Commit

Permalink
Move release into main (#133)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>
  • Loading branch information
jorgensd and minrk authored Oct 15, 2024
1 parent 4546f6a commit 6a6ab73
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 15 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/build_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ jobs:
- name: Install DOLFINx
uses: jorgensd/actions/[email protected]
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++)
Expand Down
12 changes: 12 additions & 0 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/sonarcloud.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ jobs:
basix: main
ufl: main
ffcx: main

- name: Run build-wrapper
run: |
cmake -S ./cpp -B build-mpc
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/test_mpc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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 }}
Expand Down
4 changes: 4 additions & 0 deletions Changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@

- No changes

## v0.9.0

- No major API changes, only following DOLFINx API changes

## v0.8.0

- **API**
Expand Down
3 changes: 2 additions & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM ghcr.io/fenics/dolfinx/dolfinx:nightly
FROM ghcr.io/fenics/dolfinx/dolfinx:stable

WORKDIR /tmp

Expand All @@ -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 && \
Expand Down
4 changes: 0 additions & 4 deletions python/pyproject.toml
Original file line number Diff line number Diff line change
@@ -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]",
Expand Down

0 comments on commit 6a6ab73

Please sign in to comment.