Merge pull request #147 from foster999/fix/143/windows-ci

Fix Windows CI

Author: akhmerov

.github/workflows/tests.yml

@@ -8,7 +8,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: [3.5, 3.6, 3.7, 3.8]
+        python-version: [3.6, 3.7, 3.8]
         os: [ubuntu-latest]
         include:
           - os: windows-latest

jupyter_sphinx/__init__.py

@@ -8,6 +8,7 @@
 from sphinx.util.fileutil import copy_asset
 from sphinx.errors import ExtensionError
 from IPython.lib.lexers import IPythonTracebackLexer, IPython3Lexer
+from pathlib import Path
 
 from .ast import (
     JupyterCell,
@@ -121,18 +122,20 @@ def build_finished(app, env):
     if app.builder.format != "html":
         return
 
+    module_dir = Path(__file__).parent
+    outdir = Path(app.outdir)
+
     # Copy stylesheet
-    src = os.path.join(os.path.dirname(__file__), "css")
-    dst = os.path.join(app.outdir, "_static")
+    src = module_dir / "css"
+    dst = outdir / "_static"
     copy_asset(src, dst)
 
     thebe_config = app.config.jupyter_sphinx_thebelab_config
     if not thebe_config:
         return
 
     # Copy all thebelab related assets
-    src = os.path.join(os.path.dirname(__file__), "thebelab")
-    dst = os.path.join(app.outdir, "_static")
+    src = module_dir / "thebelab"
     copy_asset(src, dst)
 
 

jupyter_sphinx/ast.py

@@ -2,6 +2,7 @@
 
 import os
 import json
+from pathlib import Path
 
 import docutils
 from docutils.parsers.rst import Directive, directives
@@ -101,7 +102,7 @@ def run(self):
                     location=location,
                 )
             try:
-                with open(filename) as f:
+                with Path(filename).open() as f:
                     content = [line.rstrip() for line in f.readlines()]
             except (IOError, OSError):
                 raise IOError("File {} not found or reading it failed".format(filename))
@@ -228,7 +229,7 @@ def html(self):
         )
 
 
-def cell_output_to_nodes(outputs, data_priority, write_stderr, dir, thebe_config):
+def cell_output_to_nodes(outputs, data_priority, write_stderr, out_dir, thebe_config):
     """Convert a jupyter cell with outputs and filenames to doctree nodes.
 
     Parameters
@@ -238,7 +239,7 @@ def cell_output_to_nodes(outputs, data_priority, write_stderr, dir, thebe_config
         Which media types to prioritize.
     write_stderr : bool
         If True include stderr in cell output
-    dir : string
+    out_dir : string
         Sphinx "absolute path" to the output folder, so it is a relative path
         to the source folder prefixed with ``/``.
     thebe_config: dict
@@ -304,19 +305,17 @@ def cell_output_to_nodes(outputs, data_priority, write_stderr, dir, thebe_config
                 continue
             data = output["data"][mime_type]
             if mime_type.startswith("image"):
+                file_path = Path(output.metadata["filenames"][mime_type])
+                out_dir = Path(out_dir)
                 # Sphinx treats absolute paths as being rooted at the source
                 # directory, so make a relative path, which Sphinx treats
                 # as being relative to the current working directory.
-                filename = os.path.basename(output.metadata["filenames"][mime_type])
+                filename = file_path.name
 
-                # checks if file dir path is inside a subdir of dir
-                filedir = os.path.dirname(output.metadata["filenames"][mime_type])
-                subpaths = filedir.split(dir)
-                if subpaths and len(subpaths) > 1:
-                    subpath = subpaths[1]
-                    dir += subpath
+                if out_dir in file_path.parents:
+                    out_dir = file_path.parent
 
-                uri = os.path.join(dir, filename)
+                uri = (out_dir / filename).as_posix()
                 to_add.append(docutils.nodes.image(uri=uri))
             elif mime_type == "text/html":
                 to_add.append(

jupyter_sphinx/execute.py

@@ -1,6 +1,7 @@
 """Execution and managing kernels."""
 
 import os
+from pathlib import Path
 
 from sphinx.transforms import SphinxTransform
 from sphinx.errors import ExtensionError
@@ -86,8 +87,9 @@ class ExecuteJupyterCells(SphinxTransform):
 
     def apply(self):
         doctree = self.document
-        doc_relpath = os.path.dirname(self.env.docname)  # relative to src dir
-        docname = os.path.basename(self.env.docname)
+        docname_path = Path(self.env.docname)
+        doc_dir_relpath = docname_path.parent  # relative to src dir
+        docname = docname_path.name
         default_kernel = self.config.jupyter_execute_default_kernel
         default_names = default_notebook_names(docname)
         thebe_config = self.config.jupyter_sphinx_thebelab_config
@@ -105,7 +107,7 @@ def apply(self):
             add_thebelab_library(doctree, self.env)
 
         js.logger.info("executing {}".format(docname))
-        output_dir = os.path.join(output_directory(self.env), doc_relpath)
+        output_dir = Path(output_directory(self.env)) / doc_dir_relpath
 
         # Start new notebook whenever a JupyterKernelNode is encountered
         jupyter_nodes = (JupyterCellNode, JupyterKernelNode)
@@ -205,7 +207,7 @@ def apply(self):
             # Write certain cell outputs (e.g. images) to separate files, and
             # modify the metadata of the associated cells in 'notebook' to
             # include the path to the output file.
-            write_notebook_output(notebook, output_dir, file_name, self.env.docname)
+            write_notebook_output(notebook, str(output_dir), file_name, self.env.docname)
 
             try:
                 cm_language = notebook.metadata.language_info.codemirror_mode.name
@@ -265,9 +267,10 @@ def write_notebook_output(notebook, output_dir, notebook_name, location=None):
             location=location,
         )
     contents = "\n\n".join(cell.source for cell in notebook.cells)
-    with open(os.path.join(output_dir, notebook_name + ext), "w",
-              encoding = "utf8") as f:
-        f.write(contents)
+
+    notebook_file = notebook_name + ext
+    output_dir = Path(output_dir)
+    (output_dir / notebook_file).write_text(contents, encoding = "utf8")
 
 
 def contains_widgets(notebook):

jupyter_sphinx/thebelab.py

@@ -3,6 +3,7 @@
 import json
 import docutils
 from docutils.parsers.rst import Directive
+from pathlib import Path
 
 import jupyter_sphinx as js
 
@@ -86,23 +87,23 @@ def add_thebelab_library(doctree, env):
     if isinstance(thebe_config, dict):
         pass
     elif isinstance(thebe_config, str):
-        if os.path.isabs(thebe_config):
+        thebe_config = Path(thebe_config)
+        if thebe_config.is_absolute():
             filename = thebe_config
         else:
-            filename = os.path.join(os.path.abspath(env.app.srcdir), thebe_config)
+            filename = Path(env.app.srcdir).resolve() / thebe_config
 
-        if not os.path.exists(filename):
+        if not filename.exists():
             js.logger.warning("The supplied thebelab configuration file does not exist")
             return
 
-        with open(filename, "r") as config_file:
-            try:
-                thebe_config = json.load(config_file)
-            except ValueError:
-                js.logger.warning(
-                    "The supplied thebelab configuration file is not in JSON format."
-                )
-                return
+        try:
+            thebe_config = json.loads(filename.read_text())
+        except ValueError:
+            js.logger.warning(
+                "The supplied thebelab configuration file is not in JSON format."
+            )
+            return
     else:
         js.logger.warning(
             "The supplied thebelab configuration should be either a filename or a dictionary."

jupyter_sphinx/utils.py

@@ -4,6 +4,7 @@
 from sphinx.errors import ExtensionError
 import nbformat
 from jupyter_client.kernelspec import get_kernel_spec, NoSuchKernel
+from pathlib import Path
 
 
 def blank_nb(kernel_name):
@@ -74,12 +75,14 @@ def sphinx_abs_dir(env, *paths):
     # output_directory / jupyter_execute / path relative to source directory
     # Sphinx expects download links relative to source file or relative to
     # source dir and prepended with '/'. We use the latter option.
-    return "/" + os.path.relpath(
-        os.path.abspath(
-            os.path.join(output_directory(env), os.path.dirname(env.docname), *paths)
-        ),
-        os.path.abspath(env.app.srcdir),
-    )
+    out_path = (output_directory(env) /  Path(env.docname).parent / Path(*paths)).resolve()
+      
+    if os.name == "nt":
+        # Can't get relative path between drives on Windows
+        return out_path.as_posix()
+
+    # Path().relative_to() doesn't work when not a direct subpath
+    return "/" + os.path.relpath(out_path, env.app.srcdir)
 
 
 def output_directory(env):
@@ -90,6 +93,4 @@ def output_directory(env):
 
     # Note: we are using an implicit fact that sphinx output directories are
     # direct subfolders of the build directory.
-    return os.path.abspath(
-        os.path.join(env.app.outdir, os.path.pardir, "jupyter_execute")
-    )
+    return (Path(env.app.outdir) / os.path.pardir / "jupyter_execute").resolve()

setup.py

@@ -34,6 +34,6 @@
         "nbconvert>=5.5",
         "nbformat",
     ],
-    python_requires=">= 3.5",
+    python_requires=">= 3.6",
     package_data={"jupyter_sphinx": ["thebelab/*", "css/*"]},
 )

tests/test_execute.py

@@ -4,6 +4,7 @@
 import sys
 from io import StringIO
 from unittest.mock import Mock
+from pathlib import Path
 
 from sphinx.addnodes import download_reference
 from sphinx.testing.util import assert_node, SphinxTestApp, path
@@ -34,16 +35,17 @@ def doctree():
     def doctree(
         source, config=None, return_warnings=False, entrypoint="jupyter_sphinx"
     ):
-        src_dir = tempfile.mkdtemp()
+        src_dir = Path(tempfile.mkdtemp())
         source_trees.append(src_dir)
-        with open(os.path.join(src_dir, "conf.py"), "w", encoding = "utf8") as f:
-            f.write("extensions = ['%s']" % entrypoint)
-            if config is not None:
-                f.write("\n" + config)
-        with open(os.path.join(src_dir, "contents.rst"), "w", encoding = "utf8") as f:
-            f.write(source)
+
+        conf_contents = "extensions = ['%s']" % entrypoint
+        if config is not None:
+            conf_contents += "\n" + config
+        (src_dir / "conf.py").write_text(conf_contents, encoding = "utf8")
+        (src_dir / "contents.rst").write_text(source, encoding = "utf8")
+        
         warnings = StringIO()
-        app = SphinxTestApp(srcdir=path(src_dir), status=StringIO(), warning=warnings)
+        app = SphinxTestApp(srcdir=path(src_dir.as_posix()), status=StringIO(), warning=warnings)
         apps.append(app)
         app.build()
 
@@ -586,6 +588,11 @@ def test_download_role(text, reftarget, caption, tmp_path):
     }
     mock_inliner.configure_mock(**config)
     ret, msg = role('jupyter-download:notebook', text, text, 0, mock_inliner)
+
+    if os.name == "nt":
+        # Get equivalent abs path for Windows
+        reftarget = (Path(tmp_path) / reftarget[1:]).resolve().as_posix()
+
     assert_node(ret[0], [download_reference], reftarget=reftarget)
     assert_node(ret[0][0], [literal, caption])
     assert msg == []