From 80b347349ad8e912b16a75369a72f2be0d22fb78 Mon Sep 17 00:00:00 2001 From: Simon Li Date: Mon, 18 Oct 2021 22:33:06 +0100 Subject: [PATCH] Update to mambaforge_version 4.10.3-7 --- tests/test_conda.py | 4 ++-- tljh/installer.py | 16 ++++++++++------ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/tests/test_conda.py b/tests/test_conda.py index 4e6adb0..539e646 100644 --- a/tests/test_conda.py +++ b/tests/test_conda.py @@ -13,8 +13,8 @@ def prefix(): """ Provide a temporary directory with a conda environment """ - mambaforge_version = '4.10.3-3' - installer_sha256 = "a012c24e1cc3bcbe74a1e5693e510830e7c2956e85877b08d1e28707a0bd8d75" + mambaforge_version = '4.10.3-7' + installer_sha256 = "fc872522ec427fcab10167a93e802efaf251024b58cc27b084b915a9a73c4474" installer_url = "https://github.com/conda-forge/miniforge/releases/download/{v}/Mambaforge-{v}-Linux-x86_64.sh".format(v=mambaforge_version) with tempfile.TemporaryDirectory() as tmpdir: with conda.download_miniconda_installer(installer_url, installer_sha256) as installer_path: diff --git a/tljh/installer.py b/tljh/installer.py index 050bfd2..05b4ce4 100644 --- a/tljh/installer.py +++ b/tljh/installer.py @@ -172,12 +172,16 @@ def ensure_user_environment(user_requirements_txt_file): miniconda_old_version = '4.5.4' miniconda_new_version = '4.7.10' - mambaconda_new_version = '4.10.3' - mambaforge_new_version = '4.10.3-3' - installer_sha256 = "a012c24e1cc3bcbe74a1e5693e510830e7c2956e85877b08d1e28707a0bd8d75" - mamba_version = '0.15.2' + # Install mambaforge using an installer from + # https://github.com/conda-forge/miniforge/releases + mambaforge_new_version = '4.10.3-7' + installer_sha256 = "fc872522ec427fcab10167a93e802efaf251024b58cc27b084b915a9a73c4474" + # Then run `mamba --version` to get the conda and mamba versions + # Keep these in sync with tests/test_conda.py::prefix + mambaforge_conda_new_version = '4.10.3' + mambaforge_mamba_version = '0.16.0' - if conda.check_miniconda_version(USER_ENV_PREFIX, mambaconda_new_version): + if conda.check_miniconda_version(USER_ENV_PREFIX, mambaforge_conda_new_version): conda_version = '4.10.3' elif conda.check_miniconda_version(USER_ENV_PREFIX, miniconda_new_version): conda_version = '4.8.1' @@ -194,7 +198,7 @@ def ensure_user_environment(user_requirements_txt_file): conda.ensure_conda_packages(USER_ENV_PREFIX, [ # Conda's latest version is on conda much more so than on PyPI. 'conda==' + conda_version, - 'mamba==' + mamba_version, + 'mamba==' + mambaforge_mamba_version, ]) conda.ensure_pip_requirements(