Skip to content

Commit a55aa6c

Browse files
authored
Merge branch 'main' into Py314u
2 parents 5fcf715 + 9a428dc commit a55aa6c

57 files changed

Lines changed: 39 additions & 35 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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ dependencies:
1111
- sphinx
1212
- sphinx_rtd_theme
1313
- cloudpickle =3.1.1
14-
- h5py =3.14.0
14+
- h5py =3.15.0
1515
- jupyter-book =1.0.0
16-
- mpi4py =4.1.0
16+
- mpi4py =4.1.1
1717
- python =3.12
1818
- pyzmq =27.1.0

.ci_support/environment-integration.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
channels:
22
- conda-forge
33
dependencies:
4-
- h5py
4+
- h5py =3.15.0
55
- jupyter
6-
- mpi4py
7-
- numpy
6+
- mpi4py =4.1.1
7+
- numpy =2.3.3
88
- openmpi
99
- papermill
1010
- atomistics =0.3.0

.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
5+
- numpy =2.3.3
66
- cloudpickle =3.1.0
77
- hatchling =1.27.0
88
- hatch-vcs =0.5.0

.ci_support/environment-mpich.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
5+
- numpy =2.3.3
66
- mpich
77
- cloudpickle =3.1.1
8-
- h5py =3.14.0
8+
- h5py =3.15.0
99
- hatchling =1.27.0
1010
- hatch-vcs =0.5.0
1111
- ipython =9.0.2
12-
- mpi4py =4.1.0
12+
- mpi4py =4.1.1
1313
- networkx =3.4.2
1414
- pygraphviz =1.14
1515
- pysqa =0.3.2

.ci_support/environment-openmpi.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
5+
- numpy =2.3.3
66
- openmpi
77
- cloudpickle =3.1.1
8-
- h5py =3.14.0
8+
- h5py =3.15.0
99
- hatchling =1.27.0
1010
- hatch-vcs =0.5.0
1111
- ipython =9.0.2
12-
- mpi4py =4.1.0
12+
- mpi4py =4.1.1
1313
- networkx =3.4.2
1414
- pygraphviz =1.14
1515
- pysqa =0.3.2

.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
5+
- numpy =2.3.3
66
- msmpi
77
- cloudpickle =3.1.1
8-
- h5py =3.14.0
8+
- h5py =3.15.0
99
- hatchling =1.27.0
1010
- hatch-vcs =0.5.0
1111
- ipython =9.0.2
12-
- mpi4py =4.1.0
12+
- mpi4py =4.1.1
1313
- networkx =3.4.2
1414
- pygraphviz =1.14
1515
- pyzmq =27.1.0

.github/workflows/deploy.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
run: |
3232
cp .ci_support/environment-old.yml environment.yml
3333
python .ci_support/release.py; cat pyproject.toml
34-
git update-index --assume-unchanged pyproject.toml executorlib/_version.py
34+
git update-index --assume-unchanged pyproject.toml src/executorlib/_version.py
3535
hatchling build -t sdist -t wheel
3636
- name: Publish distribution 📦 to PyPI
3737
uses: pypa/gh-action-pypi-publish@release/v1

.github/workflows/pipeline.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- uses: psf/black@stable
1414
with:
1515
options: "--check --diff"
16-
src: ./${{ github.event.repository.name }}
16+
src: ./src/${{ github.event.repository.name }}
1717

1818
black_fix: # in most cases pre-commit is faster
1919
needs: [black]
@@ -29,7 +29,7 @@ jobs:
2929
uses: psf/black@stable
3030
with:
3131
options: ""
32-
src: "./${{ github.event.repository.name }}"
32+
src: "./src/${{ github.event.repository.name }}"
3333
- name: commit
3434
run: |
3535
git config --local user.email "pyiron@mpie.de"
@@ -55,7 +55,7 @@ jobs:
5555
- name: Install mypy
5656
run: pip install mypy
5757
- name: Test
58-
run: mypy --ignore-missing-imports ${{ github.event.repository.name }}
58+
run: mypy --ignore-missing-imports src/${{ github.event.repository.name }}
5959

6060
minimal:
6161
needs: [black]
@@ -457,7 +457,7 @@ jobs:
457457
timeout-minutes: 10
458458
run: |
459459
conda install -y pylint graphviz
460-
pyreverse -o png -p ./${{ github.event.repository.name }} ./${{ github.event.repository.name }}
460+
pyreverse -o png -p ./src/${{ github.event.repository.name }} ./src/${{ github.event.repository.name }}
461461
zip -m uml.zip *.png
462462
- uses: actions/upload-artifact@v4
463463
with:

.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.13.3
3+
rev: v0.14.0
44
hooks:
55
- id: ruff
66
name: ruff lint

binder/environment.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@ channels:
22
- conda-forge
33
dependencies:
44
- python
5-
- numpy
5+
- numpy =2.3.3
66
- openmpi
77
- cloudpickle =3.1.1
88
- flux-core =0.79.0
99
- flux-pmix =0.6.0
1010
- hatchling =1.27.0
1111
- hatch-vcs =0.5.0
12-
- h5py =3.12.1
12+
- h5py =3.15.0
1313
- ipython =9.0.2
1414
- matplotlib =3.10.0
15-
- mpi4py =4.1.0
15+
- mpi4py =4.1.1
1616
- networkx =3.4.2
1717
- pygraphviz =1.14
1818
- pysqa =0.3.2

0 commit comments

Comments
 (0)