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: name pip_bin etc to clarify the python environment

Browse Source
This commit is contained in:
Erik Sundell
2023-04-15 08:50:20 +02:00
parent ed334ac050
commit 7859e7f01b
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
bootstrap/bootstrap.py
View File

@@ -356,10 +356,10 @@ def main():
# Various related constants # Various related constants
install_prefix = os.environ.get("TLJH_INSTALL_PREFIX", "/opt/tljh") install_prefix = os.environ.get("TLJH_INSTALL_PREFIX", "/opt/tljh")
hub_prefix = os.path.join(install_prefix, "hub") hub_env_prefix = os.path.join(install_prefix, "hub")
python_bin = os.path.join(hub_prefix, "bin", "python3") hub_env_python = os.path.join(hub_env_prefix, "bin", "python3")
pip_bin = os.path.join(hub_prefix, "bin", "pip") hub_env_pip = os.path.join(hub_env_prefix, "bin", "pip")
initial_setup = not os.path.exists(python_bin) initial_setup = not os.path.exists(hub_env_python)
# Attempt to start a web server to serve a progress page reporting # Attempt to start a web server to serve a progress page reporting
# installation progress. # installation progress.
@@ -451,18 +451,18 @@ def main():
env=apt_get_adjusted_env, env=apt_get_adjusted_env,
) )
logger.info("Setting up virtual environment at {}".format(hub_prefix)) logger.info("Setting up virtual environment at {}".format(hub_env_prefix))
os.makedirs(hub_prefix, exist_ok=True) os.makedirs(hub_env_prefix, exist_ok=True)
run_subprocess(["python3", "-m", "venv", hub_prefix]) run_subprocess(["python3", "-m", "venv", hub_env_prefix])
# Upgrade pip # Upgrade pip
# Keep pip version pinning in sync with the one in unit-test.yml! # Keep pip version pinning in sync with the one in unit-test.yml!
# See changelog at https://pip.pypa.io/en/latest/news/#changelog # See changelog at https://pip.pypa.io/en/latest/news/#changelog
logger.info("Upgrading pip...") logger.info("Upgrading pip...")
run_subprocess([pip_bin, "install", "--upgrade", "pip==21.3.*"]) run_subprocess([hub_env_pip, "install", "--upgrade", "pip==21.3.*"])
# Install/upgrade TLJH installer # Install/upgrade TLJH installer
tljh_install_cmd = [pip_bin, "install", "--upgrade"] tljh_install_cmd = [hub_env_pip, "install", "--upgrade"]
if os.environ.get("TLJH_BOOTSTRAP_DEV", "no") == "yes": if os.environ.get("TLJH_BOOTSTRAP_DEV", "no") == "yes":
logger.info("Selected TLJH_BOOTSTRAP_DEV=yes...") logger.info("Selected TLJH_BOOTSTRAP_DEV=yes...")
tljh_install_cmd.append("--editable") tljh_install_cmd.append("--editable")
@@ -484,7 +484,9 @@ def main():
# Run TLJH installer # Run TLJH installer
logger.info("Running TLJH installer...") logger.info("Running TLJH installer...")
os.execv(python_bin, [python_bin, "-m", "tljh.installer"] + tljh_installer_flags) os.execv(
hub_env_python, [hub_env_python, "-m", "tljh.installer"] + tljh_installer_flags
)
if __name__ == "__main__": if __name__ == "__main__":