Skip to content

Commit

Permalink
Update all CIs to use latest images for stable release (#34)
Browse files Browse the repository at this point in the history
* Update all CIs to use latest images for stable release

* Fix images

* Use ufl legacy

* Update readme

* Bump version and add dolfinx version requirement
  • Loading branch information
jorgensd authored Oct 15, 2023
1 parent 6a17338 commit d6a4c97
Show file tree
Hide file tree
Showing 8 changed files with 12 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
DEB_PYTHON_INSTALL_LAYOUT: deb_system

runs-on: ubuntu-22.04
container: dolfinx/dolfinx:nightly
container: dolfinx/dolfinx:v0.7.0
steps:
# This action sets the current path to the root of your github repo
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/check_formatting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
DEB_PYTHON_INSTALL_LAYOUT: deb_system

runs-on: ubuntu-22.04
container: dolfinx/dolfinx:nightly
container: dolfinx/dolfinx:v0.7.0
steps:
# This action sets the current path to the root of your github repo
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/create_legacy_data.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ env:
jobs:
create-data:
runs-on: "ubuntu-22.04"
container: ghcr.io/scientificcomputing/fenics:test_2023.1.0
container: ghcr.io/scientificcomputing/fenics-gmsh:jupterlab-2023-08-31
steps:
- uses: actions/checkout@v4

Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/deploy_pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,16 @@ jobs:
path: "./public/code-coverage-report"

- name: Upload artifact
uses: actions/upload-pages-artifact@v1
uses: actions/upload-pages-artifact@v2
with:
path: "./public"

- name: Checkout
uses: actions/checkout@v4

- name: Setup Pages
uses: actions/configure-pages@v2
uses: actions/configure-pages@v3

- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v1
uses: actions/deploy-pages@v2
2 changes: 1 addition & 1 deletion .github/workflows/test_package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
test-code:
runs-on: "ubuntu-22.04"
needs: [create-datasets, check-formatting]
container: ghcr.io/fenics/dolfinx/dolfinx:nightly
container: ghcr.io/fenics/dolfinx/dolfinx:v0.7.0
env:
DEB_PYTHON_INSTALL_LAYOUT: deb_system
PYTHONPATH: /usr/local/lib/python3/dist-packages:/usr/local/lib:/usr/local/dolfinx-real/lib/python3.10/dist-packages
Expand Down
6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,17 @@ This is an experimental library for checkpoint with [DOLFINx](https://github.com

## Docker
ADIOS2 is installed in the official DOLFINx containers.
To get access to the Python interface of ADIOS2 (inside dolfinx docker images), you might have to extend your Python-path:
```bash
docker run -ti -v $(pwd):/root/shared -w /root/shared --name=dolfinx-checkpoint ghcr.io/fenics/dolfinx/dolfinx:nightly
export PYTHONPATH=/usr/local/lib/python3/dist-packages:$PYTHONPATH
```

## Conda
To use with conda (DOLFINx release v0.6.1 works with v0.1.0 of ADIOS4DOLFINx)
To use with conda (DOLFINx release v0.7.0 works with v0.7.1 of ADIOS4DOLFINx)
```bash
conda create -n dolfinx-checkpoint python=3.10
conda activate dolfinx-checkpoint
conda install -c conda-forge fenics-dolfinx pip adios2 numba
python3 -m pip install git+https://github.com/jorgensd/adios4dolfinx@v0.1.0
python3 -m pip install git+https://github.com/jorgensd/adios4dolfinx@v0.7.1
```

# Long term plan
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ requires = ["setuptools>=61.0.0", "wheel"]

[project]
name = "adios4dolfinx"
version = "0.7.0"
version = "0.7.1"
description = "Wrappers for reading/writing DOLFINx meshes/functions with ADIOS2"
authors = [{ name = "Jørgen S. Dokken", email = "[email protected]" }]
license = { file = "LICENSE" }
readme = "README.md"

dependencies = ["fenics-dolfinx>=0.7.0"]

[project.optional-dependencies]
test = ["pytest", "coverage"]
Expand Down
2 changes: 1 addition & 1 deletion tests/create_legacy_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import os
import pathlib
import argparse
import ufl
import ufl_legacy as ufl


def create_reference_data(
Expand Down

0 comments on commit d6a4c97

Please sign in to comment.