From 6c1a2722b980c4f8ba43fd71bdf7278b364bddc0 Mon Sep 17 00:00:00 2001
From: Sylvain Corlay <sylvain.corlay@gmail.com>
Date: Sun, 6 Dec 2020 08:33:48 +0100
Subject: [PATCH] Use mambaforge instead of miniforge

---
 repo2docker/buildpacks/conda/install-miniforge.bash | 12 +++---------
 tests/conda/binder-dir/verify                       |  2 +-
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/repo2docker/buildpacks/conda/install-miniforge.bash b/repo2docker/buildpacks/conda/install-miniforge.bash
index a117d292..ab372c0c 100755
--- a/repo2docker/buildpacks/conda/install-miniforge.bash
+++ b/repo2docker/buildpacks/conda/install-miniforge.bash
@@ -5,12 +5,11 @@ set -ex
 
 
 cd $(dirname $0)
-MINIFORGE_VERSION=4.8.2-1
-MAMBA_VERSION=0.6.1
+MINIFORGE_VERSION=4.9.2-2
 # SHA256 for installers can be obtained from https://github.com/conda-forge/miniforge/releases
-SHA256SUM="4f897e503bd0edfb277524ca5b6a5b14ad818b3198c2f07a36858b7d88c928db"
+SHA256SUM="7a7bfaff87680298304a97ba69bcf92f66c810995a7155a2918b99fafb8ca1dc"
 
-URL="https://github.com/conda-forge/miniforge/releases/download/${MINIFORGE_VERSION}/Miniforge3-${MINIFORGE_VERSION}-Linux-x86_64.sh"
+URL="https://github.com/conda-forge/miniforge/releases/download/${MINIFORGE_VERSION}/Mambaforge-${MINIFORGE_VERSION}-Linux-x86_64.sh"
 INSTALLER_PATH=/tmp/miniforge-installer.sh
 
 # make sure we don't do anything funky with user's $HOME
@@ -42,11 +41,6 @@ echo 'update_dependencies: false' >> ${CONDA_DIR}/.condarc
 # avoid future changes to default channel_priority behavior
 conda config --system --set channel_priority "flexible"
 
-# do all installation with mamba
-time conda install -y mamba==${MAMBA_VERSION}
-# switch back to conda
-# ln -s $CONDA_DIR/bin/conda $CONDA_DIR/bin/mamba
-
 echo "installing notebook env:"
 cat /tmp/environment.yml
 time mamba env create -p ${NB_PYTHON_PREFIX} -f /tmp/environment.yml
diff --git a/tests/conda/binder-dir/verify b/tests/conda/binder-dir/verify
index c11db13f..b5e017b3 100755
--- a/tests/conda/binder-dir/verify
+++ b/tests/conda/binder-dir/verify
@@ -5,6 +5,6 @@ from subprocess import check_output
 assert sys.version_info[:2] == (3, 5), sys.version
 
 out = check_output(["conda", "--version"]).decode("utf8").strip()
-assert out == "conda 4.8.2", out
+assert out == "conda 4.9.2", out
 
 import numpy