use qhub-jupyterhub-theme 0.3.3 to simplify JupyterHub config (nebari…

…-dev#966)
jkellndorfer · Dec 9, 2021 · 066774e · 066774e
1 parent a8eff0d
commit 066774e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/qhub/template/{{ cookiecutter.repo_directory }}/image/jupyterhub/environment.yaml b/qhub/template/{{ cookiecutter.repo_directory }}/image/jupyterhub/environment.yaml
@@ -10,5 +10,5 @@ dependencies:
  - cdsdashboards==0.6.0
  - jupyterhub-idle-culler==1.0
  - pip:
-   - qhub-jupyterhub-theme==0.3.2
+   - qhub-jupyterhub-theme==0.3.3
    - python-keycloak==0.26.1
diff --git a/qhub/template/{{ cookiecutter.repo_directory }}/templates/jupyterhub_config.py.j2 b/qhub/template/{{ cookiecutter.repo_directory }}/templates/jupyterhub_config.py.j2
@@ -32,15 +32,11 @@ c.JupyterHub.extra_handlers = []
 
 # ==================== THEME =========================
 import tornado.web
-import qhub_jupyterhub_theme
+from qhub_jupyterhub_theme import theme_extra_handlers, theme_template_paths
 
-c.JupyterHub.extra_handlers += [
-    (r'/custom/(.*)', tornado.web.StaticFileHandler, {"path": qhub_jupyterhub_theme.STATIC_PATH}),
-]
+c.JupyterHub.extra_handlers += theme_extra_handlers
 
-c.JupyterHub.template_paths = [
-    qhub_jupyterhub_theme.TEMPLATE_PATH
-] + c.JupyterHub.template_paths
+c.JupyterHub.template_paths = theme_template_paths + c.JupyterHub.template_paths
 
 c.JupyterHub.template_vars = {
 {%- for key, value in cookiecutter.theme.jupyterhub.items() %}