Skip to content

Commit

Permalink
Merge branch 'main' into lighten_import
Browse files Browse the repository at this point in the history
  • Loading branch information
liamhuber committed Feb 2, 2024
2 parents fd054b1 + 6efcef4 commit c55863f
Show file tree
Hide file tree
Showing 35 changed files with 2,824 additions and 4,025 deletions.
7 changes: 4 additions & 3 deletions .binder/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ dependencies:
- coverage
- codacy-coverage
- matplotlib =3.8.2
- numpy =1.26.2
- pyiron_base =0.6.20
- pyiron_atomistics =0.4.4
- numpy =1.26.3
- pyiron_base =0.6.22
- pyiron_atomistics =0.4.6
- pyparsing =3.1.1
- scipy =1.11.4
- seaborn =0.13.1
Expand All @@ -20,6 +20,7 @@ dependencies:
- aws-sam-translator =1.77.0
- pympipool =0.7.9
- distributed =2023.12.1
- h5io_browser =0.0.6
- python >= 3.10
- lammps
- nglview >=3.0.8
Expand Down
7 changes: 4 additions & 3 deletions .ci_support/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ dependencies:
- coverage
- codacy-coverage
- matplotlib =3.8.2
- numpy =1.26.2
- pyiron_base =0.6.20
- pyiron_atomistics =0.4.4
- numpy =1.26.3
- pyiron_base =0.6.22
- pyiron_atomistics =0.4.6
- pyparsing =3.1.1
- scipy =1.11.4
- seaborn =0.13.1
Expand All @@ -20,3 +20,4 @@ dependencies:
- aws-sam-translator =1.77.0
- pympipool =0.7.9
- distributed =2023.12.1
- h5io_browser =0.0.6
7 changes: 4 additions & 3 deletions docs/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ dependencies:
- coverage
- codacy-coverage
- matplotlib =3.8.2
- numpy =1.26.2
- pyiron_base =0.6.20
- pyiron_atomistics =0.4.4
- numpy =1.26.3
- pyiron_base =0.6.22
- pyiron_atomistics =0.4.6
- pyparsing =3.1.1
- scipy =1.11.4
- seaborn =0.13.1
Expand All @@ -25,3 +25,4 @@ dependencies:
- aws-sam-translator =1.77.0
- pympipool =0.7.9
- distributed =2023.12.1
- h5io_browser =0.0.6
Loading

0 comments on commit c55863f

Please sign in to comment.