Skip to content

Commit f0b1c0c

Browse files
authored
Merge pull request jupyterhub#1387 from JohanMabille/micromamba-2.0.5
Upgraded to micromamba 2.0.5
2 parents 8862732 + f41329f commit f0b1c0c

File tree

3 files changed

+9
-10
lines changed

3 files changed

+9
-10
lines changed

repo2docker/buildpacks/conda/activate-conda.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
# enable conda and activate the notebook environment
2-
eval $(micromamba shell hook -s posix -p ${CONDA_DIR})
2+
set -ex
3+
eval $(micromamba shell hook -s posix -r ${CONDA_DIR})
34
for name in conda mamba; do
45
CONDA_PROFILE="${CONDA_DIR}/etc/profile.d/${name}.sh"
6+
echo "Activating profile: ${CONDA_PROFILE}"
57
test -f $CONDA_PROFILE && . $CONDA_PROFILE
68
done
79
if [[ "${KERNEL_PYTHON_PREFIX}" != "${NB_PYTHON_PREFIX}" ]]; then

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ set -ex
55

66
cd $(dirname $0)
77

8-
export MAMBA_VERSION=1.5.9
9-
export CONDA_VERSION=24.5.0
8+
export MAMBA_VERSION="2.0.5"
9+
export CONDA_VERSION=24.11.0
1010

1111
URL="https://anaconda.org/conda-forge/micromamba/${MAMBA_VERSION}/download/${CONDA_PLATFORM}/micromamba-${MAMBA_VERSION}-0.tar.bz2"
1212

@@ -21,7 +21,7 @@ time wget -qO- ${URL} | tar -xvj bin/micromamba
2121
mv bin/micromamba "$MICROMAMBA_EXE"
2222
chmod 0755 "$MICROMAMBA_EXE"
2323

24-
eval "$(${MICROMAMBA_EXE} shell hook -p ${CONDA_DIR} -s posix)"
24+
eval "$(${MICROMAMBA_EXE} shell hook --root-prefix ${CONDA_DIR} -s posix)"
2525

2626
micromamba activate
2727

tests/conda/py35-binder-dir/verify

+3-6
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,10 @@ v = out.split()[1]
1616
assert v[:3] == "3.5", out
1717

1818
out = sh(["micromamba", "--version"])
19-
assert out == "1.5.9", out
19+
assert out == "2.0.5", out
2020

2121
out = sh(["mamba", "--version"])
22-
assert (
23-
out
24-
== """mamba 1.5.9
25-
conda 24.5.0"""
26-
), out
22+
assert out == "2.0.5", out
23+
2724

2825
sh([kernel_python, "-c", "import numpy"])

0 commit comments

Comments
 (0)