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

Merge pull request #990 from minrk/miniforge

Browse Source 
Update base user environment to miniforge 24.7.1-0 (Python 3.12)
This commit is contained in:
Erik Sundell
2024-09-04 13:08:17 +02:00
committed by GitHub
parent 5c8cb5bb26 5172ceb4f9
commit 50c1b5f894
4 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/topic/installer-actions.md
View File

@@ -26,7 +26,7 @@ sudo rm -rf /opt/tljh/hub
## User environment ## User environment
By default, a `mambaforge` conda environment is installed in `/opt/tljh/user`. This contains By default, a `miniforge` conda environment is installed in `/opt/tljh/user`. This contains
the notebook interface used to launch all users, and the various packages available to all the notebook interface used to launch all users, and the various packages available to all
users. The environment is owned by the `root` user. JupyterHub admins may use users. The environment is owned by the `root` user. JupyterHub admins may use
to `sudo -E conda install` or `sudo -E pip install` packages into this environment. to `sudo -E conda install` or `sudo -E pip install` packages into this environment.

4
tests/test_conda.py
View File

@@ -14,9 +14,9 @@ from tljh import conda, installer
@pytest.fixture(scope="module") @pytest.fixture(scope="module")
def prefix(): def prefix():
""" """
Provide a temporary directory with a mambaforge conda environment Provide a temporary directory with a conda environment
""" """
installer_url, checksum = installer._mambaforge_url() installer_url, checksum = installer._miniforge_url()
with tempfile.TemporaryDirectory() as tmpdir: with tempfile.TemporaryDirectory() as tmpdir:
with conda.download_miniconda_installer( with conda.download_miniconda_installer(
installer_url, checksum installer_url, checksum

14
tests/test_installer.py
View File

@@ -46,12 +46,12 @@ def test_ensure_admins(tljh_dir, admins, expected_config):
def setup_conda(distro, version, prefix): def setup_conda(distro, version, prefix):
"""Install mambaforge or miniconda in a prefix""" """Install miniforge or miniconda in a prefix"""
if distro == "mambaforge": if distro == "mambaforge":
installer_url, _ = installer._mambaforge_url(version) installer_url, _ = installer._miniforge_url(version)
installer_url = installer_url.replace("Miniforge3", "Mambaforge")
elif distro == "miniforge": elif distro == "miniforge":
installer_url, _ = installer._mambaforge_url(version) installer_url, _ = installer._miniforge_url(version)
installer_url = installer_url.replace("Mambaforge", "Miniforge3")
elif distro == "miniconda": elif distro == "miniconda":
arch = os.uname().machine arch = os.uname().machine
installer_url = ( installer_url = (
@@ -124,9 +124,9 @@ def _specifier(version):
None, None,
None, None,
{ {
"python": "3.10.*", "python": "3.12.*",
"conda": "23.1.0", "conda": "24.7.1",
"mamba": "1.4.1", "mamba": "1.5.9",
}, },
), ),
# previous install, 1.0 # previous install, 1.0

22
tljh/installer.py
View File

@@ -136,13 +136,13 @@ def ensure_usergroups():
f.write("Defaults exempt_group = jupyterhub-admins\n") f.write("Defaults exempt_group = jupyterhub-admins\n")
# Install mambaforge using an installer from # Install miniforge using an installer from
# https://github.com/conda-forge/miniforge/releases # https://github.com/conda-forge/miniforge/releases
MAMBAFORGE_VERSION = "23.1.0-1" MINIFORGE_VERSION = "24.7.1-0"
# sha256 checksums # sha256 checksums
MAMBAFORGE_CHECKSUMS = { MINIFORGE_CHECKSUMS = {
"aarch64": "d9d89c9e349369702171008d9ee7c5ce80ed420e5af60bd150a3db4bf674443a", "aarch64": "7a3372268b45679584043b4ba1e0318ee5027384a8d330f2d991b14d815d6a6d",
"x86_64": "cfb16c47dc2d115c8b114280aa605e322173f029fdb847a45348bf4bd23c62ab", "x86_64": "b64f77042cf8eafd31ced64f9253a74fb85db63545fe167ba5756aea0e8125be",
} }
# minimum versions of packages # minimum versions of packages
@@ -156,22 +156,22 @@ MINIMUM_VERSIONS = {
} }
def _mambaforge_url(version=MAMBAFORGE_VERSION, arch=None): def _miniforge_url(version=MINIFORGE_VERSION, arch=None):
"""Return (URL, checksum) for mambaforge download for a given version and arch """Return (URL, checksum) for miniforge download for a given version and arch
Default values provided for both version and arch Default values provided for both version and arch
""" """
if arch is None: if arch is None:
arch = os.uname().machine arch = os.uname().machine
installer_url = "https://github.com/conda-forge/miniforge/releases/download/{v}/Mambaforge-{v}-Linux-{arch}.sh".format( installer_url = "https://github.com/conda-forge/miniforge/releases/download/{v}/Miniforge3-{v}-Linux-{arch}.sh".format(
v=version, v=version,
arch=arch, arch=arch,
) )
# Check system architecture, set appropriate installer checksum # Check system architecture, set appropriate installer checksum
checksum = MAMBAFORGE_CHECKSUMS.get(arch) checksum = MINIFORGE_CHECKSUMS.get(arch)
if not checksum: if not checksum:
raise ValueError( raise ValueError(
f"Unsupported architecture: {arch}. TLJH only supports {','.join(MAMBAFORGE_CHECKSUMS.keys())}" f"Unsupported architecture: {arch}. TLJH only supports {','.join(MINIFORGE_CHECKSUMS.keys())}"
) )
return installer_url, checksum return installer_url, checksum
@@ -198,7 +198,7 @@ def ensure_user_environment(user_requirements_txt_file):
raise OSError(msg) raise OSError(msg)
logger.info("Downloading & setting up user environment...") logger.info("Downloading & setting up user environment...")
installer_url, installer_sha256 = _mambaforge_url() installer_url, installer_sha256 = _miniforge_url()
with conda.download_miniconda_installer( with conda.download_miniconda_installer(
installer_url, installer_sha256 installer_url, installer_sha256
) as installer_path: ) as installer_path: