Upgrade nbconvert

.github/workflows/test.yaml

@@ -0,0 +1,43 @@
+name: test
+
+on:
+  push:
+    branches:
+  pull_request:
+
+jobs:
+  test:
+    runs-on: ubuntu-20.04
+    strategy:
+      matrix:
+        python:
+          - "3.7"
+          - "3.8"
+          - "3.9"
+          - "3.10"
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - uses: actions/setup-python@v4
+        with:
+          python-version: ${{ matrix.python }}
+
+      - name: install apt packages
+        # pycurl build requirements
+        run: |
+          sudo apt-get update && sudo apt-get -y install \
+              libcurl4-gnutls-dev \
+              libgnutls28-dev
+
+      - name: install
+        run: |
+          python3 -m pip install -r requirements.in -r requirements-dev.txt
+
+      - name: pip freeze
+        run: |
+          python3 -m pip freeze
+
+      - name: run tests
+        run: |
+          pytest -v nbviewer/tests

nbviewer/app.py

@@ -16,7 +16,8 @@
 import markdown
 from jinja2 import Environment
 from jinja2 import FileSystemLoader
-from nbconvert.exporters.export import exporter_map
+from nbconvert import get_exporter
+from nbconvert.exporters.templateexporter import ExtensionTolerantLoader
 from tornado import httpserver
 from tornado import ioloop
 from tornado import web
@@ -468,7 +469,11 @@ def default_endpoint(self):
 
     @cached_property
     def env(self):
-        env = Environment(loader=FileSystemLoader(self.template_paths), autoescape=True)
+        loader = ExtensionTolerantLoader(FileSystemLoader(self.template_paths), ".j2")
+        env = Environment(
+            loader=loader,
+            autoescape=True,
+        )
         env.filters["markdown"] = markdown.markdown
         try:
             git_data = git_info(here)
@@ -594,15 +599,15 @@ def configure_formats(self, formats=None):
             formats = default_formats()
 
         # This would be better defined in a class
-        self.config.HTMLExporter.template_file = "basic"
-        self.config.SlidesExporter.template_file = "slides_reveal"
+        # self.config.HTMLExporter.template_file = "base"
+        # self.config.SlidesExporter.template_file = "slides_reveal"
 
-        self.config.TemplateExporter.template_path = [
+        self.config.TemplateExporter.extra_template_basedirs = [
             os.path.join(os.path.dirname(__file__), "templates", "nbconvert")
         ]
 
         for key, format in formats.items():
-            exporter_cls = format.get("exporter", exporter_map[key])
+            exporter_cls = format.get("exporter", get_exporter(key))
             if self.processes:
                 # can't pickle exporter instances,
                 formats[key]["exporter"] = exporter_cls

nbviewer/formats.py

@@ -55,9 +55,9 @@ def test_slides(nb, json):
         return False
 
     return {
-        "html": {"nbconvert_template": "basic", "label": "Notebook", "icon": "book"},
+        "html": {"nbconvert_template": "lab", "label": "Notebook", "icon": "book"},
         "slides": {
-            "nbconvert_template": "slides_reveal",
+            # "nbconvert_template": "slides_reveal",
             "label": "Slides",
             "icon": "gift",
             "test": test_slides,

nbviewer/providers/github/handlers.py

@@ -234,7 +234,7 @@ async def get(self, user, repo, ref, path):
         # See: https://github.com/jupyter/nbviewer/issues/324
         example_file_url = contents[0]["html_url"]
         user, repo = re.match(
-            r"^" + self.github_url + "(?P<user>[^\/]+)/(?P<repo>[^\/]+)/.*",
+            r"^" + self.github_url + r"(?P<user>[^\/]+)/(?P<repo>[^\/]+)/.*",
             example_file_url,
         ).group("user", "repo")
 

nbviewer/templates/notebook.html

@@ -114,12 +114,9 @@
 
 
 {% block body %}
+    BREAKCRUMB
   {{ link_breadcrumbs(breadcrumbs) }}
-  <div id="notebook">
-    <div id="notebook-container">
-      {{ body | safe}}
-    </div>
-  </div>
+    {{ body | safe}}
 {% endblock %}
 
 

nbviewer/tests/base.py

@@ -12,7 +12,6 @@
 import sys
 import time
 from contextlib import contextmanager
-from subprocess import DEVNULL as devnull
 from subprocess import Popen
 from unittest import skipIf
 from unittest import TestCase
@@ -73,8 +72,6 @@ def setup_class(cls):
         server_cmd = cls.get_server_cmd()
         cls.server = Popen(
             server_cmd,
-            stdout=devnull,
-            stderr=devnull,
             # Set environment variables if any
             env=dict(os.environ, **cls.environment_variables),
         )

nbviewer/tests/test_utils.py

@@ -5,8 +5,6 @@
 #  Distributed under the terms of the BSD License.  The full license is in
 #  the file COPYING, distributed as part of this software.
 # -----------------------------------------------------------------------------
-import nose.tools as nt
-
 from nbviewer import utils
 from nbviewer.providers import default_rewrites
 from nbviewer.providers import provider_uri_rewrites
@@ -64,10 +62,10 @@ def test_transform_ipynb_uri():
     uri_rewrite_list = provider_uri_rewrites(default_rewrites)
     for ipynb_uri, expected_output in test_data:
         output = utils.transform_ipynb_uri(ipynb_uri, uri_rewrite_list)
-        nt.assert_equal(
+        assert output == expected_output, "%s => %s != %s" % (
+            ipynb_uri,
             output,
             expected_output,
-            "%s => %s != %s" % (ipynb_uri, output, expected_output),
         )
 
 

requirements-dev.txt

@@ -1,6 +1,6 @@
 coverage
 invoke>=0.13.0
 mock>=1.3.0  # python34 and older versions of mock do not play well together.
-nose
 pre-commit
+pytest
 requests

requirements.in

@@ -3,7 +3,7 @@ ipython
 jupyter_client
 jupyter_server>=0.2.0
 markdown>=3.0,==3.1.1 # pin until we workaround #909, which is a regression in 3.2
-nbconvert>=5.4,<6.0.0 # pin to fix #958
+nbconvert>=6.5.2
 nbformat>=4.2
 newrelic!=2.80.0.60
 pycurl

requirements.txt

@@ -16,6 +16,8 @@ attrs==21.4.0
     # via jsonschema
 backcall==0.2.0
     # via ipython
+beautifulsoup4==4.11.1
+    # via nbconvert
 black==21.12b0
     # via ipython
 bleach==4.1.0
@@ -58,6 +60,7 @@ jupyter-client==7.1.2
     # via
     #   -r requirements.in
     #   jupyter-server
+    #   nbclient
 jupyter-core==4.9.1
     # via
     #   jupyter-client
@@ -66,33 +69,45 @@ jupyter-core==4.9.1
     #   nbformat
 jupyter-server==1.13.4
     # via -r requirements.in
+jupyterlab-pygments==0.2.2
+    # via nbconvert
+lxml==4.9.1
+    # via nbconvert
 markdown==3.1.1
     # via -r requirements.in
 markupsafe==2.0.1
-    # via jinja2
+    # via
+    #   jinja2
+    #   nbconvert
 matplotlib-inline==0.1.3
     # via ipython
 mistune==0.8.4
     # via nbconvert
 mypy-extensions==0.4.3
     # via black
-nbconvert==5.6.1
+nbclient==0.6.6
+    # via nbconvert
+nbconvert==6.5.2
     # via
     #   -r requirements.in
     #   jupyter-server
 nbformat==5.1.3
     # via
     #   -r requirements.in
     #   jupyter-server
+    #   nbclient
     #   nbconvert
 nest-asyncio==1.5.4
-    # via jupyter-client
+    # via
+    #   jupyter-client
+    #   nbclient
 newrelic==7.4.0.172
     # via -r requirements.in
 packaging==21.3
     # via
     #   bleach
     #   jupyter-server
+    #   nbconvert
 pandocfilters==1.5.0
     # via nbconvert
 parso==0.8.3
@@ -144,13 +159,15 @@ six==1.16.0
     #   python-dateutil
 sniffio==1.2.0
     # via anyio
+soupsieve==2.3.2.post1
+    # via beautifulsoup4
 stack-data==0.1.4
     # via ipython
 statsd==3.3.0
     # via -r requirements.in
 terminado==0.13.1
     # via jupyter-server
-testpath==0.5.0
+tinycss2==1.1.1
     # via nbconvert
 tomli==1.2.3
     # via black
@@ -160,13 +177,14 @@ tornado==6.1
     #   jupyter-client
     #   jupyter-server
     #   terminado
-traitlets==5.1.1
+traitlets==5.3.0
     # via
     #   ipython
     #   jupyter-client
     #   jupyter-core
     #   jupyter-server
     #   matplotlib-inline
+    #   nbclient
     #   nbconvert
     #   nbformat
 typing-extensions==4.0.1
@@ -176,7 +194,9 @@ urllib3==1.26.8
 wcwidth==0.2.5
     # via prompt-toolkit
 webencodings==0.5.1
-    # via bleach
+    # via
+    #   bleach
+    #   tinycss2
 websocket-client==1.2.3
     # via jupyter-server
 

setup.py

@@ -81,9 +81,9 @@ def walk_subpkg(name):
     classifiers=[
         "License :: OSI Approved :: BSD License",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.3",
+        "Programming Language :: Python :: 3.7",
     ],
-    test_suite="nose.collector",
+    python_requires=">=3.7",
     cmdclass=cmdclass,
 )