Skip to content

Commit b2ceed1

Browse files
authored
Ubuntu 24.04 CI updates (#192)
* Remove libgl1-mesa-glx Not supported on ubuntu 24.04 * Remove pip from install action * No build isolation for h5py * Bump pip * reinstall pkgconfig * Bump version number to 0.8.0 * Fix pythonpath for 3.12
1 parent 00055fd commit b2ceed1

File tree

3 files changed

+16
-15
lines changed

3 files changed

+16
-15
lines changed

.github/actions/install-dependencies/action.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ name: Install dependencies
33
runs:
44
using: composite
55
steps:
6-
- name: Install apt dependencies and upgrade pip
7-
shell: bash -el {0}
8-
run: |
9-
apt-get update && apt-get install -y libgl1-mesa-glx libxrender1 xvfb
10-
python3 -m pip install -U pip
6+
- name: Install apt dependencies and upgrade pip
7+
shell: bash -el {0}
8+
run: |
9+
apt-get update && apt-get install -y libxrender1 xvfb

.github/workflows/test_nightly.yml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ jobs:
3232
uses: ./.github/actions/install-dependencies
3333

3434
- name: Install requirements
35-
run: python3 -m pip install --no-cache-dir --no-binary=h5py . --upgrade
35+
run: |
36+
python3 -m pip install --break-system-packages -U pip setuptools pkgconfig
37+
python3 -m pip install --no-build-isolation --break-system-packages --no-cache-dir --no-binary=h5py . --upgrade
3638
3739
- name: Test building the book
3840
run: PYVISTA_OFF_SCREEN=false jupyter-book build -W .
@@ -42,30 +44,30 @@ jobs:
4244
run: |
4345
export PKG_CONFIG_PATH=/usr/local/dolfinx-complex/lib/pkgconfig:$PKG_CONFIG_PATH
4446
export PETSC_ARCH=linux-gnu-complex128-32
45-
export PYTHONPATH=/usr/local/dolfinx-complex/lib/python3.10/dist-packages:$PYTHONPATH
47+
export PYTHONPATH=/usr/local/dolfinx-complex/lib/python3.12/dist-packages:$PYTHONPATH
4648
export LD_LIBRARY_PATH=/usr/local/dolfinx-complex/lib:$LD_LIBRARY_PATH
4749
python3 complex_mode.py
4850
mpirun -n 2 python3 complex_mode.py
4951
5052
- name: Test chapter 1
5153
working-directory: chapter1
5254
run: |
53-
python3 -c "from pyvista import start_xvfb; start_xvfb(0.1)"
54-
mpirun -n 2 python3 fundamentals_code.py
55-
mpirun -n 2 python3 nitsche.py
56-
mpirun -n 2 python3 membrane_code.py
55+
python3 -c "from pyvista import start_xvfb; start_xvfb(0.1)"
56+
mpirun -n 2 python3 fundamentals_code.py
57+
mpirun -n 2 python3 nitsche.py
58+
mpirun -n 2 python3 membrane_code.py
5759
5860
- name: Test chapter 2
5961
working-directory: chapter2
60-
run: |
62+
run: |
6163
mpirun -n 2 python3 diffusion_code.py
6264
mpirun -n 2 python3 heat_code.py
6365
mpirun -n 2 python3 linearelasticity_code.py
6466
mpirun -n 2 python3 hyperelasticity.py
6567
mpirun -n 2 python3 nonlinpoisson_code.py
6668
mpirun -n 2 python3 ns_code1.py
6769
mpirun -n 2 python3 ns_code2.py
68-
70+
6971
- name: Test chapter 3
7072
working-directory: chapter3
7173
run: |
@@ -75,7 +77,7 @@ jobs:
7577
mpirun -n 2 python3 robin_neumann_dirichlet.py
7678
mpirun -n 2 python3 component_bc.py
7779
mpirun -n 2 python3 em.py
78-
80+
7981
- name: Test chapter 4
8082
working-directory: chapter4
8183
run: |

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
44

55
[project]
66
name = "DOLFINx_Tutorial"
7-
version = "0.7.2"
7+
version = "0.8.0"
88
dependencies = [
99
"jupyter-book",
1010
"meshio",

0 commit comments

Comments
 (0)