Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into symmetry_utility_func…
Browse files Browse the repository at this point in the history
…tions
  • Loading branch information
jan-janssen committed Aug 23, 2023
2 parents f30b404 + b3e86b6 commit 12cc0ac
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .ci_support/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ dependencies:
- nglview =3.0.6
- numpy =1.23.5
- phonopy =2.20.0
- plotly =5.16.0
- plotly =5.16.1
- pymatgen =2023.7.20
- pyscal =2.10.18
- scikit-learn =1.3.0
- scipy =1.11.1
- scipy =1.11.2
- spglib =2.0.2
- sqsgenerator =0.2
- pyxtal =0.5.9
2 changes: 1 addition & 1 deletion .ci_support/environment_mini.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ dependencies:
- codacy-coverage
- matplotlib-base =3.7.2
- numpy =1.23.5
- scipy =1.11.1
- scipy =1.11.2
4 changes: 2 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@
'ase==3.22.1',
'matplotlib==3.7.2', # ase already requires matplotlib
'numpy==1.23.5', # ase already requires numpy
'scipy==1.11.1', # ase already requires scipy
'scipy==1.11.2', # ase already requires scipy
],
extras_require={
"grainboundary": ['aimsgb==1.0.3', 'pymatgen==2023.8.10'],
"pyscal": ['pyscal2==2.10.18'],
"nglview": ['nglview==3.0.6'],
"plotly": ['plotly==5.16.0'],
"plotly": ['plotly==5.16.1'],
"clusters": ['scikit-learn==1.3.0'],
"symmetry": ['spglib==2.0.2'],
"surface": ['spglib==2.0.2', 'pymatgen==2023.8.10'],
Expand Down

0 comments on commit 12cc0ac

Please sign in to comment.