Merge pull request #313 from minrk/jhub-1

Upgrade to JupyterHub 1.0
This commit is contained in:
Yuvi Panda
2019-05-29 11:08:40 -07:00
committed by GitHub
2 changed files with 7 additions and 5 deletions

View File

@@ -188,13 +188,13 @@ def ensure_jupyterhub_package(prefix):
and conda packages! and conda packages!
""" """
conda.ensure_pip_packages(prefix, [ conda.ensure_pip_packages(prefix, [
'jupyterhub==0.9.6', 'jupyterhub==1.0.0',
'jupyterhub-dummyauthenticator==0.3.1', 'jupyterhub-dummyauthenticator==0.3.1',
'jupyterhub-systemdspawner==0.13', 'jupyterhub-systemdspawner==0.13',
'jupyterhub-firstuseauthenticator==0.12', 'jupyterhub-firstuseauthenticator==0.12',
'jupyterhub-nativeauthenticator==0.0.4', 'jupyterhub-nativeauthenticator==0.0.4',
'jupyterhub-ldapauthenticator==1.2.2', 'jupyterhub-ldapauthenticator==1.2.2',
'oauthenticator==0.8.1' 'oauthenticator==0.8.2',
]) ])
traefik.ensure_traefik_binary(prefix) traefik.ensure_traefik_binary(prefix)
@@ -241,7 +241,7 @@ def ensure_user_environment(user_requirements_txt_file):
conda.ensure_pip_packages(USER_ENV_PREFIX, [ conda.ensure_pip_packages(USER_ENV_PREFIX, [
# JupyterHub + notebook package are base requirements for user environment # JupyterHub + notebook package are base requirements for user environment
'jupyterhub==0.9.6', 'jupyterhub==1.0.0',
'notebook==5.7.8', 'notebook==5.7.8',
# Install additional notebook frontends! # Install additional notebook frontends!
'jupyterlab==0.35.4', 'jupyterlab==0.35.4',
@@ -253,7 +253,7 @@ def ensure_user_environment(user_requirements_txt_file):
# Most people consider ipywidgets to be part of the core notebook experience # Most people consider ipywidgets to be part of the core notebook experience
'ipywidgets==7.4.2', 'ipywidgets==7.4.2',
# Pin tornado # Pin tornado
'tornado<6.0' 'tornado<6.0',
]) ])
if user_requirements_txt_file: if user_requirements_txt_file:

View File

@@ -17,7 +17,9 @@ PrivateDevices=yes
ProtectKernelTunables=yes ProtectKernelTunables=yes
ProtectKernelModules=yes ProtectKernelModules=yes
Environment=TLJH_INSTALL_PREFIX={install_prefix} Environment=TLJH_INSTALL_PREFIX={install_prefix}
ExecStart={python_interpreter_path} -m jupyterhub.app -f {jupyterhub_config_path} # 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
ExecStart={python_interpreter_path} -m jupyterhub.app -f {jupyterhub_config_path} --upgrade-db
[Install] [Install]
# Start service when system boots # Start service when system boots