fix all issues

Author: basnijholt

doc/source/conf.py

@@ -10,7 +10,7 @@
 
 sys.path.insert(0, os.path.abspath("../.."))
 
-import jupyter_sphinx
+import jupyter_sphinx  # noqa: E402
 
 project = "Jupyter Sphinx"
 copyright = "2019, Jupyter Development Team"

jupyter_sphinx/__init__.py

@@ -10,14 +10,23 @@
 from sphinx.util.fileutil import copy_asset
 
 from ._version import __version__
-from .ast import (WIDGET_VIEW_MIMETYPE, CellInput, CellInputNode, CellOutput,
-                  CellOutputNode, CombineCellInputOutput, JupyterCell,
-                  JupyterCellNode, JupyterDownloadRole, JupyterKernelNode,
-                  JupyterWidgetStateNode, JupyterWidgetViewNode,
-                  MimeBundleNode)
+from .ast import (
+    WIDGET_VIEW_MIMETYPE,
+    CellInput,
+    CellInputNode,
+    CellOutput,
+    CellOutputNode,
+    CombineCellInputOutput,
+    JupyterCell,
+    JupyterCellNode,
+    JupyterDownloadRole,
+    JupyterKernelNode,
+    JupyterWidgetStateNode,
+    JupyterWidgetViewNode,
+    MimeBundleNode,
+)
 from .execute import ExecuteJupyterCells, JupyterKernel
-from .thebelab import (ThebeButton, ThebeButtonNode, ThebeOutputNode,
-                       ThebeSourceNode)
+from .thebelab import ThebeButton, ThebeButtonNode, ThebeOutputNode, ThebeSourceNode
 
 REQUIRE_URL_DEFAULT = (
     "https://cdnjs.cloudflare.com/ajax/libs/require.js/2.3.4/require.min.js"
@@ -26,10 +35,11 @@
 
 logger = logging.getLogger(__name__)
 
-##############################################################################
 # Constants and functions we'll use later
 
 # Used for nodes that do not need to be rendered
+
+
 def skip(self, node):
     raise docutils.nodes.SkipNode
 
@@ -48,6 +58,7 @@ def halt(self, node):
     lambda self, node: self.depart_container(node),
 )
 
+
 # Used to render the container and its children as HTML
 def visit_container_html(self, node):
     self.body.append(node.visit_html())
@@ -78,7 +89,7 @@ def visit_thebe_source(self, node):
     lambda self, node: self.depart_container(node),
 )
 
-##############################################################################
+
 # Sphinx callback functions
 def builder_inited(app):
     """

jupyter_sphinx/ast.py

@@ -618,14 +618,14 @@ def apply(self):
         moved_outputs = set()
 
         for cell_node in self.document.traverse(JupyterCellNode):
-            if cell_node.attributes["execute"] == False:
-                if cell_node.attributes["hide_code"] == False:
+            if not cell_node.attributes["execute"]:
+                if not cell_node.attributes["hide_code"]:
                     # Cell came from jupyter-input
                     sibling = cell_node.next_node(descend=False, siblings=True)
                     if (
                         isinstance(sibling, JupyterCellNode)
-                        and sibling.attributes["execute"] == False
-                        and sibling.attributes["hide_code"] == True
+                        and not sibling.attributes["execute"]
+                        and sibling.attributes["hide_code"]
                     ):
                         # Sibling came from jupyter-output, so we merge
                         cell_node += sibling.children[1]

jupyter_sphinx/execute.py

@@ -43,12 +43,23 @@ def LoggerAdapterWrapper(logger_adapter):
 
 import jupyter_sphinx as js
 
-from .ast import (CellOutputNode, JupyterCellNode, JupyterKernelNode,
-                  JupyterWidgetStateNode, apply_styling, cell_output_to_nodes,
-                  get_widgets)
+from .ast import (
+    CellOutputNode,
+    JupyterCellNode,
+    JupyterKernelNode,
+    JupyterWidgetStateNode,
+    apply_styling,
+    cell_output_to_nodes,
+    get_widgets,
+)
 from .thebelab import ThebeButtonNode, add_thebelab_library
-from .utils import (blank_nb, default_notebook_names, output_directory,
-                    sphinx_abs_dir, split_on)
+from .utils import (
+    blank_nb,
+    default_notebook_names,
+    output_directory,
+    sphinx_abs_dir,
+    split_on,
+)
 
 
 class JupyterKernel(Directive):
@@ -88,7 +99,7 @@ def run(self):
         ]
 
 
-### Doctree transformations
+# Doctree transformations
 class ExecuteJupyterCells(SphinxTransform):
     """Execute code cells in Jupyter kernels.
 
@@ -141,8 +152,9 @@ def apply(self):
                 kernel_name = default_kernel
                 file_name = next(default_names)
 
-            # Add empty placeholder cells for non-executed nodes so nodes and cells can be zipped
-            # and the provided input/output can be inserted later
+            # Add empty placeholder cells for non-executed nodes so nodes
+            # and cells can be zipped and the provided input/output
+            # can be inserted later
             notebook = execute_cells(
                 kernel_name,
                 [
@@ -268,7 +280,7 @@ def apply(self):
                 doctree.append(JupyterWidgetStateNode(state=get_widgets(notebook)))
 
 
-### Roles
+# Roles
 
 
 def execute_cells(kernel_name, cells, execute_kwargs):

jupyter_sphinx/thebelab.py

@@ -54,7 +54,8 @@ def __init__(self, rawsource="", *children, text="Make live", **attributes):
     def html(self):
         text = self["text"]
         return (
-            '<button title="{text}" class="thebelab-button" id="thebelab-activate-button" '
+            '<button title="{text}" class="thebelab-button" '
+            'id="thebelab-activate-button" '
             'onclick="initThebelab()">{text}</button>'.format(text=text)
         )
 
@@ -106,7 +107,8 @@ def add_thebelab_library(doctree, env):
             return
     else:
         js.logger.warning(
-            "The supplied thebelab configuration should be either a filename or a dictionary."
+            "The supplied thebelab configuration should be either"
+            " a filename or a dictionary."
         )
         return
 

setup.cfg

@@ -2,5 +2,8 @@
 license_file = LICENSE
 
 [flake8]
-max-line-length = 88
+max-line-length = 120
 extend-ignore = E203
+
+[isort]
+profile = black

tests/test_execute.py

@@ -8,18 +8,20 @@
 from unittest.mock import Mock
 
 import pytest
-from docutils.nodes import (container, image, literal, literal_block,
-                            math_block, raw)
+from docutils.nodes import container, image, literal, literal_block, math_block, raw
 from nbformat import from_dict
 from sphinx.addnodes import download_reference
 from sphinx.errors import ExtensionError
 from sphinx.testing.util import SphinxTestApp, assert_node, path
 
-from jupyter_sphinx.ast import (CellInputNode, CellOutputNode, JupyterCellNode,
-                                JupyterDownloadRole, JupyterWidgetStateNode,
-                                JupyterWidgetViewNode, cell_output_to_nodes)
-from jupyter_sphinx.thebelab import (ThebeButtonNode, ThebeOutputNode,
-                                     ThebeSourceNode)
+from jupyter_sphinx.ast import (
+    JupyterCellNode,
+    JupyterDownloadRole,
+    JupyterWidgetStateNode,
+    JupyterWidgetViewNode,
+    cell_output_to_nodes,
+)
+from jupyter_sphinx.thebelab import ThebeButtonNode, ThebeOutputNode, ThebeSourceNode
 
 
 @pytest.fixture()