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

Bump aiida-core to v2.4.0 and aiidalab to v23.3.2 #396

Merged
merged 10 commits into from
Nov 10, 2023
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
2 changes: 2 additions & 0 deletions .github/workflows/docker-build-test-upload.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,12 @@ jobs:
mkdir -p /tmp/aiidalab/
docker save ${{ env.OWNER }}/${{ inputs.image }} -o /tmp/aiidalab/${{ inputs.image }}-${{ inputs.architecture }}.tar
shell: bash
if: always()

- name: Upload image as artifact 💾
uses: actions/upload-artifact@v3
with:
name: ${{ inputs.image }}-${{ inputs.architecture }}
path: /tmp/aiidalab/${{ inputs.image }}-${{ inputs.architecture }}.tar
retention-days: 3
if: always()
3 changes: 3 additions & 0 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,7 @@ jobs:
needs: [arm64-base-with-services, arm64-lab]

amd64-push-ghcr:
if: always()
uses: ./.github/workflows/docker-push.yml
strategy:
matrix:
Expand All @@ -136,6 +137,7 @@ jobs:
needs: [amd64-base, amd64-base-with-services, amd64-lab, amd64-full-stack]

arm64-push-ghcr:
if: always()
uses: ./.github/workflows/docker-push.yml
strategy:
matrix:
Expand All @@ -150,6 +152,7 @@ jobs:
needs: [arm64-base, arm64-base-with-services, arm64-lab, arm64-full-stack]

merge-tags-ghcr:
if: always()
uses: ./.github/workflows/docker-merge-tags.yml
strategy:
matrix:
Expand Down
4 changes: 2 additions & 2 deletions build.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
"default": "15"
},
"AIIDA_VERSION": {
"default": "2.3.1"
"default": "2.4.0"
},
"AIIDALAB_VERSION": {
"default": "23.03.0"
"default": "23.03.2"
},
"AIIDALAB_HOME_VERSION": {
"default": "23.03.1"
Expand Down
12 changes: 8 additions & 4 deletions stack/base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,23 @@ WORKDIR /opt/

ARG AIIDA_VERSION

# Pin shared requirements in the base environemnt.
# The lower bound of aiida-core is set to the version of aiida-core to prevent
# lower aiida-core DB version installed and trigger database downgrade.
RUN echo "pip==23.3.1" > /opt/requirements.txt && \
echo "aiida-core>=${AIIDA_VERSION},<3" >> /opt/requirements.txt

# Install the shared requirements.
COPY requirements.txt .
RUN mamba install --yes \
aiida-core=${AIIDA_VERSION} \
mamba-bash-completion \
--file requirements.txt \
--file /opt/requirements.txt \
&& mamba clean --all -f -y && \
fix-permissions "${CONDA_DIR}" && \
fix-permissions "/home/${NB_USER}"


# Pin shared requirements in the base environemnt.
RUN cat requirements.txt | xargs -I{} conda config --system --add pinned_packages {}
unkcpz marked this conversation as resolved.
Show resolved Hide resolved
RUN cat /opt/requirements.txt | xargs -I{} conda config --system --add pinned_packages {}

# Configure pip to use requirements file as constraints file.
ENV PIP_CONSTRAINT=/opt/requirements.txt
Expand Down
2 changes: 0 additions & 2 deletions stack/base/requirements.txt

This file was deleted.

2 changes: 1 addition & 1 deletion tests/test-full-stack.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
def generate_aiidalab_install_output(aiidalab_exec, nb_user):
def _generate_aiidalab_install_output(package_name):
output = (
aiidalab_exec(f"aiidalab install --yes {package_name}", user=nb_user)
aiidalab_exec(f"aiidalab install --yes --pre {package_name}", user=nb_user)
Copy link
Contributor

Choose a reason for hiding this comment

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

Not sure if this is needed, since we're also installing directly from the branch in test_install_apps_from_default_branch. But I guess it is fine.

Copy link
Member Author

Choose a reason for hiding this comment

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

Much appreciate for writing the detailed test flow, I'll test on QeApp with @superstar54 who has quite many containers with lots of calculations.

Per --pre options I added, it is for QeApp specifically since we didn't make the release v23.10.0 yet but the prerelease version. The stable version is still v23.04.6 which pinning to aiida-core~=2.3.0 will try to downgrade aiida-core and fail the test (exactly what we improved in this PR).

I personally think here it is better to not use --pre but only test the stable version. I will keep this PR until we make the release of v23.10.0 which the planned date is 6th November.

Copy link
Contributor

Choose a reason for hiding this comment

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

@unkcpz @superstar54 friendly ping, would be good to test and merge so that others can test this via the edge image.

Copy link
Member Author

Choose a reason for hiding this comment

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

Tested, all good. The migration is run and calculations can be reloaded with showing the same result properly.

.decode()
.strip()
)
Expand Down