From 01d818b974f7375a4dcd00449a2729c970ee5cba Mon Sep 17 00:00:00 2001 From: Sylvain Corlay Date: Fri, 22 Mar 2024 21:34:50 +0100 Subject: [PATCH 1/2] Update to mamba 1.5.7 --- repo2docker/buildpacks/conda/install-base-env.bash | 2 +- tests/conda/py35-binder-dir/verify | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/repo2docker/buildpacks/conda/install-base-env.bash b/repo2docker/buildpacks/conda/install-base-env.bash index c3b24fcb..ac111403 100755 --- a/repo2docker/buildpacks/conda/install-base-env.bash +++ b/repo2docker/buildpacks/conda/install-base-env.bash @@ -5,7 +5,7 @@ set -ex cd $(dirname $0) -export MAMBA_VERSION=1.5.1 +export MAMBA_VERSION=1.5.7 export CONDA_VERSION=23.7.4 URL="https://anaconda.org/conda-forge/micromamba/${MAMBA_VERSION}/download/${CONDA_PLATFORM}/micromamba-${MAMBA_VERSION}-0.tar.bz2" diff --git a/tests/conda/py35-binder-dir/verify b/tests/conda/py35-binder-dir/verify index b51adf1e..72175ad2 100755 --- a/tests/conda/py35-binder-dir/verify +++ b/tests/conda/py35-binder-dir/verify @@ -16,12 +16,12 @@ v = out.split()[1] assert v[:3] == "3.5", out out = sh(["micromamba", "--version"]) -assert out == "1.5.1", out +assert out == "1.5.7", out out = sh(["mamba", "--version"]) assert ( out - == """mamba 1.5.1 + == """mamba 1.5.7 conda 23.7.4""" ), out From 920ddd86ac55add4e8db22a27086e248f223cd7e Mon Sep 17 00:00:00 2001 From: Erik Sundell Date: Sun, 24 Mar 2024 22:16:05 +0100 Subject: [PATCH 2/2] Update conda from 23.7.4 to 24.3.0 --- repo2docker/buildpacks/conda/install-base-env.bash | 2 +- tests/conda/py35-binder-dir/verify | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/repo2docker/buildpacks/conda/install-base-env.bash b/repo2docker/buildpacks/conda/install-base-env.bash index ac111403..59e65a93 100755 --- a/repo2docker/buildpacks/conda/install-base-env.bash +++ b/repo2docker/buildpacks/conda/install-base-env.bash @@ -6,7 +6,7 @@ set -ex cd $(dirname $0) export MAMBA_VERSION=1.5.7 -export CONDA_VERSION=23.7.4 +export CONDA_VERSION=24.3.0 URL="https://anaconda.org/conda-forge/micromamba/${MAMBA_VERSION}/download/${CONDA_PLATFORM}/micromamba-${MAMBA_VERSION}-0.tar.bz2" diff --git a/tests/conda/py35-binder-dir/verify b/tests/conda/py35-binder-dir/verify index 72175ad2..1f0ecc5f 100755 --- a/tests/conda/py35-binder-dir/verify +++ b/tests/conda/py35-binder-dir/verify @@ -22,7 +22,7 @@ out = sh(["mamba", "--version"]) assert ( out == """mamba 1.5.7 -conda 23.7.4""" +conda 24.3.0""" ), out sh([kernel_python, "-c", "import numpy"])