Skip to content

Commit b341995

Browse files
authored
Merge pull request #343 from pyiron/debug_tests
Debug docker stack - try to fix notebook execution
2 parents 314f6f0 + 21c0ecc commit b341995

File tree

13 files changed

+34
-25
lines changed

13 files changed

+34
-25
lines changed

.github/workflows/testing.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ jobs:
2424
- run: docker build -t pyiron/mpie_cmti:latest mpie_cmti/
2525
- run: docker tag pyiron/mpie_cmti:latest pyiron/mpie_cmti:"$(date +%F)"
2626
- run: docker images
27-
- 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;'
28-
- 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;'
29-
- 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;'
30-
- 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;'
27+
- 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;'
28+
- 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;'
29+
- 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;'
30+
- 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;'
3131
- run: mkdir -p environment; chmod 777 environment
3232
- 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;'
3333
- 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;'

base/environment.yml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
channels:
22
- conda-forge
33
dependencies:
4-
- pyiron_base =0.8.4
4+
- pyiron_base =0.9.10
5+
- git =2.42.0
6+
- openmpi =4.1.6
7+
- hdf5 =1.14.3=mpi_openmpi_*

continuum/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ RUN mamba env update -n base -f ${HOME}/environment.yml && \
2525

2626
USER root
2727
ENV NOTEBOOK_DIR=${HOME}/notebooks_continuum
28-
RUN chmod +x ${HOME}/include_notebooks.sh && \
28+
RUN rm -rf ${HOME}/notebooks_atomistics && \
29+
chmod +x ${HOME}/include_notebooks.sh && \
2930
/bin/bash ${HOME}/include_notebooks.sh && \
3031
fix-permissions ${HOME} && \
3132
fix-permissions $CONDA_DIR

continuum/environment.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,11 @@ dependencies:
44
- damask =3.0.0a8
55
- fenics =2019.1.0=*_42
66
- mshr =2019.1.0=*_9
7+
- pyiron_base =0.8.2
8+
- pyiron_atomistics =0.5.3
79
- pyiron_continuum =0.0.8
810
- pyiron_gpl =0.0.5
911
- pyvista =0.43.6
1012
- sqsgenerator =0.3
1113
- vtk =9.2.6
14+
- seaborn =0.13.2

experimental/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ RUN mamba env update -n base -f ${HOME}/environment.yml && \
1515

1616
USER root
1717
ENV NOTEBOOK_DIR=${HOME}/notebooks_experimental
18-
RUN chmod +x ${HOME}/include_notebooks.sh && \
18+
RUN rm -rf ${HOME}/notebooks_base && \
19+
chmod +x ${HOME}/include_notebooks.sh && \
1920
/bin/bash ${HOME}/include_notebooks.sh && \
2021
fix-permissions $CONDA_DIR && \
2122
fix-permissions ${HOME}

md/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ RUN mamba env update -n base -f ${HOME}/environment.yml && \
1919

2020
USER root
2121
ENV NOTEBOOK_DIR=${HOME}/notebooks_atomistics
22-
RUN chmod +x ${HOME}/include_notebooks.sh && \
22+
RUN rm -rf ${HOME}/notebooks_base && \
23+
chmod +x ${HOME}/include_notebooks.sh && \
2324
/bin/bash include_notebooks.sh &&\
2425
fix-permissions ${HOME} && \
2526
fix-permissions $CONDA_DIR

md/environment.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,7 @@ channels:
22
- conda-forge
33
dependencies:
44
- pyiron =0.5.2
5-
- pyiron_atomistics =0.5.4
6-
- pyscal =2.10.18
5+
- pyiron_atomistics =0.6.9
76
- pyiron-data =0.0.29
87
- nglview =3.1.2
98
- lammps =2023.11.21=*openmpi*

mpie_cmti/environment.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ dependencies:
55
- calphy =1.3.8
66
- fitsnap3 =3.1.0.1
77
- nbgitpuller =1.2.1
8-
- pyiron_base =0.9.1
9-
- pyiron_atomistics =0.6.1
10-
- pyiron_snippets =0.1.1
8+
- pyiron_base =0.9.10
9+
- pyiron_atomistics =0.6.9
10+
- pyiron_snippets =0.1.3
1111
- pyiron_contrib =0.1.16
1212
- pyiron_potentialfit =0.3.2
13-
- pyiron_workflow =0.9.1
13+
- pyiron_workflow =0.9.4
1414
- pyiron_gui =0.0.12
1515
- matgl =0.9.2
1616
- mlip =2.0

potentialworkshop/Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ RUN mamba env update -n base -f ${HOME}/environment.yml && \
1515

1616
USER root
1717
ENV NOTEBOOK_DIR=${HOME}/notebooks_potentialworkshop
18-
RUN chmod +x ${HOME}/include_notebooks.sh && \
18+
RUN rm -rf ${HOME}/notebooks_pyiron && \
19+
chmod +x ${HOME}/include_notebooks.sh && \
1920
/bin/bash include_notebooks.sh &&\
2021
fix-permissions $CONDA_DIR && \
2122
fix-permissions ${HOME}

potentialworkshop/environment.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ dependencies:
77
- pyiron_contrib =0.1.16
88
- pyiron_gpl =0.0.5
99
- nbgitpuller =1.2.1
10-
- python-ace =0.2.8
11-
- tensorpotential =0.2.0
10+
- python-ace =0.3.0
1211
- calphy =1.3.7
1312
- pyxtal =0.6.7

0 commit comments

Comments
 (0)