zhangyiss/the-littlest-jupyterhub
1
0
Fork 0
mirror of https://github.com/jupyterhub/the-littlest-jupyterhub.git synced 2025-12-18 21:54:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update to mambaforge_version 4.10.3-7

Browse Source
This commit is contained in:
Simon Li
2021-10-18 22:33:06 +01:00
parent b3c07ba265
commit 80b347349a
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/test_conda.py
View File

@@ -13,8 +13,8 @@ def prefix():
""" """
Provide a temporary directory with a conda environment Provide a temporary directory with a conda environment
""" """
mambaforge_version = '4.10.3-3' mambaforge_version = '4.10.3-7'
installer_sha256 = "a012c24e1cc3bcbe74a1e5693e510830e7c2956e85877b08d1e28707a0bd8d75" installer_sha256 = "fc872522ec427fcab10167a93e802efaf251024b58cc27b084b915a9a73c4474"
installer_url = "https://github.com/conda-forge/miniforge/releases/download/{v}/Mambaforge-{v}-Linux-x86_64.sh".format(v=mambaforge_version) 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 tempfile.TemporaryDirectory() as tmpdir:
with conda.download_miniconda_installer(installer_url, installer_sha256) as installer_path: with conda.download_miniconda_installer(installer_url, installer_sha256) as installer_path:

16
tljh/installer.py
View File

@@ -172,12 +172,16 @@ def ensure_user_environment(user_requirements_txt_file):
miniconda_old_version = '4.5.4' miniconda_old_version = '4.5.4'
miniconda_new_version = '4.7.10' miniconda_new_version = '4.7.10'
mambaconda_new_version = '4.10.3' # Install mambaforge using an installer from
mambaforge_new_version = '4.10.3-3' # https://github.com/conda-forge/miniforge/releases
installer_sha256 = "a012c24e1cc3bcbe74a1e5693e510830e7c2956e85877b08d1e28707a0bd8d75" mambaforge_new_version = '4.10.3-7'
mamba_version = '0.15.2' 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' conda_version = '4.10.3'
elif conda.check_miniconda_version(USER_ENV_PREFIX, miniconda_new_version): elif conda.check_miniconda_version(USER_ENV_PREFIX, miniconda_new_version):
conda_version = '4.8.1' 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.ensure_conda_packages(USER_ENV_PREFIX, [
# Conda's latest version is on conda much more so than on PyPI. # Conda's latest version is on conda much more so than on PyPI.
'conda==' + conda_version, 'conda==' + conda_version,
'mamba==' + mamba_version, 'mamba==' + mambaforge_mamba_version,
]) ])
conda.ensure_pip_requirements( conda.ensure_pip_requirements(