Skip to content

Commit

Permalink
Merge pull request #694 from jjerphan/update-mamba-2.0.4
Browse files Browse the repository at this point in the history
Update to mamba 2.0.5
  • Loading branch information
hmaarrfk authored Dec 14, 2024
2 parents e138d62 + 6a80293 commit a65a981
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 24 deletions.
6 changes: 3 additions & 3 deletions Miniforge3/construct.yaml
Original file line number Diff line number Diff line change
@@ -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.5"%}

name: {{ name }}
version: {{ version }}
Expand Down
21 changes: 0 additions & 21 deletions scripts/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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


Expand Down

0 comments on commit a65a981

Please sign in to comment.