Skip to content

Commit 3f6555b

Browse files
niklassiemerniklassiemer
authored
Merge pull request #643 from pyiron/quayio
Use Quay.io for python 3.12
2 parents 62f0901 + afcd2ad commit 3f6555b

File tree

14 files changed

+22
-152
lines changed

14 files changed

+22
-152
lines changed

‎.github/workflows/push.yml‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,6 @@ jobs:
3939
tail --lines=+5 pyiron/environment.yml >> potentialworkshop/environment.yml
4040
docker build -t pyiron/potentialworkshop:latest potentialworkshop/
4141
docker tag pyiron/potentialworkshop:latest pyiron/potentialworkshop:"$(date +%F)"
42-
- name: Build pyiron/experimental
43-
timeout-minutes: 5
44-
run: |
45-
tail --lines=+5 base/environment.yml >> experimental/environment.yml
46-
docker build -t pyiron/experimental:latest experimental/
47-
docker tag pyiron/experimental:latest pyiron/experimental:"$(date +%F)"
4842
# Publish
4943
- run: docker images
5044
- run: docker push pyiron/base:latest
@@ -55,15 +49,12 @@ jobs:
5549
- run: docker push pyiron/pyiron:"$(date +%F)"
5650
- run: docker push pyiron/potentialworkshop:latest
5751
- run: docker push pyiron/potentialworkshop:"$(date +%F)"
58-
- run: docker push pyiron/experimental:latest
59-
- run: docker push pyiron/experimental:"$(date +%F)"
6052
# Export Environments
6153
- run: mkdir -p environment; chmod 777 environment
6254
- 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;'
6355
- 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;'
6456
- run: docker run -v $(pwd)/environment:/home/jovyan/ --rm pyiron/pyiron /bin/bash -c 'source /opt/conda/bin/activate; conda env export > /home/jovyan/pyiron_pyiron_$(date +%F).yml;'
6557
- run: docker run -v $(pwd)/environment:/home/jovyan/ --rm pyiron/potentialworkshop /bin/bash -c 'source /opt/conda/bin/activate; conda env export > /home/jovyan/pyiron_potentialworkshop_$(date +%F).yml;'
66-
- run: docker run -v $(pwd)/environment:/home/jovyan/ --rm pyiron/experimental /bin/bash -c 'source /opt/conda/bin/activate; conda env export > /home/jovyan/pyiron_experimental_$(date +%F).yml;'
6758
- run: ls -al environment
6859
- name: cache
6960
uses: actions/cache/save@v4

‎.github/workflows/testing.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
- name: Setup Mambaforge
2121
uses: conda-incubator/setup-miniconda@v3
2222
with:
23-
python-version: "3.11"
23+
python-version: "3.12"
2424
miniforge-version: latest
2525
condarc-file: .condarc
2626
environment-file: environment.yml
@@ -67,12 +67,12 @@ jobs:
6767
tail --lines=+5 pyiron/environment.yml >> potentialworkshop/environment.yml
6868
docker build -t pyiron/potentialworkshop:latest potentialworkshop/
6969
docker tag pyiron/potentialworkshop:latest pyiron/potentialworkshop:"$(date +%F)"
70-
- name: Build pyiron/experimental
71-
timeout-minutes: 5
72-
run: |
73-
tail --lines=+5 base/environment.yml >> experimental/environment.yml
74-
docker build -t pyiron/experimental:latest experimental/
75-
docker tag pyiron/experimental:latest pyiron/experimental:"$(date +%F)"
70+
# - name: Build pyiron/experimental
71+
# timeout-minutes: 5
72+
# run: |
73+
# tail --lines=+5 base/environment.yml >> experimental/environment.yml
74+
# docker build -t pyiron/experimental:latest experimental/
75+
# docker tag pyiron/experimental:latest pyiron/experimental:"$(date +%F)"
7676
# Testing
7777
- run: docker images
7878
#- name: Test pyiron/continuum
@@ -84,9 +84,9 @@ jobs:
8484
- name: Test pyiron/pyiron
8585
timeout-minutes: 20
8686
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;'
87-
- name: Test pyiron/experimental
88-
timeout-minutes: 5
89-
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;'
87+
# - name: Test pyiron/experimental
88+
# timeout-minutes: 5
89+
# 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;'
9090
# Export Environments
9191
- run: mkdir -p environment; chmod 777 environment
9292
- 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;'

‎base/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG ROOT_CONTAINER=quay.io/jupyter/base-notebook:b74418220768
1+
ARG ROOT_CONTAINER=quay.io/jupyter/base-notebook:82d322f00937
22
ARG BASE_CONTAINER=$ROOT_CONTAINER
33
FROM $BASE_CONTAINER
44

‎continuum/Dockerfile‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎continuum/apt.txt‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎continuum/environment.yml‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎continuum/include_notebooks.sh‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎experimental/Dockerfile‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎experimental/environment.yml‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎experimental/include_notebooks.sh‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)