Merge pull request #277 from isuruf/4.12.0

Add mamba and conda-libmamba-solver to Miniforge (Mambaforge is now identical)
conda-forge · Aug 20, 2023 · 7b6dc5f · 7b6dc5f
2 parents 5a1e689 + adb2cad
commit 7b6dc5f
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 32 deletions.
diff --git a/Miniforge3/construct.yaml b/Miniforge3/construct.yaml
@@ -1,5 +1,7 @@
-{% set version = os.environ.get("MINIFORGE_VERSION", "23.3.0-0") %}
 {% set name = os.environ.get("MINIFORGE_NAME", "Miniforge3") %}
+{% set version = os.environ.get("MINIFORGE_VERSION", "23.3.1-0") %}
+{% set conda_libmamba_solver_version = "23.3.0"%}
+{% set mamba_version = "1.4.2"%}
 
 name: {{ name }}
 version: {{ version }}
@@ -28,11 +30,9 @@ specs:
 {% else %}
   - python 3.10.*
 {% endif %}
-
-{% if name.startswith("Mambaforge") %}
-  - mamba 1.4.2
-{% endif %}
   - conda {{ version.split("-")[0] }}
+  - conda-libmamba-solver {{ conda_libmamba_solver_version }}
+  - mamba {{ mamba_version }}
 
   - pip
   - miniforge_console_shortcut 1.*  # [win]
diff --git a/scripts/build.sh b/scripts/build.sh
@@ -14,7 +14,7 @@ echo "***** Install constructor *****"
 mamba install --yes \
     --channel conda-forge --override-channels \
     jinja2 curl libarchive \
-    "constructor>=3.4.4"
+    "constructor>=3.4.5"
 
 if [[ "$(uname)" == "Darwin" ]]; then
     mamba install --yes \

diff --git a/scripts/test.sh b/scripts/test.sh
@@ -19,7 +19,6 @@ else
 fi
 INSTALLER_PATH=$(find build/ -name "*forge*.${EXT}" | head -n 1)
 INSTALLER_NAME=$(basename "${INSTALLER_PATH}" | cut -d "-" -f 1)
-INSTALLER_EXE=$(basename "${INSTALLER_PATH}")
 
 echo "***** Run the installer *****"
 chmod +x "${INSTALLER_PATH}"
@@ -46,18 +45,13 @@ if [[ "$(uname)" == MINGW* ]]; then
   conda.exe install r-base --yes --quiet
   conda.exe list
 
-  # hmaarrfk -- 2023/02
-  # For some reason the Mambaforge-Linux-ppc64le works fine in under 15 mins on a branch
-  # but then fails to build within the 6 hour time limit on the release CI.
-  if [[ "${INSTALLER_NAME}" == "Mambaforge" ]] && [[ "${INSTALLER_EXE}" != "Mambaforge-Linux-ppc64le.sh" ]]; then
-    echo "***** Mambaforge detected. 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
+  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
@@ -86,19 +80,16 @@ EOF
   conda info
   conda list
 
-  if [[ "${INSTALLER_NAME}" == "Mambaforge" ]]; then
-    echo "***** Mambaforge detected. 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
-
+  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