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

Switch to mambaforge

Browse Source
This commit is contained in:
Simon Li
2021-07-31 20:44:23 +01:00
parent 4a7e545973
commit 0018beca4f
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/test_conda.py
View File

@@ -13,14 +13,14 @@ def prefix():
""" """
Provide a temporary directory with a conda environment Provide a temporary directory with a conda environment
""" """
miniconda_version = '4.7.10' mambaforge_version = '4.10.3-3'
miniconda_installer_sha256 = "8a324adcc9eaf1c09e22a992bb6234d91a94146840ee6b11c114ecadafc68121" installer_sha256 = "a012c24e1cc3bcbe74a1e5693e510830e7c2956e85877b08d1e28707a0bd8d75"
installer_url = "https://repo.continuum.io/miniconda/Miniconda3-{}-Linux-x86_64.sh".format(miniconda_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, miniconda_installer_sha256) as installer_path: with conda.download_miniconda_installer(installer_url, installer_sha256) as installer_path:
conda.install_miniconda(installer_path, tmpdir) conda.install_miniconda(installer_path, tmpdir)
conda.ensure_conda_packages(tmpdir, [ conda.ensure_conda_packages(tmpdir, [
'conda==4.8.1' 'conda==4.10.3'
]) ])
yield tmpdir yield tmpdir

2
tljh/conda.py
View File

@@ -94,7 +94,7 @@ def ensure_conda_packages(prefix, packages):
""" """
Ensure packages (from conda-forge) are installed in the conda prefix. Ensure packages (from conda-forge) are installed in the conda prefix.
""" """
conda_executable = [os.path.join(prefix, 'bin', 'python'), '-m', 'conda'] conda_executable = [os.path.join(prefix, 'bin', 'mamba')]
abspath = os.path.abspath(prefix) abspath = os.path.abspath(prefix)
# Let subprocess errors propagate # Let subprocess errors propagate
# Explicitly do *not* capture stderr, since that's not always JSON! # Explicitly do *not* capture stderr, since that's not always JSON!

14
tljh/installer.py
View File

@@ -171,21 +171,21 @@ def ensure_user_environment(user_requirements_txt_file):
logger.info("Setting up user environment...") logger.info("Setting up user environment...")
miniconda_old_version = '4.5.4' miniconda_old_version = '4.5.4'
miniconda_new_version = '4.7.10' mambaforge_new_version = '4.10.3-3'
miniconda_installer_sha256 = "8a324adcc9eaf1c09e22a992bb6234d91a94146840ee6b11c114ecadafc68121" installer_sha256 = "a012c24e1cc3bcbe74a1e5693e510830e7c2956e85877b08d1e28707a0bd8d75"
if conda.check_miniconda_version(USER_ENV_PREFIX, miniconda_new_version): if conda.check_miniconda_version(USER_ENV_PREFIX, mambaforge_new_version):
conda_version = '4.8.1' conda_version = '4.10.3'
elif conda.check_miniconda_version(USER_ENV_PREFIX, miniconda_old_version): elif conda.check_miniconda_version(USER_ENV_PREFIX, miniconda_old_version):
conda_version = '4.5.8' conda_version = '4.5.8'
# If no prior miniconda installation is found, we can install a newer version # If no prior miniconda installation is found, we can install a newer version
else: else:
logger.info('Downloading & setting up user environment...') logger.info('Downloading & setting up user environment...')
# FIXME: allow using miniforge # FIXME: allow using miniforge
installer_url = "https://repo.continuum.io/miniconda/Miniconda3-{}-Linux-x86_64.sh".format(miniconda_new_version) installer_url = "https://github.com/conda-forge/miniforge/releases/download/{v}/Mambaforge-{v}-Linux-x86_64.sh".format(v=mambaforge_new_version)
with conda.download_miniconda_installer(installer_url, miniconda_installer_sha256) as installer_path: with conda.download_miniconda_installer(installer_url, installer_sha256) as installer_path:
conda.install_miniconda(installer_path, USER_ENV_PREFIX) conda.install_miniconda(installer_path, USER_ENV_PREFIX)
conda_version = '4.8.1' conda_version = '4.10.3'
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.