Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/pip/pyiron-base-0.10.4
Browse files Browse the repository at this point in the history
  • Loading branch information
jan-janssen authored Oct 22, 2024
2 parents ebc08b6 + 3a638f3 commit 8e24517
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .ci_support/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dependencies:
- codacy-coverage
- ipywidgets =8.1.5
- pyiron_base =0.10.4
- pyiron_atomistics =0.6.13
- pyiron_atomistics =0.6.14
- maggma =0.60.2
- numpy =1.26.4
- pandas =2.2.3
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
packages=find_packages(exclude=["*tests*", "*docs*", "*binder*", "*conda*", "*notebooks*", "*.ci_support*"]),
install_requires=[
'pyiron_base==0.10.4',
'pyiron_atomistics==0.6.13',
'pyiron_atomistics==0.6.14',
'ipywidgets==8.1.5',
'matplotlib==3.9.2',
'nbconvert==7.16.4',
Expand Down

0 comments on commit 8e24517

Please sign in to comment.