Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 4 additions & 4 deletions .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ jobs:
- run: docker build -t pyiron/mpie_cmti:latest mpie_cmti/
- run: docker tag pyiron/mpie_cmti:latest pyiron/mpie_cmti:"$(date +%F)"
- run: docker images
- run: docker run --rm pyiron/continuum /bin/bash -c 'source /opt/conda/bin/activate; i=0; for f in $(ls "${HOME}"/notebooks_*/*.ipynb); do jupyter nbconvert --ExecutePreprocessor.timeout=9999999 --to notebook --execute $f || i=$((i+1)); done; if [ $i -gt 0 ]; then exit 1; fi;'
- run: docker run --rm pyiron/base /bin/bash -c 'source /opt/conda/bin/activate; i=0; for f in $(ls "${HOME}"/notebooks_*/*.ipynb); do jupyter nbconvert --ExecutePreprocessor.timeout=9999999 --to notebook --execute $f || i=$((i+1)); done; if [ $i -gt 0 ]; then exit 1; fi;'
- run: docker run --rm pyiron/pyiron /bin/bash -c 'source /opt/conda/bin/activate; i=0; for f in $(ls "${HOME}"/notebooks_*/*.ipynb); do jupyter nbconvert --ExecutePreprocessor.timeout=9999999 --to notebook --execute $f || i=$((i+1)); done; if [ $i -gt 0 ]; then exit 1; fi;'
- run: docker run --rm pyiron/experimental /bin/bash -c 'source /opt/conda/bin/activate; i=0; for f in $(ls "${HOME}"/notebooks_*/*.ipynb); do jupyter nbconvert --ExecutePreprocessor.timeout=9999999 --to notebook --execute $f || i=$((i+1)); done; if [ $i -gt 0 ]; then exit 1; fi;'
- run: docker run --rm pyiron/continuum /bin/bash -c 'source /opt/conda/bin/activate; i=0; for f in $(ls "${HOME}"/notebooks_*/*.ipynb); do jupyter nbconvert --ExecutePreprocessor.timeout=9999999 --ExecutePreprocessor.kernel_name=python3 --to notebook --execute $f || i=$((i+1)); done; if [ $i -gt 0 ]; then exit 1; fi;'
- run: docker run --rm pyiron/base /bin/bash -c 'source /opt/conda/bin/activate; i=0; for f in $(ls "${HOME}"/notebooks_*/*.ipynb); do jupyter nbconvert --ExecutePreprocessor.timeout=9999999 --ExecutePreprocessor.kernel_name=python3 --to notebook --execute $f || i=$((i+1)); done; if [ $i -gt 0 ]; then exit 1; fi;'
- run: docker run --rm pyiron/pyiron /bin/bash -c 'source /opt/conda/bin/activate; i=0; for f in $(ls "${HOME}"/notebooks_*/*.ipynb); do jupyter nbconvert --ExecutePreprocessor.timeout=9999999 --ExecutePreprocessor.kernel_name=python3 --to notebook --execute $f || i=$((i+1)); done; if [ $i -gt 0 ]; then exit 1; fi;'
- run: docker run --rm pyiron/experimental /bin/bash -c 'source /opt/conda/bin/activate; i=0; for f in $(ls "${HOME}"/notebooks_*/*.ipynb); do jupyter nbconvert --ExecutePreprocessor.timeout=9999999 --ExecutePreprocessor.kernel_name=python3 --to notebook --execute $f || i=$((i+1)); done; if [ $i -gt 0 ]; then exit 1; fi;'
- run: mkdir -p environment; chmod 777 environment
- run: docker run -v $(pwd)/environment:/home/jovyan/ --rm pyiron/base /bin/bash -c 'source /opt/conda/bin/activate; conda env export > /home/jovyan/pyiron_base_$(date +%F).yml;'
- run: docker run -v $(pwd)/environment:/home/jovyan/ --rm pyiron/md /bin/bash -c 'source /opt/conda/bin/activate; conda env export > /home/jovyan/pyiron_md_$(date +%F).yml;'
Expand Down
5 changes: 4 additions & 1 deletion base/environment.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
channels:
- conda-forge
dependencies:
- pyiron_base =0.8.4
- pyiron_base =0.9.10
- git =2.42.0
- openmpi =4.1.6
- hdf5 =1.14.3=mpi_openmpi_*
3 changes: 2 additions & 1 deletion continuum/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ RUN mamba env update -n base -f ${HOME}/environment.yml && \

USER root
ENV NOTEBOOK_DIR=${HOME}/notebooks_continuum
RUN chmod +x ${HOME}/include_notebooks.sh && \
RUN rm -rf ${HOME}/notebooks_atomistics && \
chmod +x ${HOME}/include_notebooks.sh && \
/bin/bash ${HOME}/include_notebooks.sh && \
fix-permissions ${HOME} && \
fix-permissions $CONDA_DIR
Expand Down
3 changes: 3 additions & 0 deletions continuum/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,11 @@ dependencies:
- damask =3.0.0a8
- fenics =2019.1.0=*_42
- mshr =2019.1.0=*_9
- pyiron_base =0.8.2
- pyiron_atomistics =0.5.3
- pyiron_continuum =0.0.8
- pyiron_gpl =0.0.5
- pyvista =0.43.6
- sqsgenerator =0.3
- vtk =9.2.6
- seaborn =0.13.2
3 changes: 2 additions & 1 deletion experimental/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ RUN mamba env update -n base -f ${HOME}/environment.yml && \

USER root
ENV NOTEBOOK_DIR=${HOME}/notebooks_experimental
RUN chmod +x ${HOME}/include_notebooks.sh && \
RUN rm -rf ${HOME}/notebooks_base && \
chmod +x ${HOME}/include_notebooks.sh && \
/bin/bash ${HOME}/include_notebooks.sh && \
fix-permissions $CONDA_DIR && \
fix-permissions ${HOME}
Expand Down
3 changes: 2 additions & 1 deletion md/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ RUN mamba env update -n base -f ${HOME}/environment.yml && \

USER root
ENV NOTEBOOK_DIR=${HOME}/notebooks_atomistics
RUN chmod +x ${HOME}/include_notebooks.sh && \
RUN rm -rf ${HOME}/notebooks_base && \
chmod +x ${HOME}/include_notebooks.sh && \
/bin/bash include_notebooks.sh &&\
fix-permissions ${HOME} && \
fix-permissions $CONDA_DIR
Expand Down
3 changes: 1 addition & 2 deletions md/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ channels:
- conda-forge
dependencies:
- pyiron =0.5.2
- pyiron_atomistics =0.5.4
- pyscal =2.10.18
- pyiron_atomistics =0.6.9
- pyiron-data =0.0.29
- nglview =3.1.2
- lammps =2023.11.21=*openmpi*
Expand Down
8 changes: 4 additions & 4 deletions mpie_cmti/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ dependencies:
- calphy =1.3.8
- fitsnap3 =3.1.0.1
- nbgitpuller =1.2.1
- pyiron_base =0.9.1
- pyiron_atomistics =0.6.1
- pyiron_snippets =0.1.1
- pyiron_base =0.9.10
- pyiron_atomistics =0.6.9
- pyiron_snippets =0.1.3
- pyiron_contrib =0.1.16
- pyiron_potentialfit =0.3.2
- pyiron_workflow =0.9.1
- pyiron_workflow =0.9.4
- pyiron_gui =0.0.12
- matgl =0.9.2
- mlip =2.0
Expand Down
3 changes: 2 additions & 1 deletion potentialworkshop/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ RUN mamba env update -n base -f ${HOME}/environment.yml && \

USER root
ENV NOTEBOOK_DIR=${HOME}/notebooks_potentialworkshop
RUN chmod +x ${HOME}/include_notebooks.sh && \
RUN rm -rf ${HOME}/notebooks_pyiron && \
chmod +x ${HOME}/include_notebooks.sh && \
/bin/bash include_notebooks.sh &&\
fix-permissions $CONDA_DIR && \
fix-permissions ${HOME}
Expand Down
3 changes: 1 addition & 2 deletions potentialworkshop/environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ dependencies:
- pyiron_contrib =0.1.16
- pyiron_gpl =0.0.5
- nbgitpuller =1.2.1
- python-ace =0.2.8
- tensorpotential =0.2.0
- python-ace =0.3.0
- calphy =1.3.7
- pyxtal =0.6.7
3 changes: 2 additions & 1 deletion pyiron/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ RUN mamba install -n base -c defaults mkl=2023.2.0 && \

USER root
ENV NOTEBOOK_DIR=${HOME}/notebooks_pyiron
RUN chmod +x ${HOME}/include_notebooks.sh && \
RUN rm -rf ${HOME}/notebooks_atomistics && \
chmod +x ${HOME}/include_notebooks.sh && \
/bin/bash include_notebooks.sh &&\
fix-permissions $CONDA_DIR && \
fix-permissions ${HOME}
Expand Down
4 changes: 2 additions & 2 deletions pyiron/environment.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
channels:
- conda-forge
dependencies:
- sphinxdft =3.0.7
- gpaw =24.1.0=*openmpi*
- sphinxdft =3.1
- gpaw =24.6.0=*openmpi*
10 changes: 5 additions & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
pyiron==0.5.2
pyiron_base==0.9.1
pyiron-atomistics==0.6.1
pyiron_base==0.9.10
pyiron-atomistics==0.6.9
pyiron-continuum==0.0.8
pyiron-contrib==0.1.16
pyiron_experimental==0.0.3
pyiron_workflow==0.9.1
pyiron_workflow==0.9.4
pyiron-gpl==0.0.5
pyiron_snippets==0.1.1
pyiron_potentialfit==0.3.2
calphy==1.3.8
damask==3.0.0a8
fenics==2019.1.0
gpaw==24.1.0
gpaw==24.6.0
hyperspy==2.1.1
jupyter-server-proxy==4.1.2
nbgitpuller==1.2.1
nglview==3.1.2
pystem==0.0.26
python-ace==0.2.8
python-ace==0.3.0
pyvista==0.43.6
pyxem==0.19.1
pyxtal==0.6.7
Expand Down