Skip to content

Commit

Permalink
Merge pull request #262 from pyiron/main
Browse files Browse the repository at this point in the history
merge main
  • Loading branch information
jan-janssen authored Oct 5, 2023
2 parents 3e282eb + 09c47a5 commit 8dbfdb3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions .ci_support/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ dependencies:
- coverage
- codacy-coverage
- ipywidgets =8.1.1
- pyiron_base =0.6.6
- pyiron_atomistics =0.3.3
- numpy =1.24.3
- pyiron_base =0.6.7
- pyiron_atomistics =0.3.4
- numpy =1.26.0
- pandas =2.1.1
- matplotlib-base =3.8.0
- nbconvert =7.8.0
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@
keywords='pyiron',
packages=find_packages(exclude=["*tests*", "*docs*", "*binder*", "*conda*", "*notebooks*", "*.ci_support*"]),
install_requires=[
'pyiron_base==0.6.6',
'pyiron_atomistics==0.3.3',
'pyiron_base==0.6.7',
'pyiron_atomistics==0.3.4',
'ipywidgets==8.1.1',
'matplotlib==3.8.0',
'nbconvert==7.8.0',
'nbformat==5.9.2',
'numpy==1.24.3',
'numpy==1.26.0',
'pandas==2.1.1',
],
cmdclass=versioneer.get_cmdclass(),
Expand Down

0 comments on commit 8dbfdb3

Please sign in to comment.