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

refactor: improve readability of a section

Browse Source
This commit is contained in:
Erik Sundell
2023-05-18 23:47:04 +02:00
parent 9c83e9000e
commit 6388d390e1
1 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tljh/installer.py
View File

@@ -186,20 +186,16 @@ def ensure_user_environment(user_requirements_txt_file):
# Check the existing environment for what to do # Check the existing environment for what to do
package_versions = conda.get_conda_package_versions(USER_ENV_PREFIX) package_versions = conda.get_conda_package_versions(USER_ENV_PREFIX)
is_fresh_install = not package_versions
# Case 1: no existing environment if is_fresh_install:
if not package_versions: # If no Python environment is detected but a folder exists we abort to
is_fresh_install = True # avoid clobbering something we don't recognize.
# 1a. no environment, but prefix exists.
# Abort to avoid clobbering something we don't recognize
if os.path.exists(USER_ENV_PREFIX) and os.listdir(USER_ENV_PREFIX): if os.path.exists(USER_ENV_PREFIX) and os.listdir(USER_ENV_PREFIX):
msg = f"Found non-empty directory that is not a conda install in {USER_ENV_PREFIX}. Please remove it (or rename it to preserve files) and run tljh again." msg = f"Found non-empty directory that is not a conda install in {USER_ENV_PREFIX}. Please remove it (or rename it to preserve files) and run tljh again."
logger.error(msg) logger.error(msg)
raise OSError(msg) raise OSError(msg)
# 1b. No environment, directory empty or doesn't exist
# start fresh install
logger.info("Downloading & setting up user environment...") logger.info("Downloading & setting up user environment...")
installer_url, installer_sha256 = _mambaforge_url() installer_url, installer_sha256 = _mambaforge_url()
with conda.download_miniconda_installer( with conda.download_miniconda_installer(
@@ -207,13 +203,12 @@ def ensure_user_environment(user_requirements_txt_file):
) as installer_path: ) as installer_path:
conda.install_miniconda(installer_path, USER_ENV_PREFIX) conda.install_miniconda(installer_path, USER_ENV_PREFIX)
package_versions = conda.get_conda_package_versions(USER_ENV_PREFIX) package_versions = conda.get_conda_package_versions(USER_ENV_PREFIX)
# quick sanity check: we should have conda and mamba! # quick sanity check: we should have conda and mamba!
assert "conda" in package_versions assert "conda" in package_versions
assert "mamba" in package_versions assert "mamba" in package_versions
else:
is_fresh_install = False
# next, check Python # Check Python version
python_version = package_versions["python"] python_version = package_versions["python"]
logger.debug(f"Found python={python_version} in {USER_ENV_PREFIX}") logger.debug(f"Found python={python_version} in {USER_ENV_PREFIX}")
if V(python_version) < V(MINIMUM_VERSIONS["python"]): if V(python_version) < V(MINIMUM_VERSIONS["python"]):