Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lock dependencies #216

Merged
merged 26 commits into from
May 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
5baf642
Pin the key pyiron dependencies to latest
liamhuber May 17, 2024
2d0b63c
Add aimsgb
liamhuber May 17, 2024
8891eb2
Remove maggma
liamhuber May 17, 2024
9c39214
Freeze dependencies
liamhuber May 21, 2024
3afbddb
Pin the key pyiron dependencies to latest
liamhuber May 17, 2024
7a817d9
Add aimsgb
liamhuber May 17, 2024
4764f1f
Remove maggma
liamhuber May 17, 2024
c972f34
Freeze dependencies
liamhuber May 21, 2024
736306d
Merge remote-tracking branch 'origin/lock_dependencies' into lock_dep…
liamhuber May 21, 2024
288c78e
[dependabot skip] Update env file
pyiron-runner May 21, 2024
c9c72ec
Use python 11 instead of 12
liamhuber May 21, 2024
52dae72
Exclude python 3.8
liamhuber May 21, 2024
daf2839
[dependabot skip] Update env file
pyiron-runner May 21, 2024
f4b114d
Add missing dependencies
liamhuber May 21, 2024
05cefc7
[dependabot skip] Update env file
pyiron-runner May 21, 2024
0835b2c
Synchronzie setup.py
liamhuber May 21, 2024
eefcf11
Merge remote-tracking branch 'origin/lock_dependencies' into lock_dep…
liamhuber May 21, 2024
a420814
Revise environment
liamhuber May 22, 2024
7b40deb
[dependabot skip] Update env file
pyiron-runner May 22, 2024
006a58c
Fix typo in the jupyterlab dependence
liamhuber May 22, 2024
027f576
Merge remote-tracking branch 'origin/lock_dependencies' into lock_dep…
liamhuber May 22, 2024
7b10b40
[dependabot skip] Update env file
pyiron-runner May 22, 2024
8571a23
Fix the same typo for matplotlib
liamhuber May 22, 2024
87a3977
[dependabot skip] Update env file
pyiron-runner May 22, 2024
eaf7cd8
Relax the pip dependency for pyiron_gui
liamhuber May 22, 2024
947b2a2
Bump the timeout for windows to see if that fixes things
liamhuber May 22, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 21 additions & 17 deletions .binder/environment.yml
Original file line number Diff line number Diff line change
@@ -1,21 +1,25 @@
channels:
- conda-forge
dependencies:
- ipycanvas
- ipython
- ipywidgets == 7.*
- maggma >= 0.57.1
- matplotlib
- nglview <= 3.0.9
- numpy
- owlready2
- pandas
- pyiron_base
- pyiron_atomistics >= 0.2.57
- pyiron_gui >= 0.0.8
- pyiron_ontology == 0.1.3
- python >=3.10,<3.12
- aimsgb =0.1.3
- ipycanvas =0.13.2
- ipython =8.24.0
- ipywidgets =7.7.1
- jupyterlab =3.6.7
- matplotlib =3.8.4
- nglview =3.0.8
- numpy =1.26.4
- openjdk =22.0.1
- owlready2 =0.46
- pandas =1.5.3
- pyiron-data =0.0.27
- pyiron_atomistics = 0.2.63
- pyiron_base =0.5.33
- pyiron_gui =0.0.8
- pyiron_ontology =0.1.3
- pymatgen =2023.5.10
- ryvencore =0.3.1.1
- seaborn
- traitlets
- python >= 3.8
- lammps
- seaborn =0.13.2
- traitlets =5.14.3
- lammps =2024.02.07
4 changes: 2 additions & 2 deletions .ci_support/environment-notebooks.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
channels:
- conda-forge
dependencies:
- python >= 3.8
- lammps
- python >=3.10, <3.12
- lammps =2024.02.07
35 changes: 20 additions & 15 deletions .ci_support/environment.yml
Original file line number Diff line number Diff line change
@@ -1,19 +1,24 @@
channels:
- conda-forge
dependencies:
- ipycanvas
- ipython
- ipywidgets == 7.*
- maggma >= 0.57.1
- matplotlib
- nglview <= 3.0.9
- numpy
- owlready2
- pandas
- pyiron_base
- pyiron_atomistics >= 0.2.57
- pyiron_gui >= 0.0.8
- pyiron_ontology == 0.1.3
- python >=3.10,<3.12
- aimsgb =0.1.3
- ipycanvas =0.13.2
- ipython =8.24.0
- ipywidgets =7.7.1
- jupyterlab =3.6.7
- matplotlib =3.8.4
- nglview =3.0.8
- numpy =1.26.4
- openjdk =22.0.1
- owlready2 =0.46
- pandas =1.5.3
- pyiron-data =0.0.27
- pyiron_atomistics = 0.2.63
- pyiron_base =0.5.33
- pyiron_gui =0.0.8
- pyiron_ontology =0.1.3
- pymatgen =2023.5.10
- ryvencore =0.3.1.1
- seaborn
- traitlets
- seaborn =0.13.2
- traitlets =5.14.3
4 changes: 3 additions & 1 deletion .github/workflows/daily.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,6 @@ on:
jobs:
codeql:
uses: pyiron/actions/.github/workflows/[email protected]
secrets: inherit
secrets: inherit
with:
python-version: '3.11'
6 changes: 5 additions & 1 deletion .github/workflows/push-pull.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,8 @@ jobs:
uses: pyiron/actions/.github/workflows/[email protected]
secrets: inherit
with:
notebooks-env-files: .ci_support/environment.yml .ci_support/environment-notebooks.yml
notebooks-env-files: .ci_support/environment.yml .ci_support/environment-notebooks.yml
python-version: '3.11'
python-version-alt1: 'exclude' # 3.11 is the main one now
python-version-alt3: 'exclude' # Don't run on 3.8
unit-test-timeout-minutes: 20 # For windows, which seems a little slow
35 changes: 20 additions & 15 deletions docs/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,24 @@ dependencies:
- sphinx-gallery
- sphinx-rtd-theme
- versioneer
- ipycanvas
- ipython
- ipywidgets == 7.*
- maggma >= 0.57.1
- matplotlib
- nglview <= 3.0.9
- numpy
- owlready2
- pandas
- pyiron_base
- pyiron_atomistics >= 0.2.57
- pyiron_gui >= 0.0.8
- pyiron_ontology == 0.1.3
- python >=3.10,<3.12
- aimsgb =0.1.3
- ipycanvas =0.13.2
- ipython =8.24.0
- ipywidgets =7.7.1
- jupyterlab =3.6.7
- matplotlib =3.8.4
- nglview =3.0.8
- numpy =1.26.4
- openjdk =22.0.1
- owlready2 =0.46
- pandas =1.5.3
- pyiron-data =0.0.27
- pyiron_atomistics = 0.2.63
- pyiron_base =0.5.33
- pyiron_gui =0.0.8
- pyiron_ontology =0.1.3
- pymatgen =2023.5.10
- ryvencore =0.3.1.1
- seaborn
- traitlets
- seaborn =0.13.2
- traitlets =5.14.3
34 changes: 18 additions & 16 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,29 +22,31 @@
'License :: OSI Approved :: BSD License',
'Intended Audience :: Science/Research',
'Operating System :: OS Independent',
'Programming Language :: Python :: 3.9',
'Programming Language :: Python :: 3.10',
'Programming Language :: Python :: 3.11',
],

keywords='pyiron',
packages=find_packages(exclude=["*tests*", "*docs*", "*binder*", "*conda*", "*notebooks*", "*.ci_support*"]),
install_requires=[
'ipycanvas',
'ipython',
'ipywidgets >= 7,< 8',
'matplotlib',
'maggma >= 0.57.1',
'nglview <= 3.0.9',
'numpy',
'owlready2',
'pyiron_base',
'pyiron_atomistics',
'pyiron_gui >= 0.0.8',
'pyiron_ontology == 0.1.3',
'ryvencore == 0.3.1.1 ',
'seaborn',
'traitlets',
'aimsgb ==0.1.3',
'ipycanvas ==0.13.2',
'ipython ==8.24.0',
'ipywidgets ==7.7.1',
'jupyterlab ==3.6.7',
'matplotlib ==3.8.4',
'nglview ==3.0.8',
'numpy ==1.26.4',
'owlready2 ==0.46',
'pandas ==1.5.3',
'pyiron_atomistics == 0.2.63',
'pyiron_base ==0.5.33',
'pyiron_gui <=0.0.8',
'pyiron_ontology ==0.1.3',
'pymatgen ==2023.5.10',
'ryvencore ==0.3.1.1',
'seaborn ==0.13.2',
'traitlets ==5.14.3',
],
cmdclass=versioneer.get_cmdclass(),

Expand Down
Loading