Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Python-3.10 image #337

Closed
wants to merge 25 commits into from
Closed
Show file tree
Hide file tree
Changes from 22 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
4d1f1d3
Try Python 3.10.6
danielhollas Nov 28, 2022
34d7e19
Try fix aiidalab deps
danielhollas Nov 29, 2022
7dbdbac
Fix full-stack
danielhollas Nov 29, 2022
5bc9078
Try 3.10.8
danielhollas Nov 29, 2022
429794b
Merge branch 'main' into python3.10
danielhollas Nov 29, 2022
6071974
Merge branch 'main' into python3.10
danielhollas Dec 12, 2022
ef5661b
Downgrade to Python 3.10.6
danielhollas Dec 12, 2022
1014a6b
Merge branch 'main' into python3.10
danielhollas Jan 11, 2023
b827bc2
Merge branch 'main' into python3.10
danielhollas Mar 9, 2023
2111c72
Revert aiidalab patch
danielhollas Mar 17, 2023
f675a4b
Merge branch 'main' into python3.10
danielhollas Mar 20, 2023
480dcbd
Python 3.10.8
danielhollas Mar 20, 2023
ae4e87b
Python 3.10.9
danielhollas Mar 20, 2023
424dc64
Merge branch 'main' into python3.10
danielhollas May 30, 2023
d9d24da
Python 3.11.4
danielhollas Jun 22, 2023
071beb6
Python 3.10.11
danielhollas Jun 27, 2023
fbe9a9e
Merge branch 'main' into python3.10
danielhollas Jul 17, 2023
8aabe32
Disable banner about Notebook v7 migration
danielhollas Jul 17, 2023
e41bb60
DEBUG: Do not upgrade pip before installing dev dependencies
danielhollas Jul 17, 2023
730c73e
Revert "DEBUG: Do not upgrade pip before installing dev dependencies"
danielhollas Jul 17, 2023
5ab51dc
Pin PyYAML<=5.3
danielhollas Jul 17, 2023
33946f6
Disable tests temporarily
danielhollas Jul 17, 2023
161dbae
Revert "Disable tests temporarily"
danielhollas Jul 18, 2023
95d984d
Merge branch 'main' into python3.10
danielhollas Dec 14, 2023
cb90231
Merge branch 'main' into python3.10
unkcpz Jan 10, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/docker-build-test-upload.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ jobs:
BUILDKIT_PROGRESS: plain
shell: bash

- name: Run tests ✅
run: VERSION=newly-build pytest -s tests/test-common.py tests/test-${{ inputs.image }}.py --variant ${{ inputs.image }}
shell: bash
# - name: Run tests ✅
#run: VERSION=newly-build pytest -s tests/test-common.py tests/test-${{ inputs.image }}.py --variant ${{ inputs.image }}
#shell: bash
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why did you comment this out? The time bottleneck was during the upload the images as artifacts, it is an issue from GitHub side.


- name: Save image as a tar for later use 💾
run: docker save ${{ env.OWNER }}/${{ inputs.image }} -o /tmp/${{ inputs.image }}-${{ inputs.architecture }}.tar
Expand Down
2 changes: 1 addition & 1 deletion build.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"variable": {
"PYTHON_VERSION": {
"default": "3.9.13"
"default": "3.10.11"
},
"PGSQL_VERSION": {
"default": "15"
Expand Down
1 change: 1 addition & 0 deletions requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ pytest-docker
docker-compose
doit
dunamai
pyyaml<=5.3.1
danielhollas marked this conversation as resolved.
Show resolved Hide resolved
2 changes: 1 addition & 1 deletion stack/full-stack/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN if [ "$TARGETARCH" = "arm64" ]; then \
fi

RUN fix-permissions "${CONDA_DIR}"
RUN fix-permissions "/home/${NB_USER}/.aiida"
RUN fix-permissions "/home/${NB_USER}"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍


USER ${NB_USER}

Expand Down
4 changes: 3 additions & 1 deletion stack/lab/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ WORKDIR "/home/${NB_USER}"

RUN mkdir -p /home/${NB_USER}/apps

# When a Jupyter notebook server looses a connection to the frontend,
# NOTE 1: When a Jupyter notebook server looses a connection to the frontend,
# it keeps the messages in a buffer. If there is a background thread running
# and trying to update the frontend, the buffer grows indefinitely,
# eventually consuming all available RAM.
Expand All @@ -92,8 +92,10 @@ RUN mkdir -p /home/${NB_USER}/apps
# but that may come with other problems for people with flaky internet connections.
# Instead, here we configure Jupyter to kill all kernels that have been alive for
# more than 12 hours. We also close all inactive terminals after 10 minutes.
# NOTE 2: show_banner=False disables the banner for upgrading to Notebook 7.
ENV NOTEBOOK_ARGS \
"--NotebookApp.default_url='/apps/apps/home/start.ipynb'" \
"--NotebookApp.show_banner=False" \
"--ContentsManager.allow_hidden=True" \
"--MappingKernelManager.buffer_offline_messages=True" \
"--MappingKernelManager.cull_busy=True" \
Expand Down