Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump base/atomistics/pymatgen together #1119

Merged
merged 29 commits into from
Aug 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
a09a51a
Bump base/atomistics together
pmrv Aug 2, 2024
2497b84
[dependabot skip] Update env file
pyiron-runner Aug 2, 2024
1c81916
Update environment.yml
jan-janssen Aug 2, 2024
f74444d
Update environment.yml
jan-janssen Aug 2, 2024
74c93a2
[dependabot skip] Update env file
pyiron-runner Aug 2, 2024
c0a6ab5
Update environment.yml
jan-janssen Aug 2, 2024
8da42a9
[dependabot skip] Update env file
pyiron-runner Aug 2, 2024
bbb213d
Update environment.yml
jan-janssen Aug 2, 2024
90d8084
[dependabot skip] Update env file
pyiron-runner Aug 2, 2024
98fb619
Update environment.yml
jan-janssen Aug 2, 2024
04f304c
[dependabot skip] Update env file
pyiron-runner Aug 2, 2024
c475e37
Adjust envs to setup.py
pmrv Aug 2, 2024
ca4c85d
Update environment.yml
jan-janssen Aug 2, 2024
3c228b8
Update environment.yml
jan-janssen Aug 2, 2024
9fc026a
[dependabot skip] Update env file
pyiron-runner Aug 2, 2024
258c396
Update setup.py
jan-janssen Aug 2, 2024
c6c8221
Fix black
jan-janssen Aug 2, 2024
30d7a8c
Update creator.py
jan-janssen Aug 2, 2024
6ecd1a4
Update weekly.yml
jan-janssen Aug 2, 2024
9d5d400
Update release.yml
jan-janssen Aug 2, 2024
85e8700
Update push-pull.yml
jan-janssen Aug 2, 2024
7ec4a53
Update pr-target-opened.yml
jan-janssen Aug 2, 2024
4d17f3d
Update pr-labeled.yml
jan-janssen Aug 2, 2024
8e45db9
Update dependabot-pr.yml
jan-janssen Aug 2, 2024
d799169
Update daily.yml
jan-janssen Aug 2, 2024
a300e73
Update push-pull.yml
jan-janssen Aug 2, 2024
bc89796
[dependabot skip] Update env file
pyiron-runner Aug 2, 2024
3307fd3
Update environment.yml
jan-janssen Aug 2, 2024
60c6948
[dependabot skip] Update env file
pyiron-runner Aug 2, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 5 additions & 7 deletions .binder/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,20 @@ dependencies:
- codacy-coverage
- matplotlib =3.8.3
- numpy =1.26.4
- pyiron_base =0.9.10
- pyiron_atomistics =0.6.1
- pyiron_snippets =0.1.1
- pyiron_base =0.9.11
- pyiron_atomistics =0.6.10
- pyiron_snippets =0.1.3
- pyparsing =3.1.2
- scipy =1.12.0
- scipy =1.13.0
- seaborn =0.13.2
- scikit-image =0.24.0
- randspg =0.0.1
- boto3 =1.34.122
- moto =5.0.9
- pycp2k =0.2.2
- aws-sam-translator =1.77.0
- distributed =2024.5.2
- h5io_browser =0.0.17
- pymatgen =2024.5.1
- pympipool =0.8.4
- pymatgen =2024.7.18
- python >= 3.10
- lammps
- nglview >=3.0.8
Expand Down
12 changes: 5 additions & 7 deletions .ci_support/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,17 @@ dependencies:
- codacy-coverage
- matplotlib =3.8.3
- numpy =1.26.4
- pyiron_base =0.9.10
- pyiron_atomistics =0.6.9
- pyiron_snippets =0.1.1
- pyiron_base =0.9.11
- pyiron_atomistics =0.6.10
- pyiron_snippets =0.1.3
- pyparsing =3.1.2
- scipy =1.12.0
- scipy =1.13.0
- seaborn =0.13.2
- scikit-image =0.24.0
- randspg =0.0.1
- boto3 =1.34.122
- moto =5.0.9
- pycp2k =0.2.2
- aws-sam-translator =1.77.0
- distributed =2024.5.2
- h5io_browser =0.0.17
- pymatgen =2024.5.1
- pympipool =0.8.4
- pymatgen =2024.7.18
4 changes: 2 additions & 2 deletions .github/workflows/daily.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ on:

jobs:
codeql:
uses: pyiron/actions/.github/workflows/tests-and-coverage.yml@actions-1.1.0b
secrets: inherit
uses: pyiron/actions/.github/workflows/tests-and-coverage.yml@actions-3.2.1
secrets: inherit
4 changes: 2 additions & 2 deletions .github/workflows/dependabot-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ on:

jobs:
pyiron:
uses: pyiron/actions/.github/workflows/dependabot-pr.yml@actions-1.1.0b
secrets: inherit
uses: pyiron/actions/.github/workflows/dependabot-pr.yml@actions-3.2.1
secrets: inherit
4 changes: 2 additions & 2 deletions .github/workflows/pr-labeled.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ on:

jobs:
pyiron:
uses: pyiron/actions/.github/workflows/pr-labeled.yml@actions-1.1.0b
secrets: inherit
uses: pyiron/actions/.github/workflows/pr-labeled.yml@actions-3.2.1
secrets: inherit
4 changes: 2 additions & 2 deletions .github/workflows/pr-target-opened.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ on:

jobs:
pyiron:
uses: pyiron/actions/.github/workflows/pr-target-opened.yml@actions-1.1.0b
secrets: inherit
uses: pyiron/actions/.github/workflows/pr-target-opened.yml@actions-3.2.1
secrets: inherit
4 changes: 2 additions & 2 deletions .github/workflows/push-pull.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ on:

jobs:
pyiron:
uses: pyiron/actions/.github/workflows/push-pull-main.yml@actions-1.1.0b
uses: pyiron/actions/.github/workflows/push-pull.yml@actions-3.2.1
secrets: inherit
with:
notebooks-env-files: .ci_support/environment.yml .ci_support/environment-notebooks.yml
notebooks-env-files: .ci_support/environment.yml .ci_support/environment-notebooks.yml
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ on:

jobs:
pyiron:
uses: pyiron/actions/.github/workflows/release.yml@actions-1.1.0b
secrets: inherit
uses: pyiron/actions/.github/workflows/release.yml@actions-3.2.1
secrets: inherit
4 changes: 2 additions & 2 deletions .github/workflows/weekly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@ on:

jobs:
codeql:
uses: pyiron/actions/.github/workflows/codeql.yml@actions-1.1.0b
secrets: inherit
uses: pyiron/actions/.github/workflows/codeql.yml@actions-3.2.1
secrets: inherit
13 changes: 6 additions & 7 deletions docs/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,24 @@ dependencies:
- nbsphinx
- sphinx-gallery
- sphinx-rtd-theme
- versioneer
- ase =3.23.0
- coveralls
- coverage
- codacy-coverage
- matplotlib =3.8.3
- numpy =1.26.4
- pyiron_base =0.9.10
- pyiron_atomistics =0.6.1
- pyiron_snippets =0.1.1
- pyiron_base =0.9.11
- pyiron_atomistics =0.6.10
- pyiron_snippets =0.1.3
- pyparsing =3.1.2
- scipy =1.12.0
- scipy =1.13.0
- seaborn =0.13.2
- scikit-image =0.24.0
- randspg =0.0.1
- boto3 =1.34.122
- moto =5.0.9
- pycp2k =0.2.2
- aws-sam-translator =1.77.0
- distributed =2024.5.2
- h5io_browser =0.0.17
- pymatgen =2024.5.1
- pympipool =0.8.4
- pymatgen =2024.7.18
2 changes: 1 addition & 1 deletion pyiron_contrib/jobfactories/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -355,7 +355,7 @@ def _prepare_job(self, job, structure):
try:
job.potential[k] = v
except AttributeError:
pass # element k does not exist in the current structure
pass # element k does not exist in the current structure
if self.storage.nband_nelec_map is not None:
# ensure we apply the hack only for structures where we know an NBAND estimate for all elements
elems = set(self.storage.nband_nelec_map.keys())
Expand Down
2 changes: 1 addition & 1 deletion pyiron_contrib/tinybase/creator.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@

import ase.build

from pympipool import Executor as PyMPIPoolExecutor
from executorlib import Executor as PyMPIPoolExecutor
from dask.distributed import Client, LocalCluster


Expand Down
8 changes: 4 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@
'matplotlib==3.8.3',
'numpy==1.26.4',
'pyiron_snippets==0.1.3',
'pyiron_base==0.9.10',
'scipy==1.12.0',
'pyiron_base==0.9.11',
'scipy==1.13.0',
'seaborn==0.13.2',
'pyparsing==3.1.2',
],
extras_require={
'atomistic': [
'ase==3.23.0',
'pyiron_atomistics==0.6.9',
'pyiron_atomistics==0.6.10',
'pycp2k==0.2.2',
],
'fenics': [
Expand All @@ -55,7 +55,7 @@
],
'tinybase': [
'distributed==2024.5.2',
'pymatgen==2024.5.1',
'pymatgen==2024.7.18',
'pympipool==0.8.4',
'h5io_browser==0.0.17',
]
Expand Down
Loading