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

bootstrap.py: Only lookup git ref if TLJH_BOOTSTRAP_PIP_SPEC not set

Browse Source 
test_bootstrap.py: use `--version main` since there are no tags/releases
This commit is contained in:
Simon Li
2022-11-27 19:03:48 +00:00
parent 6d1deaa19c
commit 7a50cc9436
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
bootstrap/bootstrap.py
View File

@@ -455,16 +455,16 @@ def main():
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")
version = _resolve_git_version(args.version)
tljh_install_cmd.append( bootstrap_pip_spec = os.environ.get("TLJH_BOOTSTRAP_PIP_SPEC")
os.environ.get( if not bootstrap_pip_spec:
"TLJH_BOOTSTRAP_PIP_SPEC", bootstrap_pip_spec = (
"git+https://github.com/jupyterhub/the-littlest-jupyterhub.git@{}".format( "git+https://github.com/jupyterhub/the-littlest-jupyterhub.git@{}".format(
version _resolve_git_version(args.version)
), )
) )
)
tljh_install_cmd.append(bootstrap_pip_spec)
if initial_setup: if initial_setup:
logger.info("Installing TLJH installer...") logger.info("Installing TLJH installer...")
else: else:

9
integration-tests/test_bootstrap.py
View File

@@ -100,7 +100,14 @@ def run_bootstrap_after_preparing_container(
bootstrap_script = get_bootstrap_script_location(container_name, show_progress_page) bootstrap_script = get_bootstrap_script_location(container_name, show_progress_page)
exec_flags = ["-i", container_name, "python3", bootstrap_script] exec_flags = [
"-i",
container_name,
"python3",
bootstrap_script,
"--version",
"main",
]
if show_progress_page: if show_progress_page:
exec_flags = ( exec_flags = (
["-e", "TLJH_BOOTSTRAP_DEV=yes", "-e", "TLJH_BOOTSTRAP_PIP_SPEC=/srv/src"] ["-e", "TLJH_BOOTSTRAP_DEV=yes", "-e", "TLJH_BOOTSTRAP_PIP_SPEC=/srv/src"]