Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
2aecef2
Separate minimal environment and full environment
jan-janssen Jul 19, 2023
d58c6fe
Add dependabot
jan-janssen Jul 19, 2023
fb6a06d
Merge pull request #28 from pyiron/dependabo
jan-janssen Jul 19, 2023
9050d57
Bump aimsgb from 0.1.3 to 1.0.1
dependabot[bot] Jul 19, 2023
1d538ae
Bump plotly from 5.14.1 to 5.15.0
dependabot[bot] Jul 19, 2023
32ab2ed
Bump phonopy from 2.19.1 to 2.20.0
dependabot[bot] Jul 19, 2023
8c6e60f
Bump numpy from 1.24.3 to 1.25.1
dependabot[bot] Jul 19, 2023
5345ccf
Bump scikit-learn from 1.2.2 to 1.3.0
dependabot[bot] Jul 19, 2023
2390f62
Bump pymatgen from 2023.5.31 to 2023.7.17
dependabot[bot] Jul 19, 2023
e17a674
Bump nglview from 3.0.5 to 3.0.6
dependabot[bot] Jul 19, 2023
98386a5
Bump matplotlib from 3.7.1 to 3.7.2
dependabot[bot] Jul 19, 2023
41ceaf1
Update environment.yml
jan-janssen Jul 19, 2023
4422f40
Update environment.yml
jan-janssen Jul 19, 2023
69ff51a
Update environment.yml
jan-janssen Jul 19, 2023
c62d299
Update environment.yml
jan-janssen Jul 19, 2023
7e685a5
Update environment.yml
jan-janssen Jul 19, 2023
4e085e9
Update environment.yml
jan-janssen Jul 19, 2023
1893e52
Update environment.yml
jan-janssen Jul 19, 2023
69d0fe0
Update environment.yml
jan-janssen Jul 19, 2023
4a76a37
Merge pull request #27 from pyiron/minimal_test_fix
jan-janssen Jul 19, 2023
109267b
Drop Python 3.8
jan-janssen Jul 19, 2023
781390b
Merge pull request #29 from pyiron/dependabot/pip/aimsgb-1.0.1
jan-janssen Jul 19, 2023
db5dffe
Merge pull request #32 from pyiron/dependabot/pip/phonopy-2.20.0
jan-janssen Jul 19, 2023
ede4dc8
Merge pull request #34 from pyiron/dependabot/pip/scikit-learn-1.3.0
jan-janssen Jul 19, 2023
337f7c3
Merge branch 'main' into dependabot/pip/plotly-5.15.0
jan-janssen Jul 19, 2023
31f7ee3
Merge pull request #30 from pyiron/dependabot/pip/plotly-5.15.0
jan-janssen Jul 19, 2023
7f41366
Merge branch 'main' into dependabot/pip/nglview-3.0.6
jan-janssen Jul 19, 2023
73169a5
Merge pull request #37 from pyiron/dependabot/pip/matplotlib-3.7.2
jan-janssen Jul 19, 2023
944eff9
Merge pull request #39 from pyiron/drop_python_38
jan-janssen Jul 19, 2023
aafe35f
Merge branch 'main' into dependabot/pip/pymatgen-2023.7.17
jan-janssen Jul 19, 2023
2020259
Bump scipy from 1.10.1 to 1.11.1
dependabot[bot] Jul 19, 2023
809a621
Merge branch 'main' into dependabot/pip/numpy-1.25.1
jan-janssen Jul 19, 2023
ebf1fc4
Update environment.yml
jan-janssen Jul 19, 2023
4fcb954
Update environment_mini.yml
jan-janssen Jul 19, 2023
d9c6c7f
Merge pull request #33 from pyiron/dependabot/pip/numpy-1.25.1
jan-janssen Jul 20, 2023
7d121bb
Merge pull request #35 from pyiron/dependabot/pip/pymatgen-2023.7.17
jan-janssen Jul 20, 2023
3b75196
Merge branch 'main' into dependabot/pip/nglview-3.0.6
jan-janssen Jul 20, 2023
e931cf2
Merge branch 'main' into dependabot/pip/scipy-1.11.1
jan-janssen Jul 20, 2023
4233338
Merge pull request #38 from pyiron/dependabot/pip/scipy-1.11.1
jan-janssen Jul 20, 2023
1c2d984
Merge pull request #36 from pyiron/dependabot/pip/nglview-3.0.6
jan-janssen Jul 20, 2023
326588c
Update environment_mini.yml
jan-janssen Jul 20, 2023
ef8ec6d
Merge pull request #40 from pyiron/Mini
jan-janssen Jul 20, 2023
b8693ab
Merge branch 'pyxtal_patch' into merge_main
jan-janssen Jul 20, 2023
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
16 changes: 9 additions & 7 deletions .ci_support/environment.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
channels:
- conda-forge
dependencies:
- aimsgb =0.1.3
- aimsgb =1.0.1
- ase =3.22.1
- coveralls
- coverage
- codacy-coverage
- matplotlib-base =3.7.1
- numpy =1.24.3
- phonopy =2.19.1
- pymatgen =2023.5.31
- matplotlib-base =3.7.2
- nglview =3.0.6
- numpy =1.25.1
- phonopy =2.20.0
- plotly =5.15.0
- pymatgen =2023.7.17
- pyscal =2.10.18
- scikit-learn =1.2.2
- scipy =1.10.1
- scikit-learn =1.3.0
- scipy =1.11.1
- spglib =2.0.2
- sqsgenerator =0.2
- pyxtal =0.5.8
6 changes: 3 additions & 3 deletions .ci_support/environment_mini.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ dependencies:
- coveralls
- coverage
- codacy-coverage
- matplotlib-base =3.7.1
- numpy =1.24.3
- scipy =1.10.1
- matplotlib-base =3.7.2
- numpy =1.25.1
- scipy =1.11.1
8 changes: 8 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
version: 2
updates:
- package-ecosystem: pip
directory: "/"
schedule:
interval: weekly
day: monday
open-pull-requests-limit: 10
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
- uses: actions/checkout@v2
- uses: actions/setup-python@v2
with:
python-version: "3.10"
python-version: "3.11"

- name: Install dependencies
run: >-
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pypicheck.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
- name: Setup Mambaforge
uses: conda-incubator/setup-miniconda@v2
with:
python-version: '3.10'
python-version: '3.11'
miniforge-variant: Mambaforge
channels: conda-forge
channel-priority: strict
Expand Down
5 changes: 0 additions & 5 deletions .github/workflows/unittests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,6 @@ jobs:
label: linux-64-py-3-9
prefix: /usr/share/miniconda3/envs/my-env

- operating-system: ubuntu-latest
python-version: '3.8'
label: linux-64-py-3-8
prefix: /usr/share/miniconda3/envs/my-env

steps:
- uses: actions/checkout@v2
- name: Setup environment
Expand Down
18 changes: 9 additions & 9 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,19 @@
packages=find_packages(exclude=["*tests*", "*docs*", "*binder*", "*conda*", "*notebooks*", "*.ci_support*"]),
install_requires=[
'ase==3.22.1',
'matplotlib==3.7.1', # ase already requires matplotlib
'numpy==1.24.3', # ase already requires numpy
'scipy==1.10.1', # ase already requires scipy
'matplotlib==3.7.2', # ase already requires matplotlib
'numpy==1.25.1', # ase already requires numpy
'scipy==1.11.1', # ase already requires scipy
],
extras_require={
"grainboundary": ['aimsgb==0.1.3', 'pymatgen==2023.5.31'],
"grainboundary": ['aimsgb==1.0.1', 'pymatgen==2023.7.17'],
"pyscal": ['pyscal2==2.10.18'],
"nglview": ['nglview==3.0.5'],
"plotly": ['plotly==5.14.1'],
"clusters": ['scikit-learn==1.2.2'],
"nglview": ['nglview==3.0.6'],
"plotly": ['plotly==5.15.0'],
"clusters": ['scikit-learn==1.3.0'],
"symmetry": ['spglib==2.0.2'],
"surface": ['spglib==2.0.2', 'pymatgen==2023.5.31'],
"phonopy": ['phonopy==2.19.1', 'spglib==2.0.2'],
"surface": ['spglib==2.0.2', 'pymatgen==2023.7.17'],
"phonopy": ['phonopy==2.20.0', 'spglib==2.0.2'],
"pyxtal": ['pyxtal==0.5.8']
},
cmdclass=versioneer.get_cmdclass(),
Expand Down