Merge pull request #1387 from JohanMabille/micromamba-2.0.5

Upgraded to micromamba 2.0.5
jupyterhub · Dec 14, 2024 · f0b1c0c · f0b1c0c
2 parents 8862732 + f41329f
commit f0b1c0c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/repo2docker/buildpacks/conda/activate-conda.sh b/repo2docker/buildpacks/conda/activate-conda.sh
@@ -1,7 +1,9 @@
 # enable conda and activate the notebook environment
-eval $(micromamba shell hook -s posix -p ${CONDA_DIR})
+set -ex
+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
 if [[ "${KERNEL_PYTHON_PREFIX}" != "${NB_PYTHON_PREFIX}" ]]; then

diff --git a/repo2docker/buildpacks/conda/install-base-env.bash b/repo2docker/buildpacks/conda/install-base-env.bash
@@ -5,8 +5,8 @@ set -ex
 
 cd $(dirname $0)
 
-export MAMBA_VERSION=1.5.9
-export CONDA_VERSION=24.5.0
+export MAMBA_VERSION="2.0.5"
+export CONDA_VERSION=24.11.0
 
 URL="https://anaconda.org/conda-forge/micromamba/${MAMBA_VERSION}/download/${CONDA_PLATFORM}/micromamba-${MAMBA_VERSION}-0.tar.bz2"
 
@@ -21,7 +21,7 @@ time wget -qO- ${URL} | tar -xvj bin/micromamba
 mv bin/micromamba "$MICROMAMBA_EXE"
 chmod 0755 "$MICROMAMBA_EXE"
 
-eval "$(${MICROMAMBA_EXE} shell hook -p ${CONDA_DIR} -s posix)"
+eval "$(${MICROMAMBA_EXE} shell hook --root-prefix ${CONDA_DIR} -s posix)"
 
 micromamba activate
 

diff --git a/tests/conda/py35-binder-dir/verify b/tests/conda/py35-binder-dir/verify
@@ -16,13 +16,10 @@ v = out.split()[1]
 assert v[:3] == "3.5", out
 
 out = sh(["micromamba", "--version"])
-assert out == "1.5.9", out
+assert out == "2.0.5", out
 
 out = sh(["mamba", "--version"])
-assert (
-    out
-    == """mamba 1.5.9
-conda 24.5.0"""
-), out
+assert out == "2.0.5", out
+
 
 sh([kernel_python, "-c", "import numpy"])