Update to nbconvert 6.2

SylvainCorlay · SylvainCorlay · commit f909709aaac3 · 2021-09-25T12:57:46.000+02:00
diff --git a/setup.py b/setup.py
@@ -90,7 +90,7 @@
         "jupyter_server>=0.3.0,<2.0.0",
         "jupyter_client>=6.1.3,<7",
         "nbclient>=0.4.0,<0.6",
-        "nbconvert>=6.0.0,<7",
+        "nbconvert>=6.2.0,<7",
     ],
     extras_require={
         "test": [
diff --git a/share/jupyter/voila/templates/reveal/index.html.j2 b/share/jupyter/voila/templates/reveal/index.html.j2
@@ -17,16 +17,6 @@
     <script src="{{ resources.jquery_url }}"></script>
   {%- endblock html_head_js_jquery -%}
 
-  {# html_head_css block is missing in the base reveal template #}
-  {# This can be moved outside of html_head_js as soon as we can require a version of nbconvert includes https://github.com/jupyter/nbconvert/pull/1620 #}
-  {%- block html_head_css -%}
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@^5/css/all.min.css" type="text/css" />
-    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@^5/css/v4-shims.min.css" type="text/css" />
-    {{ resources.include_css("static/materialcolors.css") }}
-    {{ resources.include_css("static/labvariables.css") }}
-    {# super() #}
-  {%- endblock html_head_css -%}
-
   {% block notebook_execute %}
     {%- set kernel_id = kernel_start(nb) -%}
     <script id="jupyter-config-data" type="application/json">
@@ -41,6 +31,14 @@
 
 {%- endblock html_head_js -%}
 
+{%- block html_head_css -%}
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@^5/css/all.min.css" type="text/css" />
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/@fortawesome/fontawesome-free@^5/css/v4-shims.min.css" type="text/css" />
+  {{ resources.include_css("static/materialcolors.css") }}
+  {{ resources.include_css("static/labvariables.css") }}
+  {{ super() }}
+{%- endblock html_head_css -%}
+
 {% block body_header %}
   <body data-base-url="{{resources.base_url}}voila/">
   <div class="reveal">
