Skip to content

Commit

Permalink
lower bound of aiida-core
Browse files Browse the repository at this point in the history
  • Loading branch information
unkcpz committed Oct 22, 2023
1 parent eba3da2 commit 08a0d7d
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 9 deletions.
13 changes: 7 additions & 6 deletions stack/base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,20 +16,21 @@ 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.0.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 {}

# 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)
.decode()
.strip()
)
Expand Down

0 comments on commit 08a0d7d

Please sign in to comment.