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

Merge main #236

Merged
merged 175 commits into from
Apr 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
175 commits
Select commit Hold shift + click to select a range
a2ba0b0
Rename output parameter to output_keys
jan-janssen Jan 8, 2024
fe31aef
Merge remote-tracking branch 'origin/main' into outputkeys
jan-janssen Jan 8, 2024
2fce739
Format black
pyiron-runner Jan 8, 2024
bacb132
more fixes
jan-janssen Jan 8, 2024
d31fff8
Merge remote-tracking branch 'origin/outputkeys' into outputkeys
jan-janssen Jan 8, 2024
33bb53b
fix test
jan-janssen Jan 8, 2024
c02d8d9
Merge pull request #180 from pyiron/outputkeys
jan-janssen Jan 8, 2024
4c3fe24
Rename fields() to keys()
jan-janssen Jan 8, 2024
66f8a8b
Format black
pyiron-runner Jan 8, 2024
68e9f3d
Introduce get_thermal_expansion_output() function
jan-janssen Jan 8, 2024
c662ce4
Format black
pyiron-runner Jan 8, 2024
df26979
Initialise Output classes only in the functions
jan-janssen Jan 8, 2024
faac2f3
Merge pull request #182 from pyiron/rename_fields
jan-janssen Jan 8, 2024
0836b22
Merge remote-tracking branch 'origin/main' into local_initialization
jan-janssen Jan 8, 2024
6203b0f
Merge remote-tracking branch 'origin/main' into get_thermal_expansion…
jan-janssen Jan 8, 2024
995216f
more fixes
jan-janssen Jan 8, 2024
5ddb9f6
Merge pull request #183 from pyiron/get_thermal_expansion_output
jan-janssen Jan 8, 2024
a7c6968
Merge remote-tracking branch 'origin/main' into local_initialization
jan-janssen Jan 8, 2024
98d88b6
more fixes
jan-janssen Jan 8, 2024
7541a57
Format black
pyiron-runner Jan 8, 2024
7d8fb09
Merge pull request #184 from pyiron/local_initialization
jan-janssen Jan 8, 2024
a445f27
Bump gpaw from 23.9.1 to 24.1.0
dependabot[bot] Jan 8, 2024
6c0568d
[dependabot skip] Update environment
github-actions[bot] Jan 8, 2024
b0491c8
Merge pull request #185 from pyiron/dependabot/pip/gpaw-24.1.0
jan-janssen Jan 8, 2024
509806a
Define output classes based on instances rather than classes
jan-janssen Jan 9, 2024
830a428
Merge remote-tracking branch 'origin/main' into output_instance
jan-janssen Jan 9, 2024
02c130d
Format black
pyiron-runner Jan 9, 2024
8b8930a
Output: Call get() function with parameter names
jan-janssen Jan 9, 2024
94bf490
Format black
pyiron-runner Jan 9, 2024
299796a
Merge pull request #186 from pyiron/output_instance
jan-janssen Jan 9, 2024
6b16725
Merge remote-tracking branch 'origin/main' into get_function
jan-janssen Jan 9, 2024
2f45e0e
ASE: rename internal helper function for MD
jan-janssen Jan 9, 2024
85fa8d3
Merge pull request #187 from pyiron/get_function
jan-janssen Jan 9, 2024
c4e846e
Merge branch 'main' into ase_calc_md
jan-janssen Jan 9, 2024
ed36551
Merge pull request #188 from pyiron/ase_calc_md
jan-janssen Jan 10, 2024
88e48b0
Delete .github/delete-merged-branch-config.yml
jan-janssen Jan 11, 2024
3079a50
Merge pull request #191 from pyiron/jan-janssen-patch-1
jan-janssen Jan 11, 2024
ad9e876
Bump jinja2 from 3.1.2 to 3.1.3
dependabot[bot] Jan 15, 2024
a815f8d
[dependabot skip] Update environment
github-actions[bot] Jan 15, 2024
6984336
Merge pull request #192 from pyiron/dependabot/pip/jinja2-3.1.3
jan-janssen Jan 15, 2024
d29e202
Add mace as another test
jan-janssen Jan 18, 2024
044b80d
use latest interface
jan-janssen Jan 18, 2024
19389a8
fix results
jan-janssen Jan 18, 2024
21b344a
Add more tests
jan-janssen Jan 18, 2024
75f8b1a
Merge pull request #193 from pyiron/mace
jan-janssen Jan 18, 2024
701e8fe
Update pyproject.toml
jan-janssen Jan 22, 2024
d2878d0
Update environment-docs.yml
jan-janssen Jan 22, 2024
cfe87a7
Update environment-lammps.yml
jan-janssen Jan 22, 2024
27a02f1
Update environment-notebooks.yml
jan-janssen Jan 22, 2024
963521b
Merge pull request #194 from pyiron/pandas
jan-janssen Jan 22, 2024
724f676
Update pyproject.toml
jan-janssen Jan 22, 2024
33bef58
Update environment-docs.yml
jan-janssen Jan 22, 2024
f846130
Update environment.yml
jan-janssen Jan 22, 2024
83942e4
Update environment-docs.yml
jan-janssen Jan 22, 2024
1182ee5
Update environment.yml
jan-janssen Jan 22, 2024
c6d0116
Update pyproject.toml
jan-janssen Jan 22, 2024
47782e9
Fix broken links in readme
jan-janssen Jan 22, 2024
ac7aa7b
Merge pull request #196 from pyiron/readme
jan-janssen Jan 22, 2024
13c01c0
Merge pull request #195 from pyiron/scipy
jan-janssen Jan 22, 2024
a64857b
update docs theme
jan-janssen Jan 26, 2024
b3dd951
Format black
pyiron-runner Jan 26, 2024
2151d26
Merge pull request #197 from pyiron/docs_theme
jan-janssen Jan 26, 2024
e42bad6
Update environment-matgl.yml
jan-janssen Jan 27, 2024
f7faea4
Merge pull request #198 from pyiron/matgl
jan-janssen Jan 27, 2024
9d57923
Update pyproject.toml
jan-janssen Jan 29, 2024
62e0da3
Update environment.yml
jan-janssen Jan 29, 2024
df03877
Update environment.yml
jan-janssen Jan 29, 2024
82044b9
Update environment.yml
jan-janssen Jan 29, 2024
5dffffe
Update environment-lammps.yml
jan-janssen Jan 29, 2024
c5fc750
Update environment-notebooks.yml
jan-janssen Jan 29, 2024
8157227
Update environment-docs.yml
jan-janssen Jan 29, 2024
591fc65
Update environment.yml
jan-janssen Jan 29, 2024
9c9ccaa
Update dependabot.yml
jan-janssen Jan 29, 2024
d7599ad
Update environment.yml
jan-janssen Jan 29, 2024
04b735e
Merge pull request #201 from pyiron/binder
jan-janssen Jan 29, 2024
da76335
Merge branch 'main' into lammps
jan-janssen Jan 29, 2024
0c9997f
Merge pull request #200 from pyiron/lammps
jan-janssen Jan 30, 2024
0e93c68
adapt to spglib 2.3.0
samwaseda Jan 30, 2024
471cd69
Merge branch 'main' into spglib
jan-janssen Jan 30, 2024
efb284e
Format black
pyiron-runner Jan 30, 2024
6d3a510
use the old lines from spglib
samwaseda Jan 30, 2024
94d5cea
resolve conflicts
samwaseda Jan 30, 2024
1819b5d
Format black
pyiron-runner Jan 30, 2024
7150445
Update symmetry.py
jan-janssen Jan 30, 2024
fabd08a
Merge pull request #199 from pyiron/spglib
jan-janssen Jan 30, 2024
c6cafe5
Bump pylammpsmpi from 0.2.11 to 0.2.12
dependabot[bot] Feb 5, 2024
650f137
[dependabot skip] Update environment
github-actions[bot] Feb 5, 2024
0281e22
Merge pull request #204 from pyiron/dependabot/pip/pylammpsmpi-0.2.12
jan-janssen Feb 6, 2024
b54495e
ASE: not all calculators implement the get_stress() function
jan-janssen Feb 7, 2024
5b38cda
Update pyproject.toml
jan-janssen Feb 12, 2024
8592697
Update environment.yml
jan-janssen Feb 12, 2024
e410967
Update environment.yml
jan-janssen Feb 12, 2024
31ced7a
Update environment.yml
jan-janssen Feb 12, 2024
061e712
Update environment.yml
jan-janssen Feb 12, 2024
4673bd3
Update pyproject.toml
jan-janssen Feb 12, 2024
17760ea
Switch dependabot to daily
jan-janssen Feb 12, 2024
cc34b7d
Merge pull request #208 from pyiron/dependabot
jan-janssen Feb 12, 2024
5f2261c
Bump structuretoolkit from 0.0.18 to 0.0.21
dependabot[bot] Feb 12, 2024
e22b45e
Update environment.yml
jan-janssen Feb 12, 2024
f6a894f
Update environment.yml
jan-janssen Feb 12, 2024
b10965a
Update pyproject.toml
jan-janssen Feb 12, 2024
92c45e7
[dependabot skip] Update environment
github-actions[bot] Feb 12, 2024
435f493
Merge pull request #210 from pyiron/dependabot/pip/structuretoolkit-0…
jan-janssen Feb 12, 2024
25fd8dd
Merge pull request #213 from pyiron/main
jan-janssen Feb 12, 2024
b3b9211
Update pyproject.toml
jan-janssen Feb 12, 2024
3de6afe
Update environment.yml
jan-janssen Feb 12, 2024
5283303
Update environment-lammps.yml
jan-janssen Feb 12, 2024
807b619
Update environment-notebooks.yml
jan-janssen Feb 12, 2024
2e4254d
Merge pull request #207 from pyiron/numpy
jan-janssen Feb 12, 2024
1c96f36
Bump pylammpsmpi from 0.2.12 to 0.2.13
dependabot[bot] Feb 12, 2024
1c7d7ab
[dependabot skip] Update environment
github-actions[bot] Feb 12, 2024
bb9e8a7
Merge pull request #214 from pyiron/dependabot/pip/pylammpsmpi-0.2.13
jan-janssen Feb 13, 2024
ddf3cd2
Merge pull request #205 from pyiron/ase_stress_not_implemented
jan-janssen Feb 14, 2024
d8c4cbc
Fix Coverage
jan-janssen Feb 18, 2024
ebda234
Update unittests.yml
jan-janssen Feb 18, 2024
183fc40
Merge pull request #216 from pyiron/coverage
jan-janssen Feb 18, 2024
7949902
Bump phonopy from 2.21.0 to 2.21.2
dependabot[bot] Feb 19, 2024
b8118a3
[dependabot skip] Update environment
github-actions[bot] Feb 19, 2024
38e37d4
Merge pull request #218 from pyiron/dependabot/pip/phonopy-2.21.2
jan-janssen Feb 19, 2024
142ee4a
Bump pylammpsmpi from 0.2.13 to 0.2.14
dependabot[bot] Feb 21, 2024
da502ff
[dependabot skip] Update environment
github-actions[bot] Feb 21, 2024
81409d6
Merge pull request #219 from pyiron/dependabot/pip/pylammpsmpi-0.2.14
jan-janssen Feb 22, 2024
ea62207
Bump pandas from 2.2.0 to 2.2.1
dependabot[bot] Feb 23, 2024
8439a8d
[dependabot skip] Update environment
github-actions[bot] Feb 23, 2024
e4717b7
Merge pull request #220 from pyiron/dependabot/pip/pandas-2.2.1
jan-janssen Feb 23, 2024
425bd3b
Bump pylammpsmpi from 0.2.14 to 0.2.15
dependabot[bot] Mar 1, 2024
4faa926
[dependabot skip] Update environment
github-actions[bot] Mar 1, 2024
c953cf8
Merge pull request #221 from pyiron/dependabot/pip/pylammpsmpi-0.2.15
jan-janssen Mar 2, 2024
0a83b69
Add some more type hints
jan-janssen Mar 14, 2024
61d565e
Format black
pyiron-runner Mar 14, 2024
19138d6
Update atomistics/calculators/lammps/potential.py
jan-janssen Mar 14, 2024
d04f58e
Update atomistics/calculators/lammps/potential.py
jan-janssen Mar 14, 2024
ec5ad12
Update atomistics/calculators/hessian.py
jan-janssen Mar 14, 2024
898d9cb
Format black
pyiron-runner Mar 14, 2024
fb4845a
Merge pull request #222 from pyiron/some_typing
jan-janssen Mar 15, 2024
7d5c685
Phonon workflow - generate displacements only in generate_structure()
jan-janssen Mar 15, 2024
7d546ee
Merge remote-tracking branch 'origin/main' into phonon_dis
jan-janssen Mar 15, 2024
2c0ffbb
QuasiHarmonic: Fix strain
jan-janssen Mar 15, 2024
68d4e40
fix tests
jan-janssen Mar 15, 2024
92dd459
fix tests
jan-janssen Mar 16, 2024
ab2f060
volume rescale factor is no longer required
jan-janssen Mar 16, 2024
fb737d8
remove volume rescale factor
jan-janssen Mar 16, 2024
9a40786
Format black
pyiron-runner Mar 16, 2024
003bcf1
remove print statement
jan-janssen Mar 16, 2024
b787e3e
Merge remote-tracking branch 'origin/qh_rescale_fix' into qh_rescale_fix
jan-janssen Mar 16, 2024
c6bf060
add comment for repeat vector again
jan-janssen Mar 16, 2024
b2fc416
More Typing
jan-janssen Mar 18, 2024
7519ee2
Format black
pyiron-runner Mar 18, 2024
053d0f2
Merge pull request #225 from pyiron/more_typing
jan-janssen Mar 18, 2024
3ba5b89
Merge branch 'main' into phonon_dis
jan-janssen Mar 18, 2024
096caa0
Merge branch 'main' into qh_rescale_fix
jan-janssen Mar 18, 2024
362c429
Merge pull request #223 from pyiron/phonon_dis
jan-janssen Mar 18, 2024
aa3db9a
Merge pull request #224 from pyiron/qh_rescale_fix
jan-janssen Mar 18, 2024
6753f64
Update pyproject.toml
jan-janssen Mar 19, 2024
13fa3ad
Update environment.yml
jan-janssen Mar 19, 2024
ab61eda
Update environment-docs.yml
jan-janssen Mar 19, 2024
854964f
Update environment.yml
jan-janssen Mar 19, 2024
391b1ec
Merge pull request #228 from pyiron/phonopy
jan-janssen Mar 19, 2024
a61fe39
Bump phonopy from 2.22.0 to 2.22.1
dependabot[bot] Mar 29, 2024
ba36673
[dependabot skip] Update environment
github-actions[bot] Mar 29, 2024
c53425f
Merge pull request #230 from pyiron/dependabot/pip/phonopy-2.22.1
jan-janssen Mar 30, 2024
7d893e6
Bump structuretoolkit from 0.0.21 to 0.0.22
dependabot[bot] Apr 8, 2024
418880b
[dependabot skip] Update environment
github-actions[bot] Apr 8, 2024
aeffe33
Merge pull request #232 from pyiron/dependabot/pip/structuretoolkit-0…
jan-janssen Apr 9, 2024
82070d9
Bump scipy from 1.12.0 to 1.13.0
dependabot[bot] Apr 9, 2024
ebda31f
[dependabot skip] Update environment
github-actions[bot] Apr 9, 2024
ce98ce1
Merge pull request #231 from pyiron/dependabot/pip/scipy-1.13.0
jan-janssen Apr 9, 2024
4b39b99
Bump pandas from 2.2.1 to 2.2.2
dependabot[bot] Apr 10, 2024
de4574f
[dependabot skip] Update environment
github-actions[bot] Apr 10, 2024
62ba4ef
Merge pull request #233 from pyiron/dependabot/pip/pandas-2.2.2
jan-janssen Apr 11, 2024
850a4a5
Bump spglib from 2.3.1 to 2.4.0
dependabot[bot] Apr 11, 2024
649f5d4
[dependabot skip] Update environment
github-actions[bot] Apr 11, 2024
3919a69
Merge pull request #234 from pyiron/dependabot/pip/spglib-2.4.0
jan-janssen Apr 11, 2024
21ce53e
Update LAMMPS to 2024.02.07
jan-janssen Apr 14, 2024
c3d862e
Merge pull request #235 from pyiron/lammps
jan-janssen Apr 14, 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
33 changes: 17 additions & 16 deletions .ci_support/environment-docs.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,20 @@
channels:
- conda-forge
dependencies:
- nbsphinx
- sphinx
- myst-parser
- numpy
- ase =3.22.1
- coverage
- numpy =1.26.3
- scipy =1.11.4
- spglib =2.2.0
- phonopy =2.21.0
- structuretoolkit =0.0.17
- seekpath =2.1.0
- lammps =2023.08.02
- pandas =2.1.4
- pylammpsmpi =0.2.11
- jinja2 =3.1.2
- nbsphinx
- sphinx
- sphinx_rtd_theme
- myst-parser
- numpy
- ase =3.22.1
- coverage
- numpy =1.26.3
- scipy =1.13.0
- spglib =2.2.0
- phonopy =2.22.1
- structuretoolkit =0.0.22
- seekpath =2.1.0
- lammps =2023.11.21
- pandas =2.2.2
- pylammpsmpi =0.2.15
- jinja2 =3.1.3
2 changes: 1 addition & 1 deletion .ci_support/environment-gpaw.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
channels:
- conda-forge
dependencies:
- gpaw =23.9.1
- gpaw =24.1.0
8 changes: 4 additions & 4 deletions .ci_support/environment-lammps.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
channels:
- conda-forge
dependencies:
- lammps =2023.08.02
- pandas =2.1.4
- pylammpsmpi =0.2.11
- jinja2 =3.1.2
- lammps =2024.02.07
- pandas =2.2.2
- pylammpsmpi =0.2.15
- jinja2 =3.1.3
- iprpy-data =2023.07.25
- dynaphopy =1.17.15
4 changes: 4 additions & 0 deletions .ci_support/environment-mace.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
channels:
- conda-forge
dependencies:
- pymace =0.3.4
2 changes: 1 addition & 1 deletion .ci_support/environment-matgl.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
channels:
- conda-forge
dependencies:
- matgl =0.9.1
- matgl =0.9.2
10 changes: 5 additions & 5 deletions .ci_support/environment-notebooks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ channels:
dependencies:
- jupyter
- papermill
- gpaw =23.9.1
- lammps =2023.08.02
- pandas =2.1.4
- pylammpsmpi =0.2.11
- jinja2 =3.1.2
- gpaw =24.1.0
- lammps =2023.11.21
- pandas =2.2.2
- pylammpsmpi =0.2.15
- jinja2 =3.1.3
- iprpy-data =2023.07.25
- dynaphopy =1.17.15
10 changes: 5 additions & 5 deletions .ci_support/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ channels:
dependencies:
- ase =3.22.1
- coverage
- numpy =1.26.3
- scipy =1.11.4
- spglib =2.2.0
- phonopy =2.21.0
- structuretoolkit =0.0.17
- numpy =1.26.4
- scipy =1.13.0
- spglib =2.4.0
- phonopy =2.22.1
- structuretoolkit =0.0.22
- seekpath =2.1.0
5 changes: 0 additions & 5 deletions .coveragerc

This file was deleted.

3 changes: 0 additions & 3 deletions .github/delete-merged-branch-config.yml

This file was deleted.

5 changes: 2 additions & 3 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@ updates:
- package-ecosystem: pip
directory: "/"
schedule:
interval: weekly
day: monday
open-pull-requests-limit: 10
interval: "daily"
open-pull-requests-limit: 10
1 change: 1 addition & 0 deletions .github/workflows/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ jobs:
package=$(echo "${{ github.event.pull_request.title }}" | awk '{print $2}')
from=$(echo "${{ github.event.pull_request.title }}" | awk '{print $4}')
to=$(echo "${{ github.event.pull_request.title }}" | awk '{print $6}')
sed -i "/${package}/s/${from}/${to}/g" binder/environment.yml
sed -i "/${package}/s/${from}/${to}/g" .ci_support/environment.yml
sed -i "/${package}/s/${from}/${to}/g" .ci_support/environment-lammps.yml
sed -i "/${package}/s/${from}/${to}/g" .ci_support/environment-gpaw.yml
Expand Down
3 changes: 1 addition & 2 deletions .github/workflows/unittests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,7 @@ jobs:
run: |
pip install versioneer[toml]==0.29
pip install . --no-deps --no-build-isolation
coverage run --omit atomistics/_version.py -m unittest discover tests
coverage combine
coverage run --omit="atomistics/_version.py,tests/*" -m unittest discover tests
- name: Coveralls
if: matrix.label == 'linux-64-py-3-11'
uses: coverallsapp/github-action@v2
36 changes: 36 additions & 0 deletions .github/workflows/unittests_mace.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: MACE Unittest Linux 3.11

on:
push:
branches: [ main ]
pull_request:

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Merge Notebook environment
run: |
cp .ci_support/environment.yml environment.yml
tail --lines=+4 .ci_support/environment-mace.yml >> environment.yml
- name: Setup Mambaforge
uses: conda-incubator/setup-miniconda@v2
with:
python-version: '3.11'
miniforge-variant: Mambaforge
channels: conda-forge
channel-priority: strict
activate-environment: my-env
environment-file: environment.yml
use-mamba: true
- name: Test
shell: bash -l {0}
timeout-minutes: 60
run: |
pip install versioneer[toml]==0.29
pip install . --no-deps --no-build-isolation
python -m unittest tests/test_evcurve_ase_mace.py
python -m unittest tests/test_phonons_ase_mace.py
python -m unittest tests/test_quasiharmonic_ase_mace.py
python -m unittest tests/test_ase_md_mace.py
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* [Harmonic Approximation](https://atomistics.readthedocs.io/en/latest/workflows.html#harmonic-approximation)
* [Structure Optimization](https://atomistics.readthedocs.io/en/latest/workflows.html#structure-optimization)
* [Materials Properties](https://atomistics.readthedocs.io/en/latest/materialproperties.html)
* [Elastic Properties](https://atomistics.readthedocs.io/en/docs/materialproperties.html#elastic-properties)
* [Thermal Expansion](https://atomistics.readthedocs.io/en/docs/materialproperties.html#thermal-expansion)
* [Helmholtz Free Energy](https://atomistics.readthedocs.io/en/docs/materialproperties.html#helmholtz-free-energy)
* [Phase Diagram](https://atomistics.readthedocs.io/en/docs/materialproperties.html#phase-diagram)
* [Elastic Properties](https://atomistics.readthedocs.io/en/latest/materialproperties.html#elastic-properties)
* [Thermal Expansion](https://atomistics.readthedocs.io/en/latest/materialproperties.html#thermal-expansion)
* [Helmholtz Free Energy](https://atomistics.readthedocs.io/en/latest/materialproperties.html#helmholtz-free-energy)
* [Phase Diagram](https://atomistics.readthedocs.io/en/latest/materialproperties.html#phase-diagram)
* [Module Index](https://atomistics.readthedocs.io/en/latest/py-modindex.html)
Loading
Loading