Merge branch 'main' into hotfix_binder

# Conflicts: # .binder/environment.yml # .ci_support/environment-notebooks.yml
pyiron · Jan 5, 2024 · c9167e4 · c9167e4
2 parents 0e9a2a3 + 18ae526
commit c9167e4
Show file tree

Hide file tree

Showing 5 changed files with 238 additions and 173 deletions.
diff --git a/.binder/environment.yml b/.binder/environment.yml
@@ -12,10 +12,9 @@ dependencies:
 - toposort =1.10
 - typeguard =4.1.5
 - ase =3.22.1
-- atomistics =0.1.12
+- atomistics =0.1.20
 - lammps
 - phonopy =2.21.0
-- pyiron_atomistics =0.3.5
-- pyiron_base =0.6.8
-- pyiron-data =0.0.24
-- numpy =1.26.0
+- pyiron_atomistics =0.4.4
+- pyiron-data =0.0.27
+- numpy =1.26.3
diff --git a/.ci_support/environment-notebooks.yml b/.ci_support/environment-notebooks.yml
@@ -2,10 +2,9 @@ channels:
   - conda-forge
 dependencies:
   - ase =3.22.1
-  - atomistics =0.1.12
+  - atomistics =0.1.20
   - lammps
   - phonopy =2.21.0
-  - pyiron_atomistics =0.3.5
-  - pyiron_base =0.6.8
-  - pyiron-data =0.0.24
-  - numpy =1.26.0
+  - pyiron_atomistics =0.4.4
+  - pyiron-data =0.0.27
+  - numpy =1.26.3