Skip to content

Commit 8d48ab1

Browse files
authored
Merge branch 'main' into Py314u
2 parents cf8c7f4 + 1ec85bf commit 8d48ab1

66 files changed

Lines changed: 1634 additions & 944 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.ci_support/environment-docs.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,19 @@ channels:
22
- conda-forge
33
dependencies:
44
- flux-core
5-
- hatchling
6-
- hatch-vcs
5+
- hatchling =1.30.1
6+
- hatch-vcs =0.5.0
77
- myst-parser
88
- nbsphinx
99
- numpy
1010
- openmpi
1111
- sphinx
12+
- sphinxcontrib-mermaid
1213
- sphinx_rtd_theme
1314
- cloudpickle =3.1.2
14-
- h5py =3.15.1
15+
- h5py =3.16.0
1516
- jupyter-book =1.0.0
16-
- mpi4py =4.1.1
17+
- mpi4py =4.1.2
1718
- python =3.12
18-
- pydantic =2.12.5
19+
- pydantic =2.13.4
1920
- pyzmq =27.1.0
Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
channels:
22
- conda-forge
33
dependencies:
4-
- h5py =3.15.1
4+
- h5py =3.16.0
55
- jupyter
6-
- mpi4py =4.1.1
6+
- mpi4py =4.1.2
77
- numpy =2.3.5
88
- openmpi
99
- papermill
10-
- atomistics =0.3.4
10+
- atomistics =0.3.6
1111
- cloudpickle =3.1.2
1212
- flux-core =0.81.0
1313
- flux-pmix =0.6.0
1414
- gpaw =25.7.0
15-
- hatchling =1.28.0
15+
- hatchling =1.30.1
1616
- hatch-vcs =0.5.0
1717
- ipython =9.9.0
1818
- matplotlib =3.10.8
1919
- networkx =3.6.1
20-
- pydantic =2.12.5
20+
- pydantic =2.13.4
2121
- pygraphviz =1.14
22-
- pysqa =0.3.5
22+
- pysqa =0.4.2
2323
- pyzmq =27.1.0
2424
- qe =7.5

.ci_support/environment-mini.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ dependencies:
44
- python
55
- numpy =2.4.2
66
- cloudpickle =3.1.0
7-
- hatchling =1.28.0
7+
- hatchling =1.30.1
88
- hatch-vcs =0.5.0
99
- pyzmq =27.1.0

.ci_support/environment-mpich.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ dependencies:
55
- numpy =2.4.2
66
- mpich
77
- cloudpickle =3.1.2
8-
- h5py =3.15.1
9-
- hatchling =1.28.0
8+
- h5py =3.16.0
9+
- hatchling =1.30.1
1010
- hatch-vcs =0.5.0
1111
- ipython =9.9.0
12-
- mpi4py =4.1.1
12+
- mpi4py =4.1.2
1313
- networkx =3.6.1
14-
- pydantic =2.12.5
14+
- pydantic =2.13.4
1515
- pygraphviz =1.14
16-
- pysqa =0.3.5
16+
- pysqa =0.4.2
1717
- pyzmq =27.1.0

.ci_support/environment-openmpi.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ dependencies:
55
- numpy =2.4.2
66
- openmpi
77
- cloudpickle =3.1.2
8-
- h5py =3.15.1
9-
- hatchling =1.28.0
8+
- h5py =3.16.0
9+
- hatchling =1.30.1
1010
- hatch-vcs =0.5.0
1111
- ipython =9.9.0
12-
- mpi4py =4.1.1
12+
- mpi4py =4.1.2
1313
- networkx =3.6.1
14-
- pydantic =2.12.5
14+
- pydantic =2.13.4
1515
- pygraphviz =1.14
16-
- pysqa =0.3.5
16+
- pysqa =0.4.2
1717
- pyzmq =27.1.0

.ci_support/environment-win.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ dependencies:
55
- numpy =2.4.2
66
- msmpi
77
- cloudpickle =3.1.2
8-
- h5py =3.15.1
9-
- hatchling =1.28.0
8+
- h5py =3.16.0
9+
- hatchling =1.30.1
1010
- hatch-vcs =0.5.0
1111
- ipython =9.9.0
12-
- mpi4py =4.1.1
12+
- mpi4py =4.1.2
1313
- networkx =3.6.1
14-
- pydantic =2.12.5
14+
- pydantic =2.13.4
1515
- pygraphviz =1.14
1616
- pyzmq =27.1.0

.github/workflows/pipeline.yml

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,11 @@ name: Pipeline
33
on:
44
push:
55
branches: [ main ]
6+
paths-ignore:
7+
- 'docs/**'
68
pull_request:
9+
paths-ignore:
10+
- 'docs/**'
711

812
jobs:
913
black:
@@ -98,6 +102,18 @@ jobs:
98102
pip install . --no-deps --no-build-isolation
99103
pip check
100104
105+
uv_check:
106+
needs: [black]
107+
runs-on: ubuntu-latest
108+
steps:
109+
- uses: actions/checkout@v4
110+
- uses: astral-sh/setup-uv@v7
111+
- name: Install the project and pip check
112+
shell: bash -l {0}
113+
run: |
114+
uv sync --all-extras --dev
115+
pip check
116+
101117
benchmark:
102118
needs: [black]
103119
runs-on: ${{ matrix.operating-system }}
@@ -164,7 +180,7 @@ jobs:
164180
papermill notebooks/1-single-node.ipynb notebooks/1-single-node-out.ipynb -k python3
165181
flux start papermill notebooks/2-hpc-cluster.ipynb notebooks/2-hpc-cluster-out.ipynb -k python3
166182
flux start papermill notebooks/3-hpc-job.ipynb notebooks/3-hpc-job-out.ipynb -k python3
167-
papermill notebooks/4-developer.ipynb notebooks/4-developer-out.ipynb -k python3
183+
papermill notebooks/5-developer.ipynb notebooks/5-developer-out.ipynb -k python3
168184
169185
notebooks_integration:
170186
needs: [black]
@@ -186,8 +202,8 @@ jobs:
186202
shell: bash -l {0}
187203
timeout-minutes: 20
188204
run: |
189-
flux start papermill notebooks/5-1-gpaw.ipynb notebooks/5-1-gpaw-out.ipynb -k python3
190-
flux start papermill notebooks/5-2-quantum-espresso.ipynb notebooks/5-2-quantum-espresso-out.ipynb -k python3
205+
flux start papermill notebooks/4-1-gpaw.ipynb notebooks/4-1-gpaw-out.ipynb -k python3
206+
flux start papermill notebooks/4-2-quantum-espresso.ipynb notebooks/4-2-quantum-espresso-out.ipynb -k python3
191207
192208
unittest_flux_mpich:
193209
needs: [black]
@@ -442,7 +458,7 @@ jobs:
442458
GH_TOKEN: ${{secrets.GITHUB_TOKEN}}
443459

444460
uml:
445-
needs: [unittest_slurm_mpich, unittest_old, unittest_win, unittest_openmpi, unittest_mpich, unittest_flux_openmpi, unittest_flux_mpich, notebooks, benchmark, minimal, pip_check, mypy]
461+
needs: [uv_check, unittest_slurm_mpich, unittest_old, unittest_win, unittest_openmpi, unittest_mpich, unittest_flux_openmpi, unittest_flux_mpich, notebooks, benchmark, minimal, pip_check, mypy]
446462
runs-on: ubuntu-latest
447463
steps:
448464
- uses: actions/checkout@v4

0 commit comments

Comments
 (0)