From 779e008674ffb73bcff856b28cdd7956f2b94080 Mon Sep 17 00:00:00 2001 From: Min RK Date: Fri, 3 May 2019 16:39:43 +0200 Subject: [PATCH 1/3] jupyterhub 1.0 bump oauthenticator patch as well --- tljh/installer.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tljh/installer.py b/tljh/installer.py index 91395cf..e9ffbd1 100644 --- a/tljh/installer.py +++ b/tljh/installer.py @@ -189,13 +189,13 @@ def ensure_jupyterhub_package(prefix): and conda packages! """ conda.ensure_pip_packages(prefix, [ - 'jupyterhub==0.9.6', + 'jupyterhub==1.0.0', 'jupyterhub-dummyauthenticator==0.3.1', 'jupyterhub-systemdspawner==0.13', 'jupyterhub-firstuseauthenticator==0.12', 'jupyterhub-nativeauthenticator==0.0.4', 'jupyterhub-ldapauthenticator==1.2.2', - 'oauthenticator==0.8.1' + 'oauthenticator==0.8.2', ]) traefik.ensure_traefik_binary(prefix) @@ -242,7 +242,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.6', + 'jupyterhub==1.0.0', 'notebook==5.7.8', # Install additional notebook frontends! 'jupyterlab==0.35.4', @@ -254,7 +254,7 @@ def ensure_user_environment(user_requirements_txt_file): # Most people consider ipywidgets to be part of the core notebook experience 'ipywidgets==7.4.2', # Pin tornado - 'tornado<6.0' + 'tornado<6.0', ]) if user_requirements_txt_file: From 2a8c056a3bdf5879c191e13114045616bfe57912 Mon Sep 17 00:00:00 2001 From: yuvipanda Date: Thu, 9 May 2019 13:13:04 -0700 Subject: [PATCH 2/3] Run hub db migrations if needed before starting hub --- tljh/systemd-units/jupyterhub.service | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tljh/systemd-units/jupyterhub.service b/tljh/systemd-units/jupyterhub.service index e766e20..6412a81 100644 --- a/tljh/systemd-units/jupyterhub.service +++ b/tljh/systemd-units/jupyterhub.service @@ -17,6 +17,9 @@ PrivateDevices=yes ProtectKernelTunables=yes ProtectKernelModules=yes Environment=TLJH_INSTALL_PREFIX={install_prefix} +# Run upgrade-db before starting, in case Hub version has changed +# This is a no-op when no db exists or no upgrades are needed +ExecStartPre={python_interpreter_path} -m jupyterhub.app -f {jupyterhub_config_path} upgrade-db ExecStart={python_interpreter_path} -m jupyterhub.app -f {jupyterhub_config_path} [Install] From fb75777d8ae2499a902f09aa307af2dc1e39c5ce Mon Sep 17 00:00:00 2001 From: yuvipanda Date: Mon, 20 May 2019 11:31:33 -0700 Subject: [PATCH 3/3] Pass --upgrade-db to jupyterhub all the time - It's a no-op if we aren't upgrading hub versions. - We know we're only using sqlite, since we are an opinionated distro! - This matches what we do in z2jh --- tljh/systemd-units/jupyterhub.service | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tljh/systemd-units/jupyterhub.service b/tljh/systemd-units/jupyterhub.service index 6412a81..477d04b 100644 --- a/tljh/systemd-units/jupyterhub.service +++ b/tljh/systemd-units/jupyterhub.service @@ -19,8 +19,7 @@ ProtectKernelModules=yes Environment=TLJH_INSTALL_PREFIX={install_prefix} # Run upgrade-db before starting, in case Hub version has changed # This is a no-op when no db exists or no upgrades are needed -ExecStartPre={python_interpreter_path} -m jupyterhub.app -f {jupyterhub_config_path} upgrade-db -ExecStart={python_interpreter_path} -m jupyterhub.app -f {jupyterhub_config_path} +ExecStart={python_interpreter_path} -m jupyterhub.app -f {jupyterhub_config_path} --upgrade-db [Install] # Start service when system boots