From b1f83a9c232ae1c375ac96184795988c7dc640d7 Mon Sep 17 00:00:00 2001 From: Julien Jerphanion Date: Thu, 12 Dec 2024 13:23:04 +0100 Subject: [PATCH 1/3] Update to mamba 2.0.4 Signed-off-by: Julien Jerphanion --- Miniforge3/construct.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Miniforge3/construct.yaml b/Miniforge3/construct.yaml index ffcfbc4d..98fbb9fa 100644 --- a/Miniforge3/construct.yaml +++ b/Miniforge3/construct.yaml @@ -1,8 +1,8 @@ {% set name = os.environ.get("MINIFORGE_NAME", "Miniforge3") %} -{% set version = os.environ.get("MINIFORGE_VERSION", "24.11.0-0") %} -{% set conda_libmamba_solver_version = "24.9.0"%} +{% set version = os.environ.get("MINIFORGE_VERSION", "24.11.0-1") %} +{% set conda_libmamba_solver_version = "24.11.1"%} # when mamba_version is updated here, also update MICROMAMBA_VERSION in scripts/build.sh -{% set mamba_version = "1.5.11"%} +{% set mamba_version = "2.0.4"%} name: {{ name }} version: {{ version }} From 439f5cd5300602e472cedf0a5266a1112439d110 Mon Sep 17 00:00:00 2001 From: Julien Jerphanion Date: Thu, 12 Dec 2024 13:33:38 +0100 Subject: [PATCH 2/3] Remove checks against boa rattler-build has replaced mamba-org/boa. mamba-org/boa has been deprecated. Signed-off-by: Julien Jerphanion --- scripts/test.sh | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/scripts/test.sh b/scripts/test.sh index eff23dd7..6a5c998e 100755 --- a/scripts/test.sh +++ b/scripts/test.sh @@ -44,15 +44,6 @@ if [[ "$(uname)" == MINGW* ]]; then echo "***** Check if we can install a package which requires msys2 *****" conda.exe install r-base --yes --quiet conda.exe list - - echo "***** Checking for boa compatibility *****" - mamba_version_start=$(mamba --version | grep mamba | cut -d ' ' -f 2) - mamba.exe install boa --yes - mamba_version_end=$(mamba --version | grep mamba | cut -d ' ' -f 2) - if [[ "${mamba_version_start}" != "${mamba_version_end}" ]]; then - echo "mamba version changed from ${mamba_version_start} to ${mamba_version_end}" - exit 1 - fi else # Test one of our installers in batch mode if [[ "${INSTALLER_NAME}" == "Mambaforge" ]]; then @@ -79,18 +70,6 @@ EOF echo "***** Print conda info *****" conda info conda list - - echo "***** Checking for boa compatibility *****" - implementation=$(python -c "import platform; print(platform.python_implementation().lower())") - major_minor_version=$(python -c 'import sys; print(f"{sys.version_info[0]}.{sys.version_info[1]}")') - mamba_version_start=$(mamba --version | grep mamba | cut -d ' ' -f 2) - mamba info - mamba install "mamba=${mamba_version_start}" "python=${major_minor_version}.*=*_${implementation}" boa --yes - mamba_version_end=$(mamba --version | grep mamba | cut -d ' ' -f 2) - if [[ "${mamba_version_start}" != "${mamba_version_end}" ]]; then - echo "mamba version changed from ${mamba_version_start} to ${mamba_version_end}" - exit 1 - fi fi From 6a80293a9ed6c4e28dc3c1015d6c3140edf807cb Mon Sep 17 00:00:00 2001 From: Sylvain Corlay Date: Thu, 12 Dec 2024 20:43:01 +0100 Subject: [PATCH 3/3] Update Miniforge3/construct.yaml Co-authored-by: Julien Jerphanion --- Miniforge3/construct.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Miniforge3/construct.yaml b/Miniforge3/construct.yaml index 98fbb9fa..61909ff7 100644 --- a/Miniforge3/construct.yaml +++ b/Miniforge3/construct.yaml @@ -2,7 +2,7 @@ {% set version = os.environ.get("MINIFORGE_VERSION", "24.11.0-1") %} {% set conda_libmamba_solver_version = "24.11.1"%} # when mamba_version is updated here, also update MICROMAMBA_VERSION in scripts/build.sh -{% set mamba_version = "2.0.4"%} +{% set mamba_version = "2.0.5"%} name: {{ name }} version: {{ version }}