Skip to content

Commit e429527

Browse files
authored
Merge branch 'main' into Py314u
2 parents df6a761 + 0ebd469 commit e429527

72 files changed

Lines changed: 505 additions & 101 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-integration.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ dependencies:
44
- h5py =3.15.1
55
- jupyter
66
- mpi4py =4.1.1
7-
- numpy =2.3.3
7+
- numpy =2.3.5
88
- openmpi
99
- papermill
1010
- atomistics =0.3.4
@@ -14,10 +14,10 @@ dependencies:
1414
- gpaw =25.7.0
1515
- hatchling =1.28.0
1616
- hatch-vcs =0.5.0
17-
- ipython =9.0.2
18-
- matplotlib =3.10.6
19-
- networkx =3.4.2
17+
- ipython =9.9.0
18+
- matplotlib =3.10.8
19+
- networkx =3.6.1
2020
- pygraphviz =1.14
21-
- pysqa =0.3.3
21+
- pysqa =0.3.4
2222
- pyzmq =27.1.0
2323
- qe =7.5

.ci_support/environment-mini.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ channels:
22
- conda-forge
33
dependencies:
44
- python
5-
- numpy =2.3.3
5+
- numpy =2.4.2
66
- cloudpickle =3.1.0
77
- hatchling =1.28.0
88
- hatch-vcs =0.5.0

.ci_support/environment-mpich.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ channels:
22
- conda-forge
33
dependencies:
44
- python
5-
- numpy =2.3.3
5+
- numpy =2.4.2
66
- mpich
77
- cloudpickle =3.1.2
88
- h5py =3.15.1
99
- hatchling =1.28.0
1010
- hatch-vcs =0.5.0
11-
- ipython =9.0.2
11+
- ipython =9.9.0
1212
- mpi4py =4.1.1
13-
- networkx =3.4.2
13+
- networkx =3.6.1
1414
- pygraphviz =1.14
15-
- pysqa =0.3.3
15+
- pysqa =0.3.4
1616
- pyzmq =27.1.0

.ci_support/environment-openmpi.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@ channels:
22
- conda-forge
33
dependencies:
44
- python
5-
- numpy =2.3.3
5+
- numpy =2.4.2
66
- openmpi
77
- cloudpickle =3.1.2
88
- h5py =3.15.1
99
- hatchling =1.28.0
1010
- hatch-vcs =0.5.0
11-
- ipython =9.0.2
11+
- ipython =9.9.0
1212
- mpi4py =4.1.1
13-
- networkx =3.4.2
13+
- networkx =3.6.1
1414
- pygraphviz =1.14
15-
- pysqa =0.3.3
15+
- pysqa =0.3.4
1616
- pyzmq =27.1.0

.ci_support/environment-win.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ channels:
22
- conda-forge
33
dependencies:
44
- python
5-
- numpy =2.3.3
5+
- numpy =2.4.2
66
- msmpi
77
- cloudpickle =3.1.2
88
- h5py =3.15.1
99
- hatchling =1.28.0
1010
- hatch-vcs =0.5.0
11-
- ipython =9.0.2
11+
- ipython =9.9.0
1212
- mpi4py =4.1.1
13-
- networkx =3.4.2
13+
- networkx =3.6.1
1414
- pygraphviz =1.14
1515
- pyzmq =27.1.0

.github/workflows/pipeline.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ jobs:
218218
timeout-minutes: 5
219219
run: >
220220
flux start
221-
python -m unittest tests/test_fluxpythonspawner.py tests/test_fluxjobexecutor_plot.py tests/test_fluxjobexecutor.py tests/test_fluxclusterexecutor.py;
221+
python -m unittest tests/unit/task_scheduler/interactive/test_spawner_flux.py tests/unit/executor/test_flux_job_plot.py tests/unit/executor/test_flux_job.py tests/unit/executor/test_flux_cluster.py;
222222
223223
unittest_flux_openmpi:
224224
needs: [black]
@@ -249,7 +249,7 @@ jobs:
249249
timeout-minutes: 5
250250
run: >
251251
flux start
252-
coverage run -a -m unittest tests/test_fluxpythonspawner.py tests/test_fluxjobexecutor_plot.py tests/test_fluxjobexecutor.py tests/test_fluxclusterexecutor.py;
252+
coverage run -a -m unittest tests/unit/task_scheduler/interactive/test_spawner_flux.py tests/unit/executor/test_flux_job_plot.py tests/unit/executor/test_flux_job.py tests/unit/executor/test_flux_cluster.py;
253253
coverage report;
254254
coverage xml
255255
env:
@@ -289,11 +289,11 @@ jobs:
289289
timeout-minutes: 5
290290
run: |
291291
pip install . --no-deps --no-build-isolation
292-
cd tests
292+
cd tests/unit
293293
sinfo -o "%n %e %m %a %c %C"
294294
srun --mpi=list
295-
python -m unittest test_slurmjobexecutor.py
296-
python -m unittest test_slurmclusterexecutor.py
295+
python -m unittest executor/test_slurm_job.py
296+
python -m unittest executor/test_slurm_cluster.py
297297
298298
unittest_mpich:
299299
needs: [black]

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/astral-sh/ruff-pre-commit
3-
rev: v0.14.10
3+
rev: v0.14.14
44
hooks:
55
- id: ruff
66
name: ruff lint

binder/environment.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ dependencies:
1010
- hatchling =1.28.0
1111
- hatch-vcs =0.5.0
1212
- h5py =3.15.1
13-
- ipython =9.0.2
13+
- ipython =9.9.0
1414
- matplotlib =3.10.0
1515
- mpi4py =4.1.1
16-
- networkx =3.4.2
16+
- networkx =3.6.1
1717
- pygraphviz =1.14
1818
- pysqa =0.3.3
1919
- pyzmq =27.1.0

notebooks/1-single-node.ipynb

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

pyproject.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,25 +44,25 @@ Repository = "https://github.com/pyiron/executorlib"
4444
cache = ["h5py==3.15.1"]
4545
graph = [
4646
"pygraphviz==1.14",
47-
"networkx==3.4.2",
47+
"networkx==3.6.1",
4848
]
4949
graphnotebook = [
5050
"pygraphviz==1.14",
51-
"networkx==3.4.2",
52-
"ipython==9.0.2",
51+
"networkx==3.6.1",
52+
"ipython==9.9.0",
5353
]
5454
mpi = ["mpi4py==4.1.1"]
5555
cluster = [
56-
"pysqa==0.3.3",
56+
"pysqa==0.3.4",
5757
"h5py==3.15.1",
5858
]
5959
all = [
6060
"mpi4py==4.1.1",
61-
"pysqa==0.3.3",
61+
"pysqa==0.3.4",
6262
"h5py==3.15.1",
6363
"pygraphviz==1.14",
64-
"networkx==3.4.2",
65-
"ipython==9.0.2",
64+
"networkx==3.6.1",
65+
"ipython==9.9.0",
6666
]
6767

6868
[tool.ruff]

0 commit comments

Comments
 (0)