From 7b5e0a2bea408de49ad87500394e86f39d41282b Mon Sep 17 00:00:00 2001 From: Julien Jerphanion Date: Thu, 30 Jan 2025 10:38:25 +0100 Subject: [PATCH 1/5] test: Use mamba 2.0.6.rc1 Signed-off-by: Julien Jerphanion --- repo2docker/buildpacks/conda/install-base-env.bash | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/repo2docker/buildpacks/conda/install-base-env.bash b/repo2docker/buildpacks/conda/install-base-env.bash index a26eff59..3006b0af 100755 --- a/repo2docker/buildpacks/conda/install-base-env.bash +++ b/repo2docker/buildpacks/conda/install-base-env.bash @@ -5,7 +5,7 @@ set -ex cd $(dirname $0) -export MAMBA_VERSION="2.0.5" +export MAMBA_VERSION="2.0.6.rc1" export CONDA_VERSION=24.11.0 URL="https://anaconda.org/conda-forge/micromamba/${MAMBA_VERSION}/download/${CONDA_PLATFORM}/micromamba-${MAMBA_VERSION}-0.tar.bz2" @@ -36,7 +36,10 @@ update_dependencies: false # channel_priority: flexible EOT -micromamba install conda=${CONDA_VERSION} mamba=${MAMBA_VERSION} -y +micromamba install \ + -c conda-forge/label/mamba_prerelease \ + -c conda-forge \ + conda=${CONDA_VERSION} mamba=${MAMBA_VERSION} -y echo "installing notebook env:" cat "${NB_ENVIRONMENT_FILE}" From 0ebe188f3c4754f2d8e60a4690fc5602ce0f7444 Mon Sep 17 00:00:00 2001 From: Julien Jerphanion Date: Fri, 31 Jan 2025 09:34:13 +0100 Subject: [PATCH 2/5] Adapt tests Signed-off-by: Julien Jerphanion --- tests/conda/py35-binder-dir/verify | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/conda/py35-binder-dir/verify b/tests/conda/py35-binder-dir/verify index 5b01d9a9..45414bbc 100755 --- a/tests/conda/py35-binder-dir/verify +++ b/tests/conda/py35-binder-dir/verify @@ -16,10 +16,10 @@ v = out.split()[1] assert v[:3] == "3.5", out out = sh(["micromamba", "--version"]) -assert out == "2.0.5", out +assert out == "2.0.6.rc1", out out = sh(["mamba", "--version"]) -assert out == "2.0.5", out +assert out == "2.0.6.rc1", out sh([kernel_python, "-c", "import numpy"]) From cd49b1da4e2269875242b7ea28fd80814ef0ecce Mon Sep 17 00:00:00 2001 From: Julien Jerphanion Date: Fri, 31 Jan 2025 09:48:57 +0100 Subject: [PATCH 3/5] Try 2.0.6.rc0 Signed-off-by: Julien Jerphanion --- repo2docker/buildpacks/conda/install-base-env.bash | 2 +- tests/conda/py35-binder-dir/verify | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/repo2docker/buildpacks/conda/install-base-env.bash b/repo2docker/buildpacks/conda/install-base-env.bash index 3006b0af..4bca247b 100755 --- a/repo2docker/buildpacks/conda/install-base-env.bash +++ b/repo2docker/buildpacks/conda/install-base-env.bash @@ -5,7 +5,7 @@ set -ex cd $(dirname $0) -export MAMBA_VERSION="2.0.6.rc1" +export MAMBA_VERSION="2.0.6.rc0" export CONDA_VERSION=24.11.0 URL="https://anaconda.org/conda-forge/micromamba/${MAMBA_VERSION}/download/${CONDA_PLATFORM}/micromamba-${MAMBA_VERSION}-0.tar.bz2" diff --git a/tests/conda/py35-binder-dir/verify b/tests/conda/py35-binder-dir/verify index 45414bbc..48ee27f4 100755 --- a/tests/conda/py35-binder-dir/verify +++ b/tests/conda/py35-binder-dir/verify @@ -16,10 +16,10 @@ v = out.split()[1] assert v[:3] == "3.5", out out = sh(["micromamba", "--version"]) -assert out == "2.0.6.rc1", out +assert out == "2.0.6.rc0", out out = sh(["mamba", "--version"]) -assert out == "2.0.6.rc1", out +assert out == "2.0.6.rc0", out sh([kernel_python, "-c", "import numpy"]) From e1444c26210585079bfc2064d11e418f0e336c92 Mon Sep 17 00:00:00 2001 From: Julien Jerphanion Date: Fri, 31 Jan 2025 13:53:35 +0100 Subject: [PATCH 4/5] Use 2.0.6.rc2 --- .../buildpacks/conda/activate-conda.sh | 25 ++++++++++++++----- .../buildpacks/conda/install-base-env.bash | 2 +- tests/conda/py35-binder-dir/verify | 4 +-- 3 files changed, 22 insertions(+), 9 deletions(-) diff --git a/repo2docker/buildpacks/conda/activate-conda.sh b/repo2docker/buildpacks/conda/activate-conda.sh index 31264657..0a1e27d5 100755 --- a/repo2docker/buildpacks/conda/activate-conda.sh +++ b/repo2docker/buildpacks/conda/activate-conda.sh @@ -1,11 +1,24 @@ -# enable conda and activate the notebook environment set -ex + +# Setup conda +CONDA_PROFILE="${CONDA_DIR}/etc/profile.d/conda.sh" +echo "Activating profile: ${CONDA_PROFILE}" +test -f $CONDA_PROFILE && . $CONDA_PROFILE + +# Setup micromamba eval $(micromamba shell hook -s posix -r ${CONDA_DIR}) -for name in conda mamba; do - CONDA_PROFILE="${CONDA_DIR}/etc/profile.d/${name}.sh" - echo "Activating profile: ${CONDA_PROFILE}" - test -f $CONDA_PROFILE && . $CONDA_PROFILE -done + +# Setup mamba +export MAMBA_ROOT_PREFIX="${CONDA_DIR}" +__mamba_setup="$("${CONDA_DIR}/bin/mamba" shell hook --shell posix 2> /dev/null)" +if [ $? -eq 0 ]; then + eval "$__mamba_setup" +else + alias mamba="${CONDA_DIR}/bin/mamba" # Fallback on help from mamba activate +fi +unset __mamba_setup + +# Activate the environment if [[ "${KERNEL_PYTHON_PREFIX}" != "${NB_PYTHON_PREFIX}" ]]; then # if the kernel is a separate env, stack them # so both are on PATH, notebook first diff --git a/repo2docker/buildpacks/conda/install-base-env.bash b/repo2docker/buildpacks/conda/install-base-env.bash index 4bca247b..0111320e 100755 --- a/repo2docker/buildpacks/conda/install-base-env.bash +++ b/repo2docker/buildpacks/conda/install-base-env.bash @@ -5,7 +5,7 @@ set -ex cd $(dirname $0) -export MAMBA_VERSION="2.0.6.rc0" +export MAMBA_VERSION="2.0.6.rc2" export CONDA_VERSION=24.11.0 URL="https://anaconda.org/conda-forge/micromamba/${MAMBA_VERSION}/download/${CONDA_PLATFORM}/micromamba-${MAMBA_VERSION}-0.tar.bz2" diff --git a/tests/conda/py35-binder-dir/verify b/tests/conda/py35-binder-dir/verify index 48ee27f4..fdd0d200 100755 --- a/tests/conda/py35-binder-dir/verify +++ b/tests/conda/py35-binder-dir/verify @@ -16,10 +16,10 @@ v = out.split()[1] assert v[:3] == "3.5", out out = sh(["micromamba", "--version"]) -assert out == "2.0.6.rc0", out +assert out == "2.0.6.rc2", out out = sh(["mamba", "--version"]) -assert out == "2.0.6.rc0", out +assert out == "2.0.6.rc2", out sh([kernel_python, "-c", "import numpy"]) From 4143bf649afd94f79ba632f95b22feef88e257bd Mon Sep 17 00:00:00 2001 From: Julien Jerphanion Date: Fri, 31 Jan 2025 13:53:35 +0100 Subject: [PATCH 5/5] Use 2.0.6.rc3 --- repo2docker/buildpacks/conda/install-base-env.bash | 2 +- tests/conda/py35-binder-dir/verify | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/repo2docker/buildpacks/conda/install-base-env.bash b/repo2docker/buildpacks/conda/install-base-env.bash index 0111320e..bf54c933 100755 --- a/repo2docker/buildpacks/conda/install-base-env.bash +++ b/repo2docker/buildpacks/conda/install-base-env.bash @@ -5,7 +5,7 @@ set -ex cd $(dirname $0) -export MAMBA_VERSION="2.0.6.rc2" +export MAMBA_VERSION="2.0.6.rc3" export CONDA_VERSION=24.11.0 URL="https://anaconda.org/conda-forge/micromamba/${MAMBA_VERSION}/download/${CONDA_PLATFORM}/micromamba-${MAMBA_VERSION}-0.tar.bz2" diff --git a/tests/conda/py35-binder-dir/verify b/tests/conda/py35-binder-dir/verify index fdd0d200..9d5776b2 100755 --- a/tests/conda/py35-binder-dir/verify +++ b/tests/conda/py35-binder-dir/verify @@ -16,10 +16,10 @@ v = out.split()[1] assert v[:3] == "3.5", out out = sh(["micromamba", "--version"]) -assert out == "2.0.6.rc2", out +assert out == "2.0.6.rc3", out out = sh(["mamba", "--version"]) -assert out == "2.0.6.rc2", out +assert out == "2.0.6.rc3", out sh([kernel_python, "-c", "import numpy"])