Skip to content

Commit

Permalink
Merge branch 'main' into mean_field
Browse files Browse the repository at this point in the history
  • Loading branch information
Raynol Dsouza committed Nov 16, 2023
2 parents c34b0bb + a5dfafd commit b3c846c
Show file tree
Hide file tree
Showing 74 changed files with 14,017 additions and 5,370 deletions.
28 changes: 15 additions & 13 deletions .binder/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,22 @@ dependencies:
- coveralls
- coverage
- codacy-coverage
- ipython
- matplotlib =3.7.1
- numpy =1.24.3
- pyiron_base =0.5.38
- pyiron_atomistics =0.2.67
- pyparsing =3.0.9
- scipy =1.10.1
- seaborn =0.12.2
- scikit-image =0.19.3
- matplotlib =3.8.1
- numpy =1.26.0
- pyiron_base =0.6.8
- pyiron_atomistics =0.3.5
- pyparsing =3.1.1
- scipy =1.11.3
- seaborn =0.13.0
- scikit-image =0.22.0
- randspg =0.0.1
- boto3 =1.26.137
- moto =4.1.10
- boto3 =1.28.78
- moto =4.2.7
- pycp2k =0.2.2
- typeguard =4.0.0
- aws-sam-translator =1.65.0
- aws-sam-translator =1.77.0
- pympipool =0.7.2
- distributed =2023.10.1
- python >= 3.10
- lammps
- nglview >=3.0.8
- pyiron-data >=0.0.25
4 changes: 3 additions & 1 deletion .ci_support/environment-notebooks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@ channels:
- conda-forge
dependencies:
- python >= 3.10
- lammps
- lammps
- nglview >=3.0.8
- pyiron-data >=0.0.25
26 changes: 13 additions & 13 deletions .ci_support/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ dependencies:
- coveralls
- coverage
- codacy-coverage
- ipython
- matplotlib =3.7.1
- numpy =1.24.3
- pyiron_base =0.5.38
- pyiron_atomistics =0.2.67
- pyparsing =3.0.9
- scipy =1.10.1
- seaborn =0.12.2
- scikit-image =0.19.3
- matplotlib =3.8.1
- numpy =1.26.0
- pyiron_base =0.6.8
- pyiron_atomistics =0.3.5
- pyparsing =3.1.1
- scipy =1.11.3
- seaborn =0.13.0
- scikit-image =0.22.0
- randspg =0.0.1
- boto3 =1.26.137
- moto =4.1.10
- boto3 =1.28.78
- moto =4.2.7
- pycp2k =0.2.2
- typeguard =4.0.0
- aws-sam-translator =1.65.0
- aws-sam-translator =1.77.0
- pympipool =0.7.2
- distributed =2023.10.1
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
# This runs jobs which pyiron modules should run on pushes or PRs to main

name: Push-Pull-main
name: Push-main-Pull-all

on:
push:
branches: [ main ]
pull_request:
branches: [ main ]

jobs:
pyiron:
Expand Down
26 changes: 13 additions & 13 deletions docs/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@ dependencies:
- coveralls
- coverage
- codacy-coverage
- ipython
- matplotlib =3.7.1
- numpy =1.24.3
- pyiron_base =0.5.38
- pyiron_atomistics =0.2.67
- pyparsing =3.0.9
- scipy =1.10.1
- seaborn =0.12.2
- scikit-image =0.19.3
- matplotlib =3.8.1
- numpy =1.26.0
- pyiron_base =0.6.8
- pyiron_atomistics =0.3.5
- pyparsing =3.1.1
- scipy =1.11.3
- seaborn =0.13.0
- scikit-image =0.22.0
- randspg =0.0.1
- boto3 =1.26.137
- moto =4.1.10
- boto3 =1.28.78
- moto =4.2.7
- pycp2k =0.2.2
- typeguard =4.0.0
- aws-sam-translator =1.65.0
- aws-sam-translator =1.77.0
- pympipool =0.7.2
- distributed =2023.10.1
Loading

0 comments on commit b3c846c

Please sign in to comment.