From bd2934b73b4a7ad88a3b9ddba042c2773a64bc4c Mon Sep 17 00:00:00 2001 From: Min RK Date: Tue, 28 Aug 2018 12:09:37 +0200 Subject: [PATCH 1/2] jupyterhub 0.9.2 fixes TERM shutdown --- tljh/installer.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tljh/installer.py b/tljh/installer.py index 6d5009a..8e02dee 100644 --- a/tljh/installer.py +++ b/tljh/installer.py @@ -179,12 +179,12 @@ def ensure_jupyterhub_package(prefix): and conda packages! """ conda.ensure_pip_packages(prefix, [ - 'jupyterhub==0.9.1', + 'jupyterhub==0.9.2', 'jupyterhub-dummyauthenticator==0.3.1', 'jupyterhub-systemdspawner==0.11', 'jupyterhub-firstuseauthenticator==0.10', 'jupyterhub-ldapauthenticator==1.2.2', - 'oauthenticator==0.7.3', + 'oauthenticator==0.8.0', ]) traefik.ensure_traefik_binary(prefix) @@ -231,7 +231,7 @@ def ensure_user_environment(user_requirements_txt_file): conda.ensure_pip_packages(USER_ENV_PREFIX, [ # JupyterHub + notebook package are base requirements for user environment - 'jupyterhub==0.9.1', + 'jupyterhub==0.9.2', 'notebook==5.6.0', # Install additional notebook frontends! 'jupyterlab==0.34.1', From 6e27622f76c512436fffb9a030b36232d75d769d Mon Sep 17 00:00:00 2001 From: Min RK Date: Wed, 29 Aug 2018 16:46:04 +0200 Subject: [PATCH 2/2] set cleanup_servers = False leaves users running when the hub restarts Tests were relying on a bug in 0.9.1 that prevented cleanup due to improper handling of signals --- tljh/jupyterhub_config.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tljh/jupyterhub_config.py b/tljh/jupyterhub_config.py index 4abb891..006c9b2 100644 --- a/tljh/jupyterhub_config.py +++ b/tljh/jupyterhub_config.py @@ -29,6 +29,9 @@ class CustomSpawner(SystemdSpawner): c.JupyterHub.spawner_class = CustomSpawner +# leave users running when the Hub restarts +c.JupyterHub.cleanup_servers = False + # Use a high port so users can try this on machines with a JupyterHub already present c.JupyterHub.hub_port = 15001