Skip to content

Commit

Permalink
Use micromamba activate instead of mamba activate
Browse files Browse the repository at this point in the history
The shell macros are only defined for micromamba
but not for mamba.

This brings consistency.

But then, what was making it working before?

Signed-off-by: Julien Jerphanion <[email protected]>

Co-authored-by: Sylvain Corlay <[email protected]>
Co-authored-by: Hind Montassif <[email protected]>
  • Loading branch information
3 people committed Aug 22, 2024
1 parent efe36d7 commit 0a14433
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions repo2docker/buildpacks/conda/activate-conda.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ done
if [[ "${KERNEL_PYTHON_PREFIX}" != "${NB_PYTHON_PREFIX}" ]]; then
# if the kernel is a separate env, stack them
# so both are on PATH, notebook first
mamba activate ${KERNEL_PYTHON_PREFIX}
mamba activate --stack ${NB_PYTHON_PREFIX}
micromamba activate ${KERNEL_PYTHON_PREFIX}
micromamba activate --stack ${NB_PYTHON_PREFIX}

# even though it's second on $PATH
# make sure CONDA_DEFAULT_ENV is the *kernel* env
Expand All @@ -17,5 +17,5 @@ if [[ "${KERNEL_PYTHON_PREFIX}" != "${NB_PYTHON_PREFIX}" ]]; then
# which only contains UI when the two are different
export CONDA_DEFAULT_ENV="${KERNEL_PYTHON_PREFIX}"
else
mamba activate ${NB_PYTHON_PREFIX}
micromamba activate ${NB_PYTHON_PREFIX}
fi

0 comments on commit 0a14433

Please sign in to comment.