Skip to content

Commit

Permalink
Merge branch 'main' into simple_storage
Browse files Browse the repository at this point in the history
  • Loading branch information
liamhuber committed Feb 14, 2024
2 parents 8f56a2b + 344d1c4 commit b06997e
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
8 changes: 4 additions & 4 deletions .binder/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@ dependencies:
- graphviz =8.1.0
- h5io =0.2.2
- matplotlib =3.8.2
- pympipool =0.7.9
- pympipool =0.7.13
- python-graphviz =0.20.1
- toposort =1.10
- typeguard =4.1.5
- ase =3.22.1
- atomistics =0.1.20
- atomistics =0.1.23
- lammps
- phonopy =2.21.0
- pyiron_atomistics =0.4.7
- pyiron_atomistics =0.4.14
- pyiron-data =0.0.27
- numpy =1.26.3
- numpy =1.26.4
6 changes: 3 additions & 3 deletions .ci_support/environment-notebooks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ channels:
- conda-forge
dependencies:
- ase =3.22.1
- atomistics =0.1.20
- atomistics =0.1.23
- lammps
- phonopy =2.21.0
- pyiron_atomistics =0.4.7
- pyiron_atomistics =0.4.14
- pyiron-data =0.0.27
- numpy =1.26.3
- numpy =1.26.4
2 changes: 1 addition & 1 deletion .ci_support/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ dependencies:
- graphviz =8.1.0
- h5io =0.2.2
- matplotlib =3.8.2
- pympipool =0.7.9
- pympipool =0.7.13
- python-graphviz =0.20.1
- toposort =1.10
- typeguard =4.1.5
2 changes: 1 addition & 1 deletion docs/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ dependencies:
- graphviz =8.1.0
- h5io =0.2.2
- matplotlib =3.8.2
- pympipool =0.7.9
- pympipool =0.7.13
- python-graphviz =0.20.1
- toposort =1.10
- typeguard =4.1.5
8 changes: 4 additions & 4 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,17 @@
'graphviz==0.20.1',
'h5io==0.2.2',
'matplotlib==3.8.2',
'pympipool==0.7.9',
'pympipool==0.7.13',
'toposort==1.10',
'typeguard==4.1.5',
],
extras_require={
"node_library": [
'ase==3.22.1',
'atomistics==0.1.21',
'numpy==1.26.3',
'atomistics==0.1.23',
'numpy==1.26.4',
'phonopy==2.21.0',
'pyiron_atomistics==0.4.9',
'pyiron_atomistics==0.4.14',
],
"tinybase": [
'boto3', # Just because pyiron_contrib is not making sure it's there
Expand Down

0 comments on commit b06997e

Please sign in to comment.