Update for mamba 2.0.0rc6

repo2docker/buildpacks/conda/activate-conda.sh

@@ -1,5 +1,5 @@
 # enable conda and activate the notebook environment
-eval $(micromamba shell hook -s posix -p ${CONDA_DIR})
+eval $(micromamba shell hook -s posix -r ${CONDA_DIR})
 for name in conda mamba; do
     CONDA_PROFILE="${CONDA_DIR}/etc/profile.d/${name}.sh"
     test -f $CONDA_PROFILE && . $CONDA_PROFILE

repo2docker/buildpacks/conda/install-base-env.bash

@@ -5,8 +5,8 @@ set -ex
 
 cd $(dirname $0)
 
-export MAMBA_VERSION=1.5.8
-export CONDA_VERSION=24.5.0
+export MAMBA_VERSION="2.0.0rc2"
+export CONDA_VERSION=24.7.0
 
 URL="https://anaconda.org/conda-forge/micromamba/${MAMBA_VERSION}/download/${CONDA_PLATFORM}/micromamba-${MAMBA_VERSION}-0.tar.bz2"
 
@@ -21,7 +21,9 @@ 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)"
+
+eval "$(micromamba shell hook --shell bash)"
 
 micromamba activate
 
@@ -36,7 +38,14 @@ update_dependencies: false
 # channel_priority: flexible
 EOT
 
-micromamba install conda=${CONDA_VERSION} mamba=${MAMBA_VERSION} -y
+# TODO: remove channels and conda-libmamba-solver once 2.0.0 is used.
+micromamba install \
+    -c conda-canary/label/conda-libmamba-solver-pr-457 \
+    -c conda-forge/label/mamba_dev \
+    -c conda-forge \
+    "conda-libmamba-solver>=${CONDA_VERSION}" \
+    "conda>=${CONDA_VERSION}" \
+    mamba=${MAMBA_VERSION} -y
 
 echo "installing notebook env:"
 cat "${NB_ENVIRONMENT_FILE}"

tests/conda/py35-binder-dir/verify

@@ -16,13 +16,13 @@ v = out.split()[1]
 assert v[:3] == "3.5", out
 
 out = sh(["micromamba", "--version"])
-assert out == "1.5.8", out
+assert out == "2.0.0", out
 
 out = sh(["mamba", "--version"])
 assert (
     out
-    == """mamba 1.5.8
-conda 24.5.0"""
+    == """mamba 2.0.0
+conda 24.7.0"""
 ), out
 
 sh([kernel_python, "-c", "import numpy"])